chore: run nix fmt
Some checks failed
CI / Format Check (push) Successful in 1s
CI / Flake Check (push) Failing after 51s
CI / Evaluate Key Configurations (nix-builder) (push) Has been skipped
CI / Evaluate Key Configurations (nix-desktop1) (push) Has been skipped
CI / Evaluate Key Configurations (nix-laptop1) (push) Has been skipped
CI / Evaluate Artifacts (installer-iso-nix-laptop1) (push) Has been skipped
CI / Evaluate Artifacts (lxc-nix-builder) (push) Has been skipped

This commit is contained in:
UGA Innovation Factory
2026-01-05 15:58:23 -05:00
parent 2f2a305df4
commit c57c1994c9

View File

@@ -33,7 +33,11 @@
nix.settings.experimental-features = "nix-command flakes"; 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 ]; isoImage.storeContents = [ targetSystemBuild.toplevel ];
@@ -54,35 +58,35 @@
}; };
script = '' script = ''
echo "=== AUTO INSTALL START for ${hostName} ===" echo "=== AUTO INSTALL START for ${hostName} ==="
echo ">>> Running disko script..." echo ">>> Running disko script..."
${diskoScript} ${diskoScript}
<<<<<<< HEAD <<<<<<< HEAD
echo ">>> Setting up NixOS..." echo ">>> Setting up NixOS..."
nixos-install \ nixos-install \
--system ${targetSystemBuild.toplevel} \ --system ${targetSystemBuild.toplevel} \
--no-root-passwd \ --no-root-passwd \
--no-channel-copy \ --no-channel-copy \
--substituters "" --substituters ""
======= =======
echo ">>> Copying system closure to target..." echo ">>> Copying system closure to target..."
# Copy the entire system closure without substitution # Copy the entire system closure without substitution
nix-store --store /mnt --load-db < <(nix-store --dump-db) nix-store --store /mnt --load-db < <(nix-store --dump-db)
nix-copy-closure --to /mnt ${targetSystem} 2>/dev/null || true nix-copy-closure --to /mnt ${targetSystem} 2>/dev/null || true
echo ">>> Running nixos-install..." echo ">>> Running nixos-install..."
# Install with pre-built closure already in store # Install with pre-built closure already in store
nixos-install \ nixos-install \
--no-root-passwd \ --no-root-passwd \
--root /mnt \ --root /mnt \
--system ${targetSystem} \ --system ${targetSystem} \
--option substitute false --option substitute false
>>>>>>> parent of b23525d (fix: build closure in build-step instead of on iso) >>>>>>> parent of b23525d (fix: build closure in build-step instead of on iso)
echo ">>> Done. Rebooting." echo ">>> Done. Rebooting."
systemctl reboot systemctl reboot
''; '';
}; };
} }