From ae8a5638630ba7c4b21cbac0f1b6b26a6f4af1a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Wed, 7 Jan 2026 12:31:09 +0100
Subject: [PATCH 1/3] npins: bump to master

---
 npins/sources.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/npins/sources.json b/npins/sources.json
index 47811a38..c3c10860 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -125,11 +125,11 @@
         "owner": "nix-community",
         "repo": "home-manager"
       },
-      "branch": "release-25.11",
+      "branch": "master",
       "submodules": false,
-      "revision": "6bd04da47cfb48dfd15eabf08364b78ad894f5b2",
-      "url": "https://github.com/nix-community/home-manager/archive/6bd04da47cfb48dfd15eabf08364b78ad894f5b2.tar.gz",
-      "hash": "1wvysqiybcyf2hzvvpja2522fqhk45554j0b07h3s7zhzc2056ia"
+      "revision": "4e8b7bef66c60735982369f3151b93e62fe37da7",
+      "url": "https://github.com/nix-community/home-manager/archive/4e8b7bef66c60735982369f3151b93e62fe37da7.tar.gz",
+      "hash": "0jva394l5s9vdrwfffvb8f4181i8832g6hffasn8nc8aqyn1wq5f"
     },
     "infuse": {
       "type": "GitRelease",
@@ -195,11 +195,11 @@
         "owner": "nixos",
         "repo": "nixpkgs"
       },
-      "branch": "nixos-25.11-small",
+      "branch": "nixos-unstable",
       "submodules": false,
-      "revision": "a35a20f6d3d51b6b42b68a6879701f7d87381896",
-      "url": "https://github.com/nixos/nixpkgs/archive/a35a20f6d3d51b6b42b68a6879701f7d87381896.tar.gz",
-      "hash": "00781d4nhmqzvxph2lpsj3kika3v8y0nigfadr6y8lvzxrcppkfj"
+      "revision": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
+      "url": "https://github.com/nixos/nixpkgs/archive/9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5.tar.gz",
+      "hash": "1h3g9iyfj0xwz7i4ywcxjpp3p9xk7ahp563m0h1i25697sc2lrji"
     },
     "nur": {
       "type": "Git",

From c2e068dc48d8dd9fe0c824a1c2b4c08ec52bbe7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Wed, 7 Jan 2026 12:35:21 +0100
Subject: [PATCH 2/3] nixos: use upstream xscreensaver module

---
 nix/configurations/vanadium.nix          |  1 -
 nix/nixosModules/common/xscreensaver.nix | 54 ------------------------
 2 files changed, 55 deletions(-)
 delete mode 100644 nix/nixosModules/common/xscreensaver.nix

diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix
index 344c1f77..f0163280 100644
--- a/nix/configurations/vanadium.nix
+++ b/nix/configurations/vanadium.nix
@@ -113,7 +113,6 @@ in
     ../nixosModules/common/network.nix
     ../nixosModules/common/sudo-conf.nix
     ../nixosModules/common/system-nixconf.nix
-    ../nixosModules/common/xscreensaver.nix
 
     # QUIRK:
     # Had issue when building the installer as it fails to bootstrap itself
diff --git a/nix/nixosModules/common/xscreensaver.nix b/nix/nixosModules/common/xscreensaver.nix
deleted file mode 100644
index 49aebbd0..00000000
--- a/nix/nixosModules/common/xscreensaver.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# This module provides a service react to xscreensaver events
-#
-{
-  config,
-  lib,
-  ...
-}:
-let
-  cfg = config.services.xscreensaver;
-in
-{
-  options = {
-    services.xscreensaver.hooks = lib.mkOption {
-      type = with lib.types; attrsOf str;
-      description = "An attrset of events mapped a block of shell command to be run";
-      default = { };
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    systemd.user.services = {
-      "xscreensaver-hooks" = {
-        description = "Run commands on xscreensaver events";
-        after = [
-          "graphical-session.target"
-          "xscreensaver.service"
-        ];
-        partOf = [ "graphical-session.target" ];
-        wantedBy = [ "graphical-session.target" ];
-        script =
-          let
-            handlers = lib.concatMapAttrsStringSep "\n" (event: action: ''
-              "${event}")
-                      ( ${action}
-                      )
-                      ;;
-            '') cfg.hooks;
-          in
-          ''
-            xscreensaver-command -watch | while read event rest; do
-              echo "The handler script got \"$event\""
-              case $event in
-                ${handlers}
-              esac
-            done
-          '';
-        path = [
-          cfg.package # contains xscreensaver-command
-        ];
-      };
-    };
-  };
-}

From 041fbcfa1c3af92c9db22911142a3608b40df65d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Wed, 7 Jan 2026 12:35:57 +0100
Subject: [PATCH 3/3] vanadium: rename
 networking.wireless.userControlled.enable to
 networking.wireless.userControlled

---
 nix/configurations/vanadium/nixos/connectivity.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/configurations/vanadium/nixos/connectivity.nix b/nix/configurations/vanadium/nixos/connectivity.nix
index 024f0b25..28890b7a 100644
--- a/nix/configurations/vanadium/nixos/connectivity.nix
+++ b/nix/configurations/vanadium/nixos/connectivity.nix
@@ -35,7 +35,7 @@
     # To enable roaming https://wiki.archlinux.org/title/Wpa_supplicant#Roaming
     wireless = {
       enable = true;
-      userControlled.enable = true;
+      userControlled = true;
       secretsFile = config.age.secrets.wpa_password.path;
       scanOnLowSignal = false;
       networks =