diff options
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/kaworu/default.nix | 3 | ||||
| -rw-r--r-- | hosts/kaworu/hardware.nix | 7 | ||||
| -rw-r--r-- | hosts/shinji/default.nix | 6 | ||||
| -rw-r--r-- | hosts/shinji/hardware.nix | 18 | ||||
| -rw-r--r-- | hosts/thinkpad/default.nix | 3 | ||||
| -rw-r--r-- | hosts/thinkpad/hardware.nix | 12 |
6 files changed, 12 insertions, 37 deletions
diff --git a/hosts/kaworu/default.nix b/hosts/kaworu/default.nix index b85b86d..25c16c7 100644 --- a/hosts/kaworu/default.nix +++ b/hosts/kaworu/default.nix @@ -34,6 +34,9 @@ minecraft.enable = true; steam.enable = true; }; + bootloader = { + limine.enable = true; + }; # modules amdgpu.enable = true; diff --git a/hosts/kaworu/hardware.nix b/hosts/kaworu/hardware.nix index c3c9a57..0f2d277 100644 --- a/hosts/kaworu/hardware.nix +++ b/hosts/kaworu/hardware.nix @@ -1,11 +1,4 @@ _: { - # bootloader - boot.loader.systemd-boot.enable = true; - boot.loader.efi = { - canTouchEfiVariables = true; - efiSysMountPoint = "/boot/efi"; - }; - # kernel modules boot.initrd.availableKernelModules = [ "xhci_pci" diff --git a/hosts/shinji/default.nix b/hosts/shinji/default.nix index 916fa52..7e23f4a 100644 --- a/hosts/shinji/default.nix +++ b/hosts/shinji/default.nix @@ -83,6 +83,12 @@ enable = true; ip = "10.3.0.3/32"; }; + bootloader = { + limine = { + enable = true; + secureBoot.enable = true; + }; + }; # modules amdgpu.enable = true; diff --git a/hosts/shinji/hardware.nix b/hosts/shinji/hardware.nix index b0933f0..1edae37 100644 --- a/hosts/shinji/hardware.nix +++ b/hosts/shinji/hardware.nix @@ -8,24 +8,6 @@ inputs.nixos-hardware.nixosModules.lenovo-yoga-7-slim-gen8 ]; - # bootloader - boot.loader = { - efi.canTouchEfiVariables = true; - limine = { - enable = true; - efiSupport = true; - secureBoot.enable = true; - maxGenerations = 10; - style = { - backdrop = config.theme.colors.base; - wallpapers = [config.theme.wallpaper]; - }; - }; - - grub.enable = false; - systemd-boot.enable = false; - }; - # kernel modules boot.initrd.availableKernelModules = [ "nvme" diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index 8db964c..e57214d 100644 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -37,6 +37,9 @@ _: { enable = true; ip = "10.3.0.5/32"; }; + bootloader = { + grub.enable = true; + }; # modules battery.enable = true; diff --git a/hosts/thinkpad/hardware.nix b/hosts/thinkpad/hardware.nix index a012cbc..adc160b 100644 --- a/hosts/thinkpad/hardware.nix +++ b/hosts/thinkpad/hardware.nix @@ -1,5 +1,4 @@ { - config, inputs, ... }: { @@ -8,17 +7,6 @@ inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-7th-gen ]; - # bootloader - boot.loader = { - efi.canTouchEfiVariables = true; - grub = { - enable = true; - efiSupport = true; - device = "nodev"; - splashImage = config.theme.wallpaper; - }; - }; - # kernel modules boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"]; boot.initrd.kernelModules = []; |