talexander/machine_setup
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix the installer image.

Browse Source
This commit is contained in:
Tom Alexander 2025-11-25 21:13:53 -05:00
parent 9099c4b67e
commit b743421749
Signed by: talexander
GPG Key ID: 36C99E8B3C39D85F
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nix/configuration/flake.nix
View File

@ -149,6 +149,7 @@
}; };
} }
) )
({ nixpkgs.hostPlatform.system = nodeConfig.system; })
]; ];
}; };
in in

36
nix/configuration/formats/installer.nix
View File

@ -10,7 +10,7 @@ let
installer = pkgs.writeShellApplication { installer = pkgs.writeShellApplication {
name = "installer"; name = "installer";
runtimeInputs = with pkgs; [ runtimeInputs = with pkgs; [
clevis # clevis
dosfstools dosfstools
e2fsprogs e2fsprogs
gawk gawk
@ -26,10 +26,10 @@ let
nixos-install --no-channel-copy --no-root-password --option substituters "" --system ${targetSystem.config.system.build.toplevel} nixos-install --no-channel-copy --no-root-password --option substituters "" --system ${targetSystem.config.system.build.toplevel}
''; '';
}; };
# installerFailsafe = pkgs.writeShellScript "failsafe" '' installerFailsafe = pkgs.writeShellScript "failsafe" ''
# ${lib.getExe installer} || echo "ERROR: Installation failure!" ${lib.getExe installer} || echo "ERROR: Installation failure!"
# sleep 3600 sleep 3600
# ''; '';
in in
{ {
imports = [ imports = [
@ -37,9 +37,11 @@ in
(modulesPath + "/profiles/all-hardware.nix") (modulesPath + "/profiles/all-hardware.nix")
]; ];
boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_17;
boot.zfs.package = pkgs.zfs_unstable;
boot.kernelParams = [ boot.kernelParams = [
"quiet" "quiet"
# "systemd.unit=getty.target" "systemd.unit=getty.target"
]; ];
boot.supportedFilesystems.zfs = true; boot.supportedFilesystems.zfs = true;
boot.initrd.systemd.enable = true; boot.initrd.systemd.enable = true;
@ -54,17 +56,17 @@ in
installer installer
]; ];
# systemd.services."getty@tty1" = { systemd.services."getty@tty1" = {
# overrideStrategy = "asDropin"; overrideStrategy = "asDropin";
# serviceConfig = { serviceConfig = {
# ExecStart = [ ExecStart = [
# "" ""
# installerFailsafe installerFailsafe
# ]; ];
# Restart = "no"; Restart = "no";
# StandardInput = "null"; StandardInput = "null";
# }; };
# }; };
# system.stateVersion = lib.mkDefault lib.trivial.release; # system.stateVersion = lib.mkDefault lib.trivial.release;
system.stateVersion = "24.11"; system.stateVersion = "24.11";