modules/boot: move bootloaders to module

hosts/Infini-DESKTOP/default.nix

@@ -6,13 +6,10 @@
     ])
 
     (with profiles; [
-      boot.grub
-
       networking.wireless
 
       (with hardware; [
         gpu.nvidia
-        wireless
       ])
 
       btrfs
@@ -29,6 +26,7 @@
   system.stateVersion = "21.05";
 
   modules = {
+    boot.grub.enable = true;
     hardware = {
       wireless.enable = true;
       form.desktop = true;

hosts/Infini-FRAMEWORK/default.nix

@@ -3,13 +3,10 @@
     (with suites; [ graphic ])
 
     (with profiles; [
-      boot.grub
-
       networking.wireless
 
       (with hardware; [
         gpu.intel
-        wireless
       ])
 
       # services.privoxy
@@ -45,6 +42,7 @@
   };
 
   modules = {
+    boot.grub.enable = true;
     hardware = {
       form.laptop = true;
     };

hosts/Infini-SERVER/default.nix

@@ -3,11 +3,12 @@
     suites = with suites; [ base ];
     imports = [ ];
     profiles = with profiles; [
-      boot.grub
-
       hardware.gpu.nvidia
     ];
   };
 
-  modules.hardware.form.server = true;
+  modules = {
+    boot.grub.enable = true;
+    hardware.form.server = true;
+  };
 }

hosts/Infini-STICK/default.nix

@@ -3,8 +3,6 @@
     (with suites; [ base develop ])
 
     (with profiles; [
-      boot.grub
-
       networking.wireless
 
       (with hardware; [
@@ -14,8 +12,6 @@
           intel
           nvidia
         ])
-        laptop
-        wireless
       ])
 
       btrfs
@@ -29,7 +25,10 @@
   # networking.interfaces.wlp170s0.useDHCP = true;
   networking.interfaces.enp39s0.useDHCP = true;
 
-  modules.hardware.form.portable = true;
+  modules = {
+    boot.grub.enable = true;
+    hardware.form.portable = true;
+  };
 
   system.stateVersion = "21.11";
 }

modules/modules/boot.nix

@@ -0,0 +1,56 @@
+{ config, options, lib, ... }:
+with lib;
+with lib.hlissner;
+let
+  cfg = config.modules.boot;
+  opt = options.modules.boot;
+in
+{
+  options.modules.boot = with types; {
+    timeout = mkOpt (nullOr int) 3;
+
+    grub = {
+      enable = mkBoolOpt false;
+    };
+    systemd-boot.enable = mkBoolOpt false;
+  };
+
+  config = mkMerge [
+    {
+      assertions = [
+        {
+          assertion = (count (v: v) [ cfg.grub.enable cfg.systemd-boot.enable ]) == 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 = mkDefault "/boot/efi";
+        };
+      };
+    })
+    (mkIf cfg.systemd-boot.enable {
+      boot.loader = {
+        systemd-boot = {
+          enable = mkDefault true;
+          editor = false;
+          consoleMode = "2";
+        };
+
+        efi.canTouchEfiVariables = true;
+      };
+    })
+  ];
+}

profiles/boot/grub.nix

@@ -1,17 +0,0 @@
-{ lib, ... }:
-with lib;
-{
-  boot.loader = {
-    grub = {
-      enable = mkDefault true;
-      device = mkDefault "nodev";
-      efiSupport = mkDefault true;
-      useOSProber = mkDefault false;
-      efiInstallAsRemovable = mkDefault true;
-    };
-    efi = {
-      canTouchEfiVariables = mkDefault false;
-      efiSysMountPoint = mkDefault "/boot/efi";
-    };
-  };
-}

profiles/boot/systemd-boot.nix

@@ -1,14 +0,0 @@
-{ lib, ... }:
-with lib;
-{
-  boot.loader = {
-    systemd-boot = {
-      enable = mkDefault true;
-      editor = false;
-      consoleMode = "2";
-    };
-
-    efi.canTouchEfiVariables = true;
-    timeout = mkDefault 3;
-  };
-}