From 40677574abb24166a9c0eea025d7ada4eaed714a Mon Sep 17 00:00:00 2001
From: Chris Dombroski <cdombroski@gmail.com>
Date: Mon, 27 May 2024 13:00:39 -0400
Subject: [PATCH] EFI Grub?

---
 systems/zeus/configuration.nix          | 31 +++++++++++++++++++------
 systems/zeus/hardware-configuration.nix | 11 +++++++--
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/systems/zeus/configuration.nix b/systems/zeus/configuration.nix
index 49c64c0..06e7413 100644
--- a/systems/zeus/configuration.nix
+++ b/systems/zeus/configuration.nix
@@ -9,13 +9,30 @@
     ../../modules/smartd.nix
   ];
 
-  boot.loader.grub.enable = true;
-  boot.loader.grub.zfsSupport = true;
-  boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
-  boot.loader.grub.devices =
-    [ "/dev/sda" "/dev/sdb" "/dev/sdc" "/dev/sdd" "/dev/sde" "/dev/sdf" ];
-
-  boot.supportedFilesystems = [ "vfat" ];
+  boot = {
+    loader = {
+      grub = {
+        enable = true;
+        efiSupport = true;
+        efiInstallAsRemovable = true;
+        mirroredBoots = [
+          {
+            devices = [ "nodev" ];
+            path = "/efi";
+          }
+          {
+            devices = [ "nodev" ];
+            path = "/efi1";
+          }
+        ];
+      };
+      efi = {
+        canTouchEfiVariables = false;
+        efiSysMountPoint = "/efi";
+      };
+    };
+    kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+  };
 
   networking.hostName = "zeus"; # Define your hostname.
   networking.hostId = "9e95b576";
diff --git a/systems/zeus/hardware-configuration.nix b/systems/zeus/hardware-configuration.nix
index cb452e0..77c4559 100644
--- a/systems/zeus/hardware-configuration.nix
+++ b/systems/zeus/hardware-configuration.nix
@@ -42,9 +42,16 @@
     fsType = "zfs";
   };
 
-  fileSystems."/boot-spare" = {
-    device = "/dev/disk/by-id/ata-WDC_WD10EFRX-68FYTN0_WD-WCC4J0KJRXHJ-part1";
+  fileSystems."/efi" = {
+    device = "/dev/disk/by-uuid/6ED6-2ED0";
     fsType = "vfat";
+    options = [ "nofail" ];
+  };
+
+  fileSystems."/efi1" = {
+    device = "/dev/disk/by-uuid/6A4C-BAFE";
+    fsType = "vfat";
+    options = [ "nofail" ];
   };
 
   swapDevices = [