From c57c1994c940755834d2379aacdea0324a1335c0 Mon Sep 17 00:00:00 2001 From: UGA Innovation Factory Date: Mon, 5 Jan 2026 15:58:23 -0500 Subject: [PATCH] chore: run nix fmt --- installer/auto-install.nix | 56 ++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/installer/auto-install.nix b/installer/auto-install.nix index 1c2274d..367a5e1 100644 --- a/installer/auto-install.nix +++ b/installer/auto-install.nix @@ -33,7 +33,11 @@ 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 ]; @@ -54,35 +58,35 @@ }; 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 + <<<<<<< 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 ">>> 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 ">>> 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 ''; }; }