hosts: move bootloader config to default.nix files

2025-09-29 20:33:58 -07:00
parent fb4d2aaf4c
commit 349f5c1ded
26 changed files with 38 additions and 34 deletions
--- a/hosts/app-01/default.nix
+++ b/hosts/app-01/default.nix
@@ -1,3 +1,4 @@
+# hosts/app-01/default.nix
 {
  config,
  lib,
@@ -7,6 +8,9 @@
  ...
 }:
 {
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
  network-dhcp = {
    enable = true;
    hardwareAddress = "BC:24:11:B7:0C:49";
--- a/hosts/app-01/hardware-configuration.nix
+++ b/hosts/app-01/hardware-configuration.nix
@@ -61,7 +61,4 @@
  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
 }
--- a/hosts/borg-01/default.nix
+++ b/hosts/borg-01/default.nix
@@ -7,6 +7,9 @@
  ...
 }:
 {
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
  network-dhcp = {
    enable = true;
    hardwareAddress = "BC:24:11:67:42:BC";
--- a/hosts/borg-01/hardware-configuration.nix
+++ b/hosts/borg-01/hardware-configuration.nix
@@ -62,6 +62,4 @@
  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
 }
--- a/hosts/db-mdb11/default.nix
+++ b/hosts/db-mdb11/default.nix
@@ -11,6 +11,9 @@ let
  backupLabel = "mariadb";
 in
 {
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
  network-dhcp = {
    enable = true;
    hardwareAddress = "BC:24:11:27:01:4B";
--- a/hosts/db-mdb11/hardware-configuration.nix
+++ b/hosts/db-mdb11/hardware-configuration.nix
@@ -56,7 +56,4 @@
  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
 }
--- a/hosts/db-pg17/default.nix
+++ b/hosts/db-pg17/default.nix
@@ -8,6 +8,9 @@
 }:

 {
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
  network-dhcp = {
    enable = true;
    hardwareAddress = "BC:24:11:15:D0:D4";
--- a/hosts/db-pg17/hardware-configuration.nix
+++ b/hosts/db-pg17/hardware-configuration.nix
@@ -56,7 +56,4 @@
  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
 }
--- a/hosts/dev-01/default.nix
+++ b/hosts/dev-01/default.nix
@@ -7,6 +7,9 @@
  ...
 }:
 {
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
  network-dhcp = {
    enable = true;
    hardwareAddress = "BC:24:11:F1:81:77";
--- a/hosts/dev-01/hardware-configuration.nix
+++ b/hosts/dev-01/hardware-configuration.nix
@@ -56,7 +56,4 @@
  # networking.interfaces.enp6s18.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
 }
--- a/hosts/fs-01/default.nix
+++ b/hosts/fs-01/default.nix
@@ -8,6 +8,9 @@
 }:

 {
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
  network-dhcp = {
    enable = true;
    hardwareAddress = "BC:24:11:38:1C:54";
--- a/hosts/fs-01/hardware-configuration.nix
+++ b/hosts/fs-01/hardware-configuration.nix
@@ -61,7 +61,4 @@
  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
 }
--- a/hosts/gms-01/default.nix
+++ b/hosts/gms-01/default.nix
@@ -34,6 +34,9 @@ let
  rconPort = 25575;
 in
 {
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
  network-dhcp = {
    enable = true;
    hardwareAddress = "BC:24:11:FD:EB:ED";
--- a/hosts/gms-01/hardware-configuration.nix
+++ b/hosts/gms-01/hardware-configuration.nix
@@ -61,7 +61,4 @@
  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
 }
--- a/hosts/hel-01/default.nix
+++ b/hosts/hel-01/default.nix
@@ -7,6 +7,8 @@
  ...
 }:
 {
+  boot.loader.grub.device = "/dev/sda";
+
  network-static = {
    enable = true;
    hardwareAddress = "96:00:04:60:9D:9C";
--- a/hosts/hel-01/hardware-configuration.nix
+++ b/hosts/hel-01/hardware-configuration.nix
@@ -7,7 +7,6 @@
 }:
 {
  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
-  boot.loader.grub.device = "/dev/sda";
  boot.initrd.availableKernelModules = [
    "ata_piix"
    "uhci_hcd"
--- a/hosts/log-01/default.nix
+++ b/hosts/log-01/default.nix
@@ -7,6 +7,9 @@
  ...
 }:
 {
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
  network-dhcp = {
    enable = true;
    hardwareAddress = "BC:24:11:AE:52:80";
--- a/hosts/log-01/hardware-configuration.nix
+++ b/hosts/log-01/hardware-configuration.nix
@@ -61,7 +61,4 @@
  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
 }
--- a/hosts/nbg-01/default.nix
+++ b/hosts/nbg-01/default.nix
@@ -7,6 +7,8 @@
  ...
 }:
 {
+  boot.loader.grub.device = "/dev/sda";
+
  network-static = {
    enable = true;
    hardwareAddress = "96:00:04:60:6E:04";
--- a/hosts/nbg-01/hardware-configuration.nix
+++ b/hosts/nbg-01/hardware-configuration.nix
@@ -7,7 +7,6 @@
 }:
 {
  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
-  boot.loader.grub.device = "/dev/sda";
  boot.initrd.availableKernelModules = [
    "ata_piix"
    "uhci_hcd"
--- a/hosts/print-01/default.nix
+++ b/hosts/print-01/default.nix
@@ -7,6 +7,9 @@
  ...
 }:
 {
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
  network-dhcp = {
    enable = true;
    hardwareAddress = "BC:24:11:0F:1B:A3";
--- a/hosts/print-01/hardware-configuration.nix
+++ b/hosts/print-01/hardware-configuration.nix
@@ -56,7 +56,4 @@
  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
 }
--- a/hosts/test-nixos/default.nix
+++ b/hosts/test-nixos/default.nix
@@ -7,6 +7,9 @@
  ...
 }:
 {
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
  network-dhcp = {
    enable = true;
    hardwareAddress = "BC:24:11:1B:47:AF";
--- a/hosts/test-nixos/hardware-configuration.nix
+++ b/hosts/test-nixos/hardware-configuration.nix
@@ -57,7 +57,4 @@
  # networking.interfaces.enp6s18.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
 }
--- a/hosts/web-01/default.nix
+++ b/hosts/web-01/default.nix
@@ -7,6 +7,9 @@
  ...
 }:
 {
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
  network-dhcp = {
    enable = true;
    hardwareAddress = "BC:24:11:9C:0A:B4";
--- a/hosts/web-01/hardware-configuration.nix
+++ b/hosts/web-01/hardware-configuration.nix
@@ -56,7 +56,4 @@
  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
 }