about summary refs log tree commit diff
path: root/machines/profpatsch
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2022-06-27 01:16:09 +0200
committerProfpatsch <mail@profpatsch.de>2022-06-27 01:16:09 +0200
commit53e01dbc325e7d58a25a9746be85f6f45f048cbd (patch)
tree7d166ecf1c71e85aac53011b2079499297c9e8fd /machines/profpatsch
parentaf1a9bf3395e068a3a6fcd3f1e7ef0f7f42e86ff (diff)
machines/profpatsch: move thinkpad boot options to thinkpad.nix
Not sure about the boot loader config, but I guess it’s okay for now,
since it doesn’t diverge anyway.
Diffstat (limited to 'machines/profpatsch')
-rw-r--r--machines/profpatsch/shiki.nix3
-rw-r--r--machines/profpatsch/thinkpad.nix4
2 files changed, 4 insertions, 3 deletions
diff --git a/machines/profpatsch/shiki.nix b/machines/profpatsch/shiki.nix
index 6a7b8d24..fdb595f1 100644
--- a/machines/profpatsch/shiki.nix
+++ b/machines/profpatsch/shiki.nix
@@ -36,10 +36,7 @@ in {
     #########
     # Kernel
 
-    boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
     boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-label/root";
-    boot.loader.systemd-boot.enable = true;
-    boot.loader.grub.enable = false;
 
     # enable video loopback devices
     # via https://gist.github.com/TheSirC/93130f70cc280cdcdff89faf8d4e98ab
diff --git a/machines/profpatsch/thinkpad.nix b/machines/profpatsch/thinkpad.nix
index 4e9cf4f1..33475ed2 100644
--- a/machines/profpatsch/thinkpad.nix
+++ b/machines/profpatsch/thinkpad.nix
@@ -5,6 +5,10 @@
   imports = [];
 
   config = {
+    boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
+    boot.loader.systemd-boot.enable = true;
+    boot.loader.grub.enable = false;
+
     # Enables drivers, acpi, power management
     vuizvui.hardware.thinkpad.enable = true;