From 03cd70fc865a36a8e6620a93a64d44c0c4a420f6 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 20 Jan 2025 21:28:31 +0000 Subject: [PATCH] update flake secrets and add remote builder to merlin --- flake.lock | 8 ++++---- hosts/citadel/default.nix | 3 --- hosts/merlin/default.nix | 3 +++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index ec9e9de..e03f9b4 100644 --- a/flake.lock +++ b/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" }, diff --git a/hosts/citadel/default.nix b/hosts/citadel/default.nix index 07686f0..4872b72 100644 --- a/hosts/citadel/default.nix +++ b/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 ]; diff --git a/hosts/merlin/default.nix b/hosts/merlin/default.nix index e5b9077..acdb495 100644 --- a/hosts/merlin/default.nix +++ b/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 ];