From 5bdcf5c65873bb5eb84caf7c7e11a5230c0b373b Mon Sep 17 00:00:00 2001 From: dadada Date: Tue, 23 Aug 2022 23:51:17 +0200 Subject: [PATCH] remove old deploy script --- apps.nix | 26 ++------------------------ deploy.nix | 6 ++++-- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/apps.nix b/apps.nix index 0e15681..94a2049 100644 --- a/apps.nix +++ b/apps.nix @@ -11,32 +11,10 @@ deploy = { type = "app"; - program = toString (pkgs.writeScript "deploy" '' + program = toString (pkgs.writeScript "self-deploy" '' #!${pkgs.runtimeShell} - domain='dadada.li' flake=$(nix flake metadata --json ${./.} | jq -r .url) - for host in "$@" - do - echo "=== Deploying ''${host} ===" - nixos-rebuild switch --upgrade --flake "''${flake}#$host" --target-host "''${host}.$domain" --build-host localhost --use-remote-sudo - done - ''); - }; - - hm-switch = { - type = "app"; - program = toString (pkgs.writeScript "hm-switch" '' - #!${pkgs.runtimeShell} - set -eu -o pipefail -x - tmpdir=$(mktemp -d) - export PATH=${pkgs.lib.makeBinPath [pkgs.coreutils pkgs.nixFlakes pkgs.jq]} - trap "rm -rf $tmpdir" EXIT - declare -A profiles=(["gorgon"]="home") - profile=''${profiles[$HOSTNAME]:-common} - flake=$(nix flake metadata --json ${./.} | jq -r .url) - nix build --out-link "$tmpdir/result" "$flake#hmConfigurations.''${profile}.activationPackage" "$@" - link=$(realpath $tmpdir/result) - $link/activate + deploy ''${flake} ''); }; } diff --git a/deploy.nix b/deploy.nix index baed09e..473874f 100644 --- a/deploy.nix +++ b/deploy.nix @@ -17,7 +17,9 @@ let }; in { - nodes.ifrit = daNode "ifrit"; - nodes.pruflas = daNode "pruflas"; + nodes = builtins.mapAttrs (hostname: fun: fun hostname) { + ifrit = daNode; + pruflas = daNode; + }; }