diff options
| -rw-r--r-- | parts/deploy.nix | 8 | ||||
| -rw-r--r-- | parts/lib/utils.nix | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/parts/deploy.nix b/parts/deploy.nix index dbb1cc3..725c322 100644 --- a/parts/deploy.nix +++ b/parts/deploy.nix @@ -3,9 +3,13 @@ lib, ... }: let - targets = ["atlas" "p-body"]; + inherit (builtins) elem; + inherit (lib) filterAttrs; + inherit (self) darwinConfigurations nixosConfigurations; - targets' = lib.filterAttrs (n: _: builtins.elem n targets) self.nixosConfigurations; + targets = ["atlas" "p-body" "caroline"]; + + targets' = filterAttrs (n: _: elem n targets) (nixosConfigurations // darwinConfigurations); in { flake.deploy = { remoteBuild = true; diff --git a/parts/lib/utils.nix b/parts/lib/utils.nix index 4473e22..7e3109f 100644 --- a/parts/lib/utils.nix +++ b/parts/lib/utils.nix @@ -15,9 +15,13 @@ in { mkDeployNodes = builtins.mapAttrs (_: system: let inherit (deployPkgs system.pkgs) deploy-rs; + type = + if system.pkgs.stdenv.isLinux + then "nixos" + else "darwin"; in { sshUser = "root"; hostname = system.config.networking.hostName; - profiles.system.path = deploy-rs.lib.activate.nixos system; + profiles.system.path = deploy-rs.lib.activate.${type} system; }); } |