Compare commits

...

6 commits

6 changed files with 23 additions and 19 deletions

View file

@ -12,6 +12,7 @@
}: { }: {
imports = [ imports = [
../nixosModules/common/system-nixconf.nix ../nixosModules/common/system-nixconf.nix
../nixosModules/common/sudo-conf.nix
(modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")
]; ];

View file

@ -35,8 +35,11 @@
signing.signByDefault = true; signing.signByDefault = true;
maintenance = { maintenance = {
enable = true; enable = true;
repositories = lib.map (path: config.home.homeDirectory + "/${path}") [ # We don't deal with worktree folders anyway
"r/nixos/nixpkgs" repositories = lib.map (path: "${config.home.homeDirectory}/r/${path}") [
"nixos/nixpkgs"
"ghc/ghc"
"haskell/cabal"
]; ];
}; };
includes = let includes = let

View file

@ -30,7 +30,7 @@
home.file = { home.file = {
".xscreensaver".source = "${./xscreensaver/.xscreensaver}"; ".xscreensaver".source = "${./xscreensaver/.xscreensaver}";
".wallpaper".source = "${pkgs.wallpapers_source}/images/KnightsOfGuinevere/guinevere_francesca.png"; ".wallpaper".source = "${pkgs.wallpapers.packages.knights_of_guinevere.fixing_gwen}";
}; };
xdg.configFile = { xdg.configFile = {
"xmonad".source = "${./xmonad}"; "xmonad".source = "${./xmonad}";

View file

@ -66,6 +66,10 @@
''; '';
}; };
# LAN CONNECTION
# ~~~~~~~~~~~~~~
# Note that when you're corrected to mullvad, you can't ssh into your local machines.
# I wonder if there's an option to turn this off.
services.mullvad-vpn.enable = true; services.mullvad-vpn.enable = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;

View file

@ -61,11 +61,7 @@
device, # obtain with `xrandr` device, # obtain with `xrandr`
brightness, # [0..1] brightness, # [0..1]
}: }:
# Hack:
# xrandr would consider the display being connected before we can change its brightness
# For that reason, we can't base our delay on its output, sadly.
singleton "10_xrandr_brightness" '' singleton "10_xrandr_brightness" ''
sleep 10
${lib.getExe pkgs.xorg.xrandr} --output ${device} --brightness ${toString brightness} ${lib.getExe pkgs.xorg.xrandr} --output ${device} --brightness ${toString brightness}
''; '';

View file

@ -187,9 +187,9 @@
}, },
"branch": "master", "branch": "master",
"submodules": false, "submodules": false,
"revision": "43ffe9ac82567512abb83187cb673de1091bdfa8", "revision": "7467f155fcba189eb088a7601f44fbef7688669b",
"url": "https://github.com/NixOS/nixos-hardware/archive/43ffe9ac82567512abb83187cb673de1091bdfa8.tar.gz", "url": "https://github.com/NixOS/nixos-hardware/archive/7467f155fcba189eb088a7601f44fbef7688669b.tar.gz",
"hash": "1amgw52j0z8mgfklgz3nfa1qcr4sj0vblapamqzsw148ii4xblsx" "hash": "04rpy1nq8bmxbrbqjq0ghvnvmnqay4l2vwncimw0zb6rdnhdxldc"
}, },
"nixpkgs": { "nixpkgs": {
"type": "Git", "type": "Git",
@ -200,9 +200,9 @@
}, },
"branch": "nixos-25.05-small", "branch": "nixos-25.05-small",
"submodules": false, "submodules": false,
"revision": "90b70846420ac681b72176a88d9fd0a5a06c74b1", "revision": "0257fc3c4a1ba60fb2a9d19c2915e7315bad41db",
"url": "https://github.com/NixOS/nixpkgs/archive/90b70846420ac681b72176a88d9fd0a5a06c74b1.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/0257fc3c4a1ba60fb2a9d19c2915e7315bad41db.tar.gz",
"hash": "05ba9jcr3kgg9pn8alnk7bn63xxq2xahw8gpaclsy67q6nbya375" "hash": "18f5jn4wm3g1alfv168bg2xk9zidp0826x4d149li9bljjnp1j29"
}, },
"nur": { "nur": {
"type": "Git", "type": "Git",
@ -213,9 +213,9 @@
}, },
"branch": "main", "branch": "main",
"submodules": false, "submodules": false,
"revision": "fd763567eda0a287d5512590a89b8bdf86f8cf4b", "revision": "213fb0b7a376c1c901c0d0779a0a8e5985868c42",
"url": "https://github.com/nix-community/nur/archive/fd763567eda0a287d5512590a89b8bdf86f8cf4b.tar.gz", "url": "https://github.com/nix-community/nur/archive/213fb0b7a376c1c901c0d0779a0a8e5985868c42.tar.gz",
"hash": "148rl5ckahjw99vvk2xiq17hbfggxp0nqvsr8f22sqs94i171hqh" "hash": "0503ipivmx0nxm11vbzkpfzn2v7ng19s9zb17a2ipnfr0kkj78p9"
}, },
"pin-emacs28": { "pin-emacs28": {
"type": "Git", "type": "Git",
@ -352,9 +352,9 @@
}, },
"branch": "mistress", "branch": "mistress",
"submodules": false, "submodules": false,
"revision": "3e3ed2f3773a4e61db1f4ae8f55dc99c574ee6e1", "revision": "0eec270ac5fcbc939f475c7954504cfcbde8f7d9",
"url": "https://git.confusedcompiler.org/leana8959/wallpapers/archive/3e3ed2f3773a4e61db1f4ae8f55dc99c574ee6e1.tar.gz", "url": "https://git.confusedcompiler.org/leana8959/wallpapers/archive/0eec270ac5fcbc939f475c7954504cfcbde8f7d9.tar.gz",
"hash": "1bkxfbxck16zvby5ynhgriv9yf137jmjxfihlwz03lr5cwvdbxbf" "hash": "1y5r6gm7b781s70x89ya24sqj9rfza83as0749hkd77b8zncvkkl"
}, },
"wired-notify": { "wired-notify": {
"type": "Git", "type": "Git",