From 08c6bd8b73489d50a99129a22f559e6197892c23 Mon Sep 17 00:00:00 2001 From: notgne2 Date: Sun, 22 Nov 2020 18:12:29 -0700 Subject: Update `activate.nixos` to take a configuration, not a derivation --- examples/system/flake.nix | 4 ++-- flake.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/system/flake.nix b/examples/system/flake.nix index 021f9db..bcc841c 100644 --- a/examples/system/flake.nix +++ b/examples/system/flake.nix @@ -30,12 +30,12 @@ system = { sshUser = "admin"; path = - deploy-rs.lib.x86_64-linux.setActivate self.nixosConfigurations.example-nixos-system.config.system.build.toplevel "./bin/switch-to-configuration switch"; + deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.example-nixos-system; user = "root"; }; hello = { sshUser = "hello"; - path = deploy-rs.lib.x86_64-linux.setActivate self.defaultPackage.x86_64-linux "./bin/activate"; + path = deploy-rs.lib.x86_64-linux.activate.custom self.defaultPackage.x86_64-linux "./bin/activate"; user = "hello"; }; }; diff --git a/flake.nix b/flake.nix index a836b3c..d92a60a 100644 --- a/flake.nix +++ b/flake.nix @@ -62,7 +62,7 @@ ]; }; - nixos = base: custom base "$PROFILE/bin/switch-to-configuration switch"; + nixos = base: custom base.config.system.build.toplevel "$PROFILE/bin/switch-to-configuration switch"; noop = base: custom base ":"; }; -- cgit v1.2.3