From dbfc4044ef79153f2b80b0d6c252ddbf2ab476ab Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 25 Jan 2023 23:27:49 +0100
Subject: l install-system: support install via hilum

---
 lass/5pkgs/install-system/default.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/lass/5pkgs/install-system/default.nix b/lass/5pkgs/install-system/default.nix
index 9a392e66..0e13265f 100644
--- a/lass/5pkgs/install-system/default.nix
+++ b/lass/5pkgs/install-system/default.nix
@@ -5,13 +5,21 @@ pkgs.writers.writeDashBin "install-system" ''
   TARGET=$2
   # format
   if ! (sshn "$TARGET" -- mountpoint /mnt); then
-    nix run github:numtide/nixos-remote -- --stop-after-disko --store-paths "$(nix-build --no-out-link -I stockholm="$HOME"/sync/stockholm -I nixos-config="$HOME"/sync/stockholm/lass/1systems/"$SYSTEM"/physical.nix '<nixpkgs/nixos>' -A config.system.build.diskoNoDeps)" /dev/null "$TARGET"
+    if ! (sshn "$TARGET" -- type -p nix); then
+      nix run github:numtide/nixos-remote -- --stop-after-disko --store-paths "$(nix-build --no-out-link -I stockholm="$HOME"/sync/stockholm -I nixos-config="$HOME"/sync/stockholm/lass/1systems/"$SYSTEM"/physical.nix '<nixpkgs/nixos>' -A config.system.build.diskoNoDeps)" /dev/null "$TARGET"
+    else
+      disko=$(nix-build -I stockholm=$HOME/sync/stockholm -I secrets=$HOME/sync/stockholm/lass/2configs/tests/dummy-secrets -I nixos-config=$HOME/sync/stockholm/lass/1systems/$SYSTEM/physical.nix '<nixpkgs/nixos>' -A config.system.build.disko)
+      NIX_SSHOPTS='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' nix-copy-closure --to "$TARGET" "$disko"
+      sshn -t "$TARGET" -- "$disko"
+    fi
   fi
 
   # install dependencies
   sshn "$TARGET" << SSH
-    nix-channel --update
-    nix-env -iA nixos.git
+    if ! type -p git; then
+      nix-channel --update
+      nix-env -iA nixos.git
+    fi
   SSH
 
   # populate
@@ -19,8 +27,9 @@ pkgs.writers.writeDashBin "install-system" ''
 
   # install
   sshn "$TARGET" << SSH
-    ln -s /mnt/var/src /var/src
-    NIXOS_CONFIG=/var/src/nixos-config nixos-install --no-root-password -I /var/src
+    NIXOS_CONFIG=/var/src/nixos-config nixos-install --no-root-password -I /mnt/var/src
+    nixos-enter -- nixos-rebuild -I /var/src switch --install-bootloader
+    umount -R /mnt
     zpool export -fa
   SSH
 ''
-- 
cgit v1.2.3