Compare commits
3 Commits
9099c4b67e
...
c4ff96b847
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c4ff96b847
|
||
|
|
aa05ab7289
|
||
|
|
b743421749
|
@@ -180,11 +180,6 @@
|
||||
(final: prev: {
|
||||
grub2 = (final.callPackage ./package/grub { });
|
||||
})
|
||||
(final: prev: {
|
||||
rpcs3 = prev.rpcs3.override {
|
||||
ffmpeg = final.ffmpeg_7;
|
||||
};
|
||||
})
|
||||
];
|
||||
|
||||
# This option defines the first version of NixOS you have installed on this particular machine,
|
||||
|
||||
@@ -149,6 +149,7 @@
|
||||
};
|
||||
}
|
||||
)
|
||||
({ nixpkgs.hostPlatform.system = nodeConfig.system; })
|
||||
];
|
||||
};
|
||||
in
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -74,6 +74,10 @@
|
||||
# services.fstrim.enable = lib.mkDefault true;
|
||||
|
||||
fonts.enableDefaultPackages = lib.mkForce true;
|
||||
fonts.packages = with pkgs; [
|
||||
corefonts
|
||||
];
|
||||
allowedUnfree = [ "corefonts" ];
|
||||
|
||||
me.alacritty.enable = true;
|
||||
me.amd_s2idle.enable = true;
|
||||
|
||||
Reference in New Issue
Block a user