From 8270e4e0f42b129c61ac0836c5a18959d08189ad Mon Sep 17 00:00:00 2001 From: _cry64 Date: Tue, 17 Mar 2026 22:49:45 +1000 Subject: [PATCH] merge checks.nix into deploy.nix --- nix/snow/flake/modules/checks.nix | 10 --- nix/snow/flake/modules/default.nix | 1 - nix/snow/flake/modules/deploy.nix | 107 +++++++++++++++-------------- 3 files changed, 57 insertions(+), 61 deletions(-) delete mode 100644 nix/snow/flake/modules/checks.nix diff --git a/nix/snow/flake/modules/checks.nix b/nix/snow/flake/modules/checks.nix deleted file mode 100644 index de6a9c0..0000000 --- a/nix/snow/flake/modules/checks.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - config, - _snowFlake, - ... -}: { - outputs.checks = - _snowFlake.inputs.deploy-rs.lib - |> builtins.mapAttrs (system: deployLib: - deployLib.deployChecks config.outputs.deploy); -} diff --git a/nix/snow/flake/modules/default.nix b/nix/snow/flake/modules/default.nix index 438b213..cf35a62 100644 --- a/nix/snow/flake/modules/default.nix +++ b/nix/snow/flake/modules/default.nix @@ -1,6 +1,5 @@ {...}: { imports = [ - ./checks.nix ./deploy.nix ]; } diff --git a/nix/snow/flake/modules/deploy.nix b/nix/snow/flake/modules/deploy.nix index 59bbb49..fa4923e 100644 --- a/nix/snow/flake/modules/deploy.nix +++ b/nix/snow/flake/modules/deploy.nix @@ -4,60 +4,67 @@ config, ... }: { - outputs.deploy.nodes = snow.lib.mapNodes config.nodes ({ - name, - node, - ... - }: let - inherit - (node.deploy) - ssh - user - interactiveSudo - remoteBuild - rollback - autoRollback - magicRollback - activationTimeout - confirmTimeout - ; + outputs = { + checks = + _snowFlake.inputs.deploy-rs.lib + |> builtins.mapAttrs (system: deployLib: + deployLib.deployChecks config.outputs.deploy); - nixosFor = system: _snowFlake.inputs.deploy-rs.lib.${system}.activate.nixos; - in { - hostname = - if ssh.host != null - then ssh.host - else ""; + deploy.nodes = snow.lib.mapNodes config.nodes ({ + name, + node, + ... + }: let + inherit + (node.deploy) + ssh + user + interactiveSudo + remoteBuild + rollback + autoRollback + magicRollback + activationTimeout + confirmTimeout + ; - profilesOrder = ["default"]; # profiles priority - profiles.default = { - path = nixosFor node.system config.outputs.nixosConfigurations.${name}; + nixosFor = system: _snowFlake.inputs.deploy-rs.lib.${system}.activate.nixos; + in { + hostname = + if ssh.host != null + then ssh.host + else ""; - user = user; - sudo = "sudo -u"; - interactiveSudo = interactiveSudo; + profilesOrder = ["default"]; # profiles priority + profiles.default = { + path = nixosFor node.system config.outputs.nixosConfigurations.${name}; - fastConnection = false; + user = user; + sudo = "sudo -u"; + interactiveSudo = interactiveSudo; - autoRollback = autoRollback -> rollback; - magicRollback = magicRollback -> rollback; - activationTimeout = activationTimeout; - confirmTimeout = confirmTimeout; + fastConnection = false; - remoteBuild = remoteBuild; - sshUser = ssh.user; - sshOpts = - ssh.opts - ++ ( - if builtins.elem "-p" ssh.opts - then [] - else ["-p" (toString ssh.port)] - ) - ++ ( - if builtins.elem "-A" ssh.opts - then [] - else ["-A"] - ); - }; - }); + autoRollback = autoRollback -> rollback; + magicRollback = magicRollback -> rollback; + activationTimeout = activationTimeout; + confirmTimeout = confirmTimeout; + + remoteBuild = remoteBuild; + sshUser = ssh.user; + sshOpts = + ssh.opts + ++ ( + if builtins.elem "-p" ssh.opts + then [] + else ["-p" (toString ssh.port)] + ) + ++ ( + if builtins.elem "-A" ssh.opts + then [] + else ["-A"] + ); + }; + }); + }; }