Commit c9077f84c47c

Vincent Demeester <vincent@sbr.pm>
2026-02-18 16:36:24
refactor(systems): extract shared RPi4 boot config
Deduplicated three identical boot.nix files (aix, athena, demeter) into systems/common/hardware/rpi4-boot.nix.
main
1 parent 948a577
Changed files (4)
systems
aix
boot.nix
athena
boot.nix
common
hardware
rpi4-boot.nix
demeter
boot.nix
systems/aix/boot.nix
@@ -1,19 +1,4 @@
-{ lib, pkgs, ... }:
+{ ... }:
 {
-  console.keyMap = lib.mkForce "us";
-  boot = {
-    kernelPackages = pkgs.linuxKernel.packages.linux_rpi4;
-    initrd.systemd.enable = lib.mkForce false;
-    # initrd.systemd.enableTpm2 = false;
-    initrd.availableKernelModules = [
-      "xhci_pci"
-      "usbhid"
-      "usb_storage"
-    ];
-    loader = {
-      grub.enable = false;
-      systemd-boot.enable = lib.mkForce false;
-      generic-extlinux-compatible.enable = true;
-    };
-  };
+  imports = [ ../common/hardware/rpi4-boot.nix ];
 }
systems/athena/boot.nix
@@ -1,19 +1,4 @@
-{ lib, pkgs, ... }:
+{ ... }:
 {
-  console.keyMap = lib.mkForce "us";
-  boot = {
-    kernelPackages = pkgs.linuxKernel.packages.linux_rpi4;
-    initrd.systemd.enable = lib.mkForce false;
-    # initrd.systemd.enableTpm2 = false;
-    initrd.availableKernelModules = [
-      "xhci_pci"
-      "usbhid"
-      "usb_storage"
-    ];
-    loader = {
-      grub.enable = false;
-      systemd-boot.enable = lib.mkForce false;
-      generic-extlinux-compatible.enable = true;
-    };
-  };
+  imports = [ ../common/hardware/rpi4-boot.nix ];
 }
systems/common/hardware/rpi4-boot.nix
@@ -0,0 +1,19 @@
+{ lib, pkgs, ... }:
+{
+  console.keyMap = lib.mkForce "us";
+  boot = {
+    kernelPackages = pkgs.linuxKernel.packages.linux_rpi4;
+    initrd.systemd.enable = lib.mkForce false;
+    # initrd.systemd.enableTpm2 = false;
+    initrd.availableKernelModules = [
+      "xhci_pci"
+      "usbhid"
+      "usb_storage"
+    ];
+    loader = {
+      grub.enable = false;
+      systemd-boot.enable = lib.mkForce false;
+      generic-extlinux-compatible.enable = true;
+    };
+  };
+}
systems/demeter/boot.nix
@@ -1,19 +1,4 @@
-{ lib, pkgs, ... }:
+{ ... }:
 {
-  console.keyMap = lib.mkForce "us";
-  boot = {
-    kernelPackages = pkgs.linuxKernel.packages.linux_rpi4;
-    initrd.systemd.enable = lib.mkForce false;
-    # initrd.systemd.enableTpm2 = false;
-    initrd.availableKernelModules = [
-      "xhci_pci"
-      "usbhid"
-      "usb_storage"
-    ];
-    loader = {
-      grub.enable = false;
-      systemd-boot.enable = lib.mkForce false;
-      generic-extlinux-compatible.enable = true;
-    };
-  };
+  imports = [ ../common/hardware/rpi4-boot.nix ];
 }