From e71df4314de90c55af2c76f7303ebf79f89f8889 Mon Sep 17 00:00:00 2001
From: Alex van de Sandt <me@alexvds.com>
Date: Thu, 25 Jun 2026 13:25:47 -0500
Subject: [PATCH] Split out grub and efi aspects

---
 modules/defaults.nix          |  3 ---
 modules/efi.nix               |  8 ++++++++
 modules/grub.nix              | 10 ++++++++++
 modules/hosts/flock/flock.nix |  2 ++
 modules/hosts/perch/perch.nix |  2 ++
 modules/hosts/roost/roost.nix |  6 ++++--
 6 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 modules/efi.nix
 create mode 100644 modules/grub.nix

diff --git a/modules/defaults.nix b/modules/defaults.nix
index 3207bc5..17a8921 100644
--- a/modules/defaults.nix
+++ b/modules/defaults.nix
@@ -6,9 +6,6 @@
   den.schema.user.classes = lib.mkDefault [ "homeManager" ];
 
   den.default.nixos = { pkgs, ... }: {
-    boot.loader.systemd-boot.enable = true;
-    boot.loader.efi.canTouchEfiVariables = true;
-
     boot.kernelPackages = pkgs.linuxPackages_latest;
 
     networking.networkmanager.enable = true;
diff --git a/modules/efi.nix b/modules/efi.nix
new file mode 100644
index 0000000..5eb8118
--- /dev/null
+++ b/modules/efi.nix
@@ -0,0 +1,8 @@
+{
+  den.aspects.efi = {
+    nixos = {
+      boot.loader.systemd-boot.enable = true;
+      boot.loader.efi.canTouchEfiVariables = true;
+    };
+  };
+}
diff --git a/modules/grub.nix b/modules/grub.nix
new file mode 100644
index 0000000..092ff21
--- /dev/null
+++ b/modules/grub.nix
@@ -0,0 +1,10 @@
+{
+  den.aspects.grub = {
+    nixos = {
+      # Use the GRUB 2 boot loader
+      boot.loader.grub.enable = true;
+      boot.loader.grub.efiSupport = true;
+      boot.loader.grub.efiInstallAsRemovable = true;
+    };
+  };
+}
diff --git a/modules/hosts/flock/flock.nix b/modules/hosts/flock/flock.nix
index 2be8197..7351533 100644
--- a/modules/hosts/flock/flock.nix
+++ b/modules/hosts/flock/flock.nix
@@ -5,6 +5,8 @@
       (den.batteries.hostname)
       (den.batteries.tty-autologin "igneous")
 
+      efi
+
       bluetooth
       hyprland
       nvidia
diff --git a/modules/hosts/perch/perch.nix b/modules/hosts/perch/perch.nix
index a5c5840..d345dc2 100644
--- a/modules/hosts/perch/perch.nix
+++ b/modules/hosts/perch/perch.nix
@@ -5,6 +5,8 @@
       (den.batteries.hostname)
       (den.batteries.tty-autologin "igneous")
 
+      efi
+
       bluetooth
       hyprland
       pipewire
diff --git a/modules/hosts/roost/roost.nix b/modules/hosts/roost/roost.nix
index 860221a..a20d7bc 100644
--- a/modules/hosts/roost/roost.nix
+++ b/modules/hosts/roost/roost.nix
@@ -1,7 +1,9 @@
 { den, ... }: {
   den.aspects.roost = {
-    includes = [
-      (den.batteries.hostname)
+    includes = with den.aspects; [
+      den.batteries.hostname
+
+      grub
     ];
 
     nixos = {
-- 
2.51.2