From 0fe6007716d5d5d26557c5ea072bdc75195f1759 Mon Sep 17 00:00:00 2001 From: _cry64 Date: Thu, 15 Jan 2026 12:16:57 +1000 Subject: [PATCH] simplify via inherit --- cerulean/flake-config/nexus.nix | 41 ++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/cerulean/flake-config/nexus.nix b/cerulean/flake-config/nexus.nix index 58c1a99..a9d0b02 100644 --- a/cerulean/flake-config/nexus.nix +++ b/cerulean/flake-config/nexus.nix @@ -46,36 +46,49 @@ ); deploy.nodes = mapNodes (nodeName: node: let + inherit + (node.deploy) + activationTimeout + autoRollback + confirmTimeout + interactiveSudo + magicRollback + remoteBuild + ssh + sudo + user + ; + nixosFor = system: deploy-rs.lib.${system}.activate.nixos; in { - hostname = node.deploy.ssh.host; + hostname = ssh.host; profilesOrder = ["default"]; # profiles priority profiles.default = { path = nixosFor node.system nixosConfigurations.${nodeName}; - user = node.deploy.user; - sudo = node.deploy.sudo; - interactiveSudo = node.deploy.interactiveSudo; + user = user; + sudo = sudo; + interactiveSudo = interactiveSudo; fastConnection = false; - autoRollback = node.deploy.autoRollback; - magicRollback = node.deploy.magicRollback; - activationTimeout = node.deploy.activationTimeout; - confirmTimeout = node.deploy.confirmTimeout; + autoRollback = autoRollback; + magicRollback = magicRollback; + activationTimeout = activationTimeout; + confirmTimeout = confirmTimeout; - remoteBuild = node.deploy.remoteBuild; - sshUser = node.deploy.ssh.user; + remoteBuild = remoteBuild; + sshUser = ssh.user; sshOpts = - node.deploy.ssh.opts + ssh.opts ++ ( - if builtins.elem "-p" node.deploy.ssh.opts + if builtins.elem "-p" ssh.opts then [] - else ["-p" (toString node.deploy.ssh.port)] + else ["-p" (toString ssh.port)] ) ++ ( - if builtins.elem "-A" node.deploy.ssh.opts + if builtins.elem "-A" ssh.opts then [] else ["-A"] );