From 6c5830b59168ca3e88770e5f477567524d83d4b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 13 Nov 2023 02:54:21 +0100
Subject: [PATCH] packages: fix nix-env not being in PATH; check if we nuke the
 microvm host on accident

---
 packages.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages.nix b/packages.nix
index 8b9a31da..8a4050f4 100644
--- a/packages.nix
+++ b/packages.nix
@@ -116,7 +116,7 @@ lib.attrsets.mapAttrs
           ''}
 
           if [[ $(ssh ${target} cat /etc/hostname) != ${name} ]]; then
-            echo "hostname of the target machine does not match, please manually investiagte!"
+            echo "hostname of the target machine does not match, please manually investigate!"
             echo "  $(ssh ${target} cat /etc/hostname) != ${name}"
             exit 1
           fi
@@ -126,7 +126,7 @@ lib.attrsets.mapAttrs
           # use nixos-rebuild from target config
           ssh ${target} bash -e <<END
           nix build ${toplevelDrvPath}
-          nix-env -p /nix/var/nix/profiles/system --set ${toplevelOutPath}
+          ${discardStringCtx hostConfig.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set ${toplevelOutPath}
           ${toplevelOutPath}/bin/switch-to-configuration "''${@:-switch}"
           END
         '';
@@ -219,8 +219,13 @@ lib.attrsets.mapAttrs
               ssh ${target} bash -e <<END
               set -eou pipefail
 
+              if [[ $(cat /etc/hostname) != ${name} ]]; then
+                echo "hostname of the target machine does not match, please manually investigate!"
+                echo "  $(ssh ${target} cat /etc/hostname) != ${name}"
+                exit 1
+              fi
+              ${discardStringCtx hostConfig.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set ${toplevelOutPath}
               ${toplevelOutPath}/bin/switch-to-configuration "''${@:-switch}"
-              nix-env -p /nix/var/nix/profiles/system --set ${toplevelOutPath}
             END
             # ^ yes, this is required to be like this