From e2556327582cf1ffec0e925a64481b05facbccae Mon Sep 17 00:00:00 2001 From: NyxErinys Date: Tue, 19 May 2026 20:18:49 -0500 Subject: [PATCH] fix boot loader --- hosts/base.nix | 2 +- hosts/servers/poseidon/old/default.nix | 27 ++++++++++++++------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/hosts/base.nix b/hosts/base.nix index 536155f..f008ef2 100644 --- a/hosts/base.nix +++ b/hosts/base.nix @@ -17,7 +17,7 @@ devices = ["nodev"]; }; }; - kernelParams = [ "ipv6.disable=1" ]; + kernelParams = lib.mkDefault [ "ipv6.disable=1" ]; }; # system.autoUpgrade = mkDefault { diff --git a/hosts/servers/poseidon/old/default.nix b/hosts/servers/poseidon/old/default.nix index 8a3d37b..d83a62e 100644 --- a/hosts/servers/poseidon/old/default.nix +++ b/hosts/servers/poseidon/old/default.nix @@ -10,19 +10,22 @@ #boot.loader.efi.canTouchEfiVariables = true; boot.kernelPackages = pkgs.linuxPackages_6_6; - boot.kernelParams = lib mkForce [ "nohibernate" "ipv6.disable=1" ]; - boot.loader.grub = lib.mkForce { - enable = true; - device = "nodev"; - zfsSupport = true; - efiSupport = true; - copyKernels = true; - efiInstallAsRemovable = true; - mirroredBoots = [ - { devices = [ "/dev/disk/by-uuid/E862-56D1" ]; path = "/boot"; } - # { devices = [ "/dev/disk/by-uuid/5DF0-A042" ]; path = "/boot-fallback"; } - ]; + boot.kernelParams = [ "nohibernate" "ipv6.disable=1" ]; + boot.loader = { + grub = { + enable = true; + device = "nodev"; + zfsSupport = true; + efiSupport = true; + copyKernels = true; + efiInstallAsRemovable = true; + mirroredBoots = [ + { devices = [ "/dev/disk/by-uuid/E862-56D1" ]; path = "/boot"; } + # { devices = [ "/dev/disk/by-uuid/5DF0-A042" ]; path = "/boot-fallback"; } + ]; + }; }; + boot.blacklistedKernelModules = ["nouveau"]; fileSystems."/" =