update flake secrets and add remote builder to merlin

flake.lock

@@ -539,11 +539,11 @@
     },
     "nix-secrets": {
       "locked": {
-        "lastModified": 1737328660,
-        "narHash": "sha256-3k8JjxDXFOROez0IXfMTLKQYIbW2zCKOs+Ry0kMfJFQ=",
+        "lastModified": 1737408036,
+        "narHash": "sha256-iw6YUUadRzER2q3yJ50cit4hizFdRwcW+MI5rtiZ8dw=",
         "ref": "refs/heads/master",
-        "rev": "46312b04c97372668c44e95623bb3b91b6027b86",
-        "revCount": 243,
+        "rev": "9258ed14d04de22cd499a69d6b22b4b08a1448e0",
+        "revCount": 244,
         "type": "git",
         "url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git"
       },

hosts/citadel/default.nix

@@ -61,9 +61,6 @@ in {
     ../common/optional/powersave.nix
     ../common/optional/restic-backup.nix
 
-    # This machine is used for remote building
-    ../common/optional/distributed-builds/remote-builder-machine.nix
-
     # ../../modules/nixos
     outputs.nixosModules.nixosAutoUpgrade
   ];

hosts/merlin/default.nix

@@ -42,6 +42,9 @@ in {
     # Import optional options
     ../common/optional/openssh.nix
 
+    # This machine is used for remote building
+    ../common/optional/distributed-builds/remote-builder-machine.nix
+
     outputs.nixosModules.nixosAutoUpgrade
   ];