diff options
| -rw-r--r-- | pkgs/krops/default.nix | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/pkgs/krops/default.nix b/pkgs/krops/default.nix index a83e88c..85bf88c 100644 --- a/pkgs/krops/default.nix +++ b/pkgs/krops/default.nix @@ -5,34 +5,28 @@ in { exec, nix, openssh, populate, writeDash }: rec { build = target: - exec "build.${target.host}" rec { - filename = "${openssh}/bin/ssh"; - argv = [ - filename - "-l" target.user - "-p" target.port - "-t" - target.host - (lib.concatStringsSep " " [ - "nix build" - "-I ${lib.escapeShellArg target.path}" - "--no-link -f '<nixpkgs/nixos>'" - "config.system.build.toplevel" - ]) - ]; - }; + remoteCommand target (lib.concatStringsSep " " [ + "nix build" + "-I ${lib.escapeShellArg target.path}" + "--no-link -f '<nixpkgs/nixos>'" + "config.system.build.toplevel" + ]); rebuild = args: target: - exec "rebuild.${target.host}" rec { + remoteCommand target "nixos-rebuild -I ${lib.escapeShellArg target.path} ${ + lib.concatMapStringsSep " " lib.escapeShellArg args + }"; + + remoteCommand = target: command: + exec "build.${target.host}" rec { filename = "${openssh}/bin/ssh"; argv = [ filename "-l" target.user "-p" target.port + "-t" target.host - "nixos-rebuild -I ${lib.escapeShellArg target.path} ${ - lib.concatMapStringsSep " " lib.escapeShellArg args - }" + command ]; }; |