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