From 46ef4a3312571723ecd5dd3a0da4eba0bd5ddd90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sun, 2 Nov 2025 20:03:28 +0800 Subject: [PATCH 1/6] vanadium/dev: add more repositories to maintenance list --- nix/configurations/vanadium/home/dev.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nix/configurations/vanadium/home/dev.nix b/nix/configurations/vanadium/home/dev.nix index 8fbe473b..57bcf93e 100644 --- a/nix/configurations/vanadium/home/dev.nix +++ b/nix/configurations/vanadium/home/dev.nix @@ -35,8 +35,11 @@ signing.signByDefault = true; maintenance = { enable = true; - repositories = lib.map (path: config.home.homeDirectory + "/${path}") [ - "r/nixos/nixpkgs" + # We don't deal with worktree folders anyway + repositories = lib.map (path: "${config.home.homeDirectory}/r/${path}") [ + "nixos/nixpkgs" + "ghc/ghc" + "haskell/cabal" ]; }; includes = let From 3084711044e70c7dd140c5740bd1b77f3ff78b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sun, 2 Nov 2025 20:05:17 +0800 Subject: [PATCH 2/6] installer: use doas as well --- nix/configurations/installer.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nix/configurations/installer.nix b/nix/configurations/installer.nix index 44ae03b3..035d918d 100644 --- a/nix/configurations/installer.nix +++ b/nix/configurations/installer.nix @@ -12,6 +12,7 @@ }: { imports = [ ../nixosModules/common/system-nixconf.nix + ../nixosModules/common/sudo-conf.nix (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") ]; From 45e0882b0ceaf18b4a25eb4c1926ed6a430391ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sun, 2 Nov 2025 22:46:41 +0800 Subject: [PATCH 3/6] vanadium: update wallpaper --- nix/configurations/vanadium/home/misc.nix | 2 +- npins/sources.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/configurations/vanadium/home/misc.nix b/nix/configurations/vanadium/home/misc.nix index b7741b36..c1fff0e5 100644 --- a/nix/configurations/vanadium/home/misc.nix +++ b/nix/configurations/vanadium/home/misc.nix @@ -30,7 +30,7 @@ home.file = { ".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 = { "xmonad".source = "${./xmonad}"; diff --git a/npins/sources.json b/npins/sources.json index 4201f4b0..95188c05 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -352,9 +352,9 @@ }, "branch": "mistress", "submodules": false, - "revision": "3e3ed2f3773a4e61db1f4ae8f55dc99c574ee6e1", - "url": "https://git.confusedcompiler.org/leana8959/wallpapers/archive/3e3ed2f3773a4e61db1f4ae8f55dc99c574ee6e1.tar.gz", - "hash": "1bkxfbxck16zvby5ynhgriv9yf137jmjxfihlwz03lr5cwvdbxbf" + "revision": "fed75a7eb0459c4a3187fd7e4464163c1b3a554c", + "url": "https://git.confusedcompiler.org/leana8959/wallpapers/archive/fed75a7eb0459c4a3187fd7e4464163c1b3a554c.tar.gz", + "hash": "1a1lpvrm6gyw12xsc9g0c7qyw1xsmfllbrmjrpc3yr1sb1kfjqmk" }, "wired-notify": { "type": "Git", From d22bd9ae28bc9192d9c02cce701a01072e22ff99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 3 Nov 2025 08:41:03 +0800 Subject: [PATCH 4/6] docs: lan connection when using mullvad --- nix/configurations/vanadium/nixos/connectivity.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nix/configurations/vanadium/nixos/connectivity.nix b/nix/configurations/vanadium/nixos/connectivity.nix index 3a23eb64..b2f9a380 100644 --- a/nix/configurations/vanadium/nixos/connectivity.nix +++ b/nix/configurations/vanadium/nixos/connectivity.nix @@ -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; hardware.bluetooth.enable = true; From 4d4363ced1f352fd2b466f85396ee8a29c878d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 3 Nov 2025 09:23:37 +0800 Subject: [PATCH 5/6] vanadium/display: it seems like removing the delay works --- nix/configurations/vanadium/nixos/display.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nix/configurations/vanadium/nixos/display.nix b/nix/configurations/vanadium/nixos/display.nix index 66a45f8c..a9b2267b 100644 --- a/nix/configurations/vanadium/nixos/display.nix +++ b/nix/configurations/vanadium/nixos/display.nix @@ -61,11 +61,7 @@ device, # obtain with `xrandr` 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" '' - sleep 10 ${lib.getExe pkgs.xorg.xrandr} --output ${device} --brightness ${toString brightness} ''; From 29a779cfe1ff5766cfe7282565e9c6499b368285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 3 Nov 2025 09:51:02 +0800 Subject: [PATCH 6/6] npins: update sources --- npins/sources.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/npins/sources.json b/npins/sources.json index 95188c05..c25c916a 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -187,9 +187,9 @@ }, "branch": "master", "submodules": false, - "revision": "43ffe9ac82567512abb83187cb673de1091bdfa8", - "url": "https://github.com/NixOS/nixos-hardware/archive/43ffe9ac82567512abb83187cb673de1091bdfa8.tar.gz", - "hash": "1amgw52j0z8mgfklgz3nfa1qcr4sj0vblapamqzsw148ii4xblsx" + "revision": "7467f155fcba189eb088a7601f44fbef7688669b", + "url": "https://github.com/NixOS/nixos-hardware/archive/7467f155fcba189eb088a7601f44fbef7688669b.tar.gz", + "hash": "04rpy1nq8bmxbrbqjq0ghvnvmnqay4l2vwncimw0zb6rdnhdxldc" }, "nixpkgs": { "type": "Git", @@ -200,9 +200,9 @@ }, "branch": "nixos-25.05-small", "submodules": false, - "revision": "90b70846420ac681b72176a88d9fd0a5a06c74b1", - "url": "https://github.com/NixOS/nixpkgs/archive/90b70846420ac681b72176a88d9fd0a5a06c74b1.tar.gz", - "hash": "05ba9jcr3kgg9pn8alnk7bn63xxq2xahw8gpaclsy67q6nbya375" + "revision": "0257fc3c4a1ba60fb2a9d19c2915e7315bad41db", + "url": "https://github.com/NixOS/nixpkgs/archive/0257fc3c4a1ba60fb2a9d19c2915e7315bad41db.tar.gz", + "hash": "18f5jn4wm3g1alfv168bg2xk9zidp0826x4d149li9bljjnp1j29" }, "nur": { "type": "Git", @@ -213,9 +213,9 @@ }, "branch": "main", "submodules": false, - "revision": "fd763567eda0a287d5512590a89b8bdf86f8cf4b", - "url": "https://github.com/nix-community/nur/archive/fd763567eda0a287d5512590a89b8bdf86f8cf4b.tar.gz", - "hash": "148rl5ckahjw99vvk2xiq17hbfggxp0nqvsr8f22sqs94i171hqh" + "revision": "213fb0b7a376c1c901c0d0779a0a8e5985868c42", + "url": "https://github.com/nix-community/nur/archive/213fb0b7a376c1c901c0d0779a0a8e5985868c42.tar.gz", + "hash": "0503ipivmx0nxm11vbzkpfzn2v7ng19s9zb17a2ipnfr0kkj78p9" }, "pin-emacs28": { "type": "Git", @@ -352,9 +352,9 @@ }, "branch": "mistress", "submodules": false, - "revision": "fed75a7eb0459c4a3187fd7e4464163c1b3a554c", - "url": "https://git.confusedcompiler.org/leana8959/wallpapers/archive/fed75a7eb0459c4a3187fd7e4464163c1b3a554c.tar.gz", - "hash": "1a1lpvrm6gyw12xsc9g0c7qyw1xsmfllbrmjrpc3yr1sb1kfjqmk" + "revision": "0eec270ac5fcbc939f475c7954504cfcbde8f7d9", + "url": "https://git.confusedcompiler.org/leana8959/wallpapers/archive/0eec270ac5fcbc939f475c7954504cfcbde8f7d9.tar.gz", + "hash": "1y5r6gm7b781s70x89ya24sqj9rfza83as0749hkd77b8zncvkkl" }, "wired-notify": { "type": "Git",