From e7b6c789dc9c18385d8c5ab8b2d91f4dbc805e2b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 4 Dec 2022 18:08:58 +0100 Subject: [PATCH] deploy-rs: fix config --- nixos/deploy.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/nixos/deploy.nix b/nixos/deploy.nix index cd118c3..a9edf4e 100644 --- a/nixos/deploy.nix +++ b/nixos/deploy.nix @@ -1,22 +1,23 @@ -{ self -, deploy-rs -, ... -}: +{ self, ... }: let - mkNode = server: ip: fast: { - hostname = "${ip}:22"; - fastConnection = fast; + inherit (self.inputs) deploy-rs; + mkNode = server: hostname: system: remoteBuild: { + inherit hostname remoteBuild; + fastConnection = true; profiles.system.path = - deploy-rs.lib.x86_64-linux.activate.nixos + deploy-rs.lib.${system}.activate.nixos self.nixosConfigurations."${server}"; }; in { user = "root"; - #sshUser = "felix"; - sshUser = "root"; + sshUser = "felix"; + sshOpts = [ "-i" "~/.ssh/keys/local_ed25519" ]; + #sshOpts = [ "-p" "6158" "-i" "~/.ssh/keys/local_ed25519" ]; + nodes = { - serverle = mkNode "serverle" "serverle.local" true; - newton = mkNode "newton" "buehler.rocks" true; + thinkman = mkNode "thinkman" "localhost" "x86_64-linux" false; + newton = mkNode "newton" "buehler.rocks" "x86_64-linux" false; + serverle = mkNode "serverle" "serverle.local" "aarch64-linux" true; }; }