nix-configs

commit 68bde803b58a7949b8b43e7bd1ce0be83ae576ae
parent 139342d0e9e8597f59b2b058099564220a418ac7
Author: breadcat <breadcat@users.noreply.github.com>
Date:   Tue,  6 Jan 2026 19:12:25 +0000

Common include bootloaders

Diffstat:
A
common/boot-grub.nix
 | 
9
+++++++++
A
common/boot-systemd.nix
 | 
8
++++++++
M
machines/arcadia.nix
 | 
10
++--------
M
machines/artemis.nix
 | 
9
++-------
M
machines/atlas.nix
 | 
10
++--------
M
machines/ilias.nix
 | 
11
+++--------
M
machines/minerva.nix
 | 
12
+++---------

7 files changed, 29 insertions(+), 40 deletions(-)
diff --git a/common/boot-grub.nix b/common/boot-grub.nix
@@ -0,0 +1,9 @@
+{
+  boot = {
+    loader.grub = {
+      enable = true;
+      device = "/dev/sda";
+      useOSProber = true;
+    };
+  };
+}
diff --git a/common/boot-systemd.nix b/common/boot-systemd.nix
@@ -0,0 +1,8 @@
+{
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+  };
+}
diff --git a/machines/arcadia.nix b/machines/arcadia.nix
@@ -9,6 +9,7 @@ let machine = "arcadia"; in {
     (import ../common/home-manager.nix  { inherit machine fullname username domain email sshkey sshport timezone postcode address htpasswd vpnusername vpnpassword todosecret privatekey matrixuser matrixserver; })
     ../common/audio.nix
     ../common/autologin.nix
+    ../common/boot-systemd.nix
     ../common/emulators.nix
     ../common/flakes.nix
     ../common/fonts.nix
@@ -37,14 +38,7 @@ let machine = "arcadia"; in {
   };
 
   # Hardware and system
-  boot = {
-    initrd = { availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; };
-    kernelModules = [ "kvm-intel" ];
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-  };
+  boot.initrd = { availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; };
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware = {
     cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/machines/artemis.nix b/machines/artemis.nix
@@ -7,6 +7,7 @@ let machine = "artemis"; in {
   imports = [
     (import ../common/variables.nix { inherit machine fullname username domain email sshkey sshport timezone postcode address htpasswd vpnusername vpnpassword todosecret privatekey matrixuser matrixserver; })
     (import ../common/home-manager.nix  { inherit machine fullname username domain email sshkey sshport timezone postcode address htpasswd vpnusername vpnpassword todosecret privatekey matrixuser matrixserver; })
+    ../common/boot-systemd.nix
     ../common/docker.nix
     ../common/flakes.nix
     ../common/garbage.nix
@@ -38,13 +39,7 @@ let machine = "artemis"; in {
   };
 
   # Hardware and system
-  boot = {
-    initrd = { availableKernelModules = [ "xhci_pci" "virtio_pci" "virtio_scsi" "usbhid" ]; };
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-  };
+  boot.initrd = { availableKernelModules = [ "xhci_pci" "virtio_pci" "virtio_scsi" "usbhid" ]; };
   nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
 
   # Cron jobs
diff --git a/machines/atlas.nix b/machines/atlas.nix
@@ -9,6 +9,7 @@ let machine = "atlas"; in {
     (import ../common/home-manager.nix  { inherit machine fullname username domain email sshkey sshport timezone postcode address htpasswd vpnusername vpnpassword todosecret privatekey matrixuser matrixserver; })
     ../common/audio.nix
     ../common/autologin.nix
+    ../common/boot-systemd.nix
     ../common/devel.nix
     ../common/flakes.nix
     ../common/fonts.nix
@@ -61,14 +62,7 @@ let machine = "atlas"; in {
     };
 
   # Hardware and system
-  boot = {
-    initrd = { availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; };
-    kernelModules = [ "kvm-intel" ];
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-  };
+  boot.initrd = { availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; };
   hardware.graphics = {
     enable = true;
     enable32Bit = true;
diff --git a/machines/ilias.nix b/machines/ilias.nix
@@ -7,6 +7,7 @@ let machine = "ilias"; in {
   imports = [
     (import ../common/variables.nix { inherit machine fullname username domain email sshkey sshport timezone postcode address htpasswd vpnusername vpnpassword todosecret privatekey matrixuser matrixserver; })
     (import ../common/home-manager.nix  { inherit machine fullname username domain email sshkey sshport timezone postcode address htpasswd vpnusername vpnpassword todosecret privatekey matrixuser matrixserver; })
+    ../common/boot-systemd.nix
     ../common/devel.nix
     ../common/flakes.nix
     ../common/garbage.nix
@@ -56,14 +57,8 @@ let machine = "ilias"; in {
   };
 
   # Hardware and system
-  boot = {
-    initrd = { availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ]; };
-    kernelModules = [ "kvm-intel" ];
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-  };
+  boot.initrd = { availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ]; };
+  boot.kernelModules = [ "kvm-intel" ];
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   swapDevices = [
diff --git a/machines/minerva.nix b/machines/minerva.nix
@@ -9,6 +9,7 @@ let machine = "minerva"; in {
     (import ../common/home-manager.nix  { inherit machine fullname username domain email sshkey sshport timezone postcode address htpasswd vpnusername vpnpassword todosecret privatekey matrixuser matrixserver; })
     ../common/audio.nix
     ../common/autologin.nix
+    ../common/boot-grub.nix
     ../common/devel.nix
     ../common/flakes.nix
     ../common/fonts.nix
@@ -56,15 +57,8 @@ let machine = "minerva"; in {
   };
 
   # Hardware and system
-  boot = {
-    initrd = { availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ]; };
-    kernelModules = [ "kvm-intel" ];
-    loader.grub = {
-      enable = true;
-      device = "/dev/sda";
-      useOSProber = true;
-    };
-  };
+  boot.initrd = { availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ]; };
+  boot.kernelModules = [ "kvm-intel" ];
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;