split config between grub and efi

1 files changed, 18 insertions, 11 deletions

diff --git a/modules/nixos/personal/boot.nix b/modules/nixos/personal/boot.nix
index b3f36aa..c121785 100644
--- a/modules/nixos/personal/boot.nix
+++ b/modules/nixos/personal/boot.nix
@@ -2,16 +2,23 @@
 
 let cfg = config.personal.boot;
 in {
-  options.personal.boot = { grub.enable = lib.mkEnableOption "grub"; };
-
-  config.boot.loader = lib.mkIf cfg.grub.enable {
-    efi = { canTouchEfiVariables = true; };
-    grub = {
-      enable = true;
-      version = 2;
-      efiSupport = true;
-      enableCryptodisk = config.boot.initrd.luks.devices != { };
-      device = "nodev";
-    };
+  options.personal.boot = {
+    grub.enable = lib.mkEnableOption "grub";
+    efi.enable = lib.mkEnableOption "EFI";
   };
+
+  config.boot.loader = lib.mkMerge [
+    (lib.mkIf cfg.grub.enable {
+      grub = {
+        enable = true;
+        version = 2;
+        enableCryptodisk = config.boot.initrd.luks.devices != { };
+        device = lib.mkDefault "nodev";
+      };
+    })
+    (lib.mkIf cfg.efi.enable {
+      efi.canTouchEfiVariables = true;
+      grub.efiSupport = true;
+    })
+  ];
 }