global/boot: init, refactored from modules/boot

hosts/Infini-DESKTOP/default.nix

@@ -18,7 +18,6 @@
   };
 
   modules = {
-    boot.grub.enable = true;
     hardware = {
       gpu.nvidia = true;
       wireless.enable = true;

hosts/Infini-DL360/default.nix

@@ -29,12 +29,12 @@
   nix.distributedBuilds = false;
 
   modules = {
-    boot.grub.enable = true;
-    boot.timeout = 5;
     hardware.form.server = true;
     virtualization.enable = true;
   };
 
+  boot.loader.timeout = 5;
+
   persist = {
     directories = [
       "/srv"

hosts/Infini-FRAMEWORK/default.nix

@@ -20,7 +20,6 @@
   nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems;
 
   modules = {
-    boot.grub.enable = true;
     hardware = {
       gpu.intel = true;
       form.laptop = true;

hosts/Infini-OPTIPLEX/default.nix

@@ -9,16 +9,13 @@
   info.loc.purdue = true;
 
   modules = {
-    boot = {
-      grub.enable = true;
-      timeout = 1;
-    };
-
     hardware.form.desktop = true;
     hardware.gpu.intel = true;
     desktop.wm.enable = true;
   };
 
+  boot.loader.timeout = 1;
+
   persist = {
     directories = [
     ];

hosts/Infini-RASPBERRY/default.nix

@@ -9,7 +9,6 @@ with lib;
   system.stateVersion = "23.11";
   modules = {
     hardware.form.raspi = true;
-    boot.ignore = true;
   };
 
   nixpkgs.overlays = [

hosts/Infini-SD/default.nix

@@ -13,7 +13,6 @@
   };
 
   modules = {
-    boot.grub.enable = true;
     hardware = {
       form.server = true;
     };

hosts/Infini-SERVER/default.nix

@@ -9,10 +9,6 @@
   info.loc.home = true;
 
   modules = {
-    boot = {
-      grub.enable = true;
-      timeout = 1;
-    };
     hardware = {
       # gpu.nvidia = true;
       form.server = true;
@@ -26,6 +22,8 @@
     };
   };
 
+  boot.loader.timeout = 1;
+
   services = {
     avahi.reflector = true;
   };

hosts/Infini-STICK/default.nix

@@ -9,7 +9,6 @@
   boot.kernelPackages = lib.mkForce config.boot.zfs.package.latestCompatibleLinuxPackages;
 
   modules = {
-    boot.grub.enable = true;
     hardware = {
       audio.enable = true;
       form.portable = true;

hosts/Infini-SWIFT/default.nix

@@ -9,9 +9,6 @@
   powerManagement.resumeCommands = "${pkgs.kmod}/bin/rmod atkbd; ${pkgs.kmod}/bin/modprobe atkbd reset=1";
 
   modules = {
-    boot = {
-      grub.enable = true;
-    };
     hardware = {
       form.laptop = true;
       gpu.amdgpu = true;

modules/global/boot.nix

@@ -0,0 +1,20 @@
+{ lib, ... }:
+let
+  inherit (lib) mkDefault;
+in
+{
+  boot.loader = {
+    timeout = mkDefault 3;
+    grub = {
+      enable = mkDefault true;
+      device = mkDefault "nodev";
+      efiSupport = mkDefault true;
+      useOSProber = mkDefault false;
+      efiInstallAsRemovable = mkDefault true;
+    };
+    efi = {
+      canTouchEfiVariables = mkDefault false;
+      efiSysMountPoint = mkDefault "/boot/efi";
+    };
+  };
+}

modules/modules/boot.nix

@@ -1,60 +0,0 @@
-{ config, options, lib, ... }:
-with lib;
-with lib.our;
-let
-  cfg = config.modules.boot;
-  opt = options.modules.boot;
-in
-{
-  options.modules.boot = with types; {
-    timeout = mkOpt (nullOr int) 3;
-
-    grub = {
-      enable = mkBoolOpt false;
-      efiSysMountPoint = mkOpt path "/boot/efi";
-    };
-    systemd-boot.enable = mkBoolOpt false;
-    ignore = mkBoolOpt false;
-  };
-
-  config = mkMerge [
-    {
-      assertions = [
-        {
-          assertion = (count (v: v) [ cfg.grub.enable cfg.systemd-boot.enable config.wsl.enable cfg.ignore ]) == 1;
-          message = "Must enable one and only one bootloader";
-        }
-      ];
-
-      boot.loader.timeout = mkAliasDefinitions opt.timeout;
-    }
-    (mkIf cfg.grub.enable {
-      boot.loader = {
-        grub = {
-          enable = mkDefault true;
-          device = mkDefault "nodev";
-          efiSupport = mkDefault true;
-          useOSProber = mkDefault false;
-          efiInstallAsRemovable = mkDefault true;
-        };
-        efi = {
-          canTouchEfiVariables = mkDefault false;
-          efiSysMountPoint = cfg.grub.efiSysMountPoint;
-        };
-      };
-    })
-    (mkIf cfg.systemd-boot.enable {
-      boot.loader = {
-        systemd-boot = {
-          enable = mkDefault true;
-          consoleMode = "2";
-
-          # See desc in nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
-          editor = false;
-        };
-
-        efi.canTouchEfiVariables = true;
-      };
-    })
-  ];
-}

modules/modules/hardware/form.nix

@@ -71,6 +71,7 @@ in
     })
 
     (mkIf cfg.raspi {
+      boot.loader.grub.enable = false;
       # imports = [ inputs.nixos-hardware.outputs.nixosModules.raspberry-pi-4 ];
 
       # modules.hardware = {