From d95f7601da6fd11887433a8061976b25e0367399 Mon Sep 17 00:00:00 2001 From: UGA Innovation Factory Date: Mon, 5 Jan 2026 16:05:02 -0500 Subject: [PATCH] refactor: change usage of targetSystem to targetSystemBuild.toplevel --- installer/auto-install.nix | 43 +++++++++++--------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/installer/auto-install.nix b/installer/auto-install.nix index 367a5e1..5f06984 100644 --- a/installer/auto-install.nix +++ b/installer/auto-install.nix @@ -33,11 +33,7 @@ nix.settings.experimental-features = "nix-command flakes"; - system.extraDependencies = with targetSystemBuild; [ - toplevel - etc - bootStage2 - ]; + system.extraDependencies = with targetSystemBuild; [ toplevel etc bootStage2 ]; isoImage.storeContents = [ targetSystemBuild.toplevel ]; @@ -58,35 +54,20 @@ }; script = '' - echo "=== AUTO INSTALL START for ${hostName} ===" + echo "=== AUTO INSTALL START for ${hostName} ===" - echo ">>> Running disko script..." - ${diskoScript} + echo ">>> Running disko script..." + ${diskoScript} - <<<<<<< HEAD - echo ">>> Setting up NixOS..." - nixos-install \ - --system ${targetSystemBuild.toplevel} \ - --no-root-passwd \ - --no-channel-copy \ - --substituters "" - ======= - echo ">>> Copying system closure to target..." - # Copy the entire system closure without substitution - nix-store --store /mnt --load-db < <(nix-store --dump-db) - nix-copy-closure --to /mnt ${targetSystem} 2>/dev/null || true + echo ">>> Setting up NixOS..." + nixos-install \ + --system ${targetSystemBuild.toplevel} \ + --no-root-passwd \ + --no-channel-copy \ + --substituters "" - echo ">>> Running nixos-install..." - # Install with pre-built closure already in store - nixos-install \ - --no-root-passwd \ - --root /mnt \ - --system ${targetSystem} \ - --option substitute false - >>>>>>> parent of b23525d (fix: build closure in build-step instead of on iso) - - echo ">>> Done. Rebooting." - systemctl reboot + echo ">>> Done. Rebooting." + systemctl reboot ''; }; }