4 Commits

Include renames

Author	SHA1	Message	Date
beatzaplenty	79e8f9f2ce	Prompt for a host-key path interactively as a third fallback ... If neither /etc/host-keys nor /root/host-keys has the target's SSH host key, auto-install.sh previously went straight to "continue without one anyway?". Added a third option in between, gated on [[ -t 0 ]] (only offered when there's an actual operator at stdin, never in an unattended/non-interactive run): prompt for an arbitrary directory (USB stick, other mount, etc.), and if the key pair is there, copy it into /root/host-keys and install it to /mnt same as the existing pre-seeded-key path. Falls through to the original warning+confirm if the prompt is skipped, the path doesn't have the key, or the run isn't interactive at all. docs/auto-installer.md updated to mention the new fallback. Quick bash -n + shellcheck pass only, per request.	2026-07-22 02:54:06 +00:00
beatzaplenty	b46424343f	Wrap auto-install.sh in a nix-shell shebang for its required tools ... Running the script standalone (its whole point per the last commit) failed with "disko: command not found" -- jq/disko/nixos-install are only guaranteed present via the built installer image's environment.systemPackages, not on a plain checkout. Added a #!/usr/bin/env nix-shell / #!nix-shell -i bash -p jq disko nixos-install-tools shebang instead of a per-tool fallback: disko's own generated scripts already hardcode absolute Nix store paths for everything they shell out to internally (parted/sgdisk/mkfs.*/zfs/... confirmed by inspecting a generated system.build.formatScript earlier), so these three are the only genuinely external dependencies the script itself has. This is a fast no-op on the built installer image (already has all three) and what makes it also work standalone. Quick syntax + shellcheck pass only this round (bash -n, shellcheck with a `shellcheck shell=bash` directive since it doesn't recognize nix-shell shebangs natively) -- skipping the full codex-maintenance.sh sweep per request, to get this out for a real hardware test.	2026-07-22 02:44:49 +00:00
beatzaplenty	f565e9c2a1	Fix auto-install.sh to work standalone, not just baked into the image ... Two real bugs, both hit live: 1. Shebang: #!/run/current-system/sw/bin/bash only resolves on an already-activated NixOS system -- running the checked-out script directly (e.g. from a stock ISO, cloned repo) failed with "cannot execute: required file not found" on a non-NixOS box. Switched to #!/usr/bin/env bash, which resolves identically on NixOS (environment.usrbinenv's own default) and any normal Linux distro. Also fixed the file's missing executable bit. 2. FLAKE_BASE_URL: previously depended on pkgs.replaceVars substituting a Nix-templated @lanDomain@ placeholder at build time -- meaning it only ever worked when baked into the built installer image, not when run straight from a checkout (the literal, unexpanded "@lanDomain@" string reached git as a bogus hostname). Replaced with LAN_DOMAIN in scripts/env.sh (manually kept in sync with variables.nix's lanDomain, same pattern as NIX_CACHE_HOST/nixCacheHost already), sourced by the script itself like every other script in scripts/. Dropped pkgs.replaceVars from modules/installer/common.nix entirely -- scripts/env.sh is now baked into the image alongside auto-install.sh at a matching relative path (/etc/nixos-installer/env.sh next to /etc/nixos-installer/installer/auto-install.sh) so the script's own relative `source` line resolves the same way in both contexts. loginShellInit's invocation path and docs/auto-installer.md updated to match. Verified: shellcheck clean on both scripts, the baked files are byte-identical to their checked-in sources (no templating left to verify), and codex-maintenance.sh (secret grep, fmt, statix, full eval of every host/package including the installer/pxe artifacts) passes clean.	2026-07-22 02:38:11 +00:00
beatzaplenty	12a2354fad	Move auto-install.sh out of Nix config into a real script file ... Moves the auto-installer's shell script from an inline Nix string in modules/installer/common.nix to scripts/installer/auto-install.sh, a real, version-controlled, directly-editable/shellcheck-able file. common.nix now wires it in with pkgs.replaceVars, substituting the one value that actually needs to come from variables.nix (lanDomain) -- every other `${...}` in the script is a literal bash reference, left untouched. replaceVars fails the build if any @name@-shaped placeholder is left unsubstituted, so a typo'd or renamed variable is caught at eval time rather than silently shipping broken. Verified: built the substituted derivation and diffed it against the source template -- identical except for the one substituted line, no leftover unsubstituted placeholders. Full codex-maintenance.sh (secret grep, fmt, statix, full eval of every host/package including the installer/pxe artifacts that consume this) passes clean.	2026-07-22 02:05:31 +00:00