diff --git a/flake.nix b/flake.nix index f48416b2..269e10a2 100644 --- a/flake.nix +++ b/flake.nix @@ -74,17 +74,10 @@ # Can be run with nix run c3d2#deploy-… { name , host - # remote builders to pass - , builders ? null }: let target = "root@${host}"; rebuildArg = - "--flake ${self}#${name}" + - (if builders != null - then " --builders \"" + - builtins.concatStringsSep " " builders + - "\"" - else ""); + "--flake ${self}#${name}"; in pkgs.writeScriptBin "${name}-nixos-rebuild" '' #!${pkgs.runtimeShell} -e nix-copy-closure --to ${target} ${secrets} @@ -146,8 +139,6 @@ "${name}-nixos-rebuild" = mkDeploy ({ inherit name; host = getHostAddr name; - } // nixpkgs.lib.optionalAttrs (hostRegistry.hosts.${name} ? builders) { - inherit (hostRegistry.hosts.${name}) builders; }); "${name}-nixos-rebuild-local" = diff --git a/host-registry.nix b/host-registry.nix index aeb96c61..fd62ff1a 100644 --- a/host-registry.nix +++ b/host-registry.nix @@ -20,7 +20,6 @@ rec { ether = "dc:a6:32:31:b6:32"; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE9RKlt+mIew5epxHt7Gab44yFOdeD+L/EhhA6Ospzyq"; - builders = [ "ssh://client@172.22.99.110" ]; wol = true; ip4 = "pulsebert.hq.c3d2.de"; };