From 8a057c3cdf2e147ce3c71d30539a3db9bfbed12c Mon Sep 17 00:00:00 2001 From: dadada Date: Wed, 24 Aug 2022 00:00:24 +0200 Subject: [PATCH] use system variable from nixos configuration --- deploy.nix | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/deploy.nix b/deploy.nix index 5317edb..6812266 100644 --- a/deploy.nix +++ b/deploy.nix @@ -1,20 +1,24 @@ { self, deploy-rs, ... }: let domain = "dadada.li"; - system = "x86_64-linux"; - activateNixos = deploy-rs.lib."${system}".activate.nixos; configs = self.nixosConfigurations; - daNode = hostname: { - hostname = "${hostname}.${domain}"; - fastConnection = true; - profiles = { - system = { - sshUser = "dadada"; - path = activateNixos configs."${hostname}"; - user = "root"; + daNode = hostname: + let + config = self.nixosConfigurations."${hostname}"; + system = config.pkgs.system; + activateNixos = deploy-rs.lib."${system}".activate.nixos; + in + { + hostname = "${hostname}.${domain}"; + fastConnection = true; + profiles = { + system = { + sshUser = "dadada"; + path = activateNixos config; + user = "root"; + }; }; }; - }; in { nodes = builtins.mapAttrs (hostname: fun: fun hostname) {