From 51fe1f673b0ecb55745e1bee96a367d65440b7df Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Sun, 13 Oct 2024 11:53:41 -0400
Subject: [PATCH] replacing root_pool drives

---
 systems/jeeves/default.nix  |  1 -
 systems/jeeves/hardware.nix | 38 +++++++++++++++++++++++++++++++------
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/systems/jeeves/default.nix b/systems/jeeves/default.nix
index 615e767..996644a 100644
--- a/systems/jeeves/default.nix
+++ b/systems/jeeves/default.nix
@@ -7,7 +7,6 @@ in
     ../common/global
     ../common/optional/ssh_decrypt.nix
     ../common/optional/syncthing_base.nix
-    ../common/optional/systemd-boot.nix
     ../common/optional/zerotier.nix
     ./arch_mirror.nix
     ./docker
diff --git a/systems/jeeves/hardware.nix b/systems/jeeves/hardware.nix
index c985820..881c400 100644
--- a/systems/jeeves/hardware.nix
+++ b/systems/jeeves/hardware.nix
@@ -3,6 +3,24 @@
   imports =[ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot = {
+    loader = {
+      grub = {
+        enable = true;
+        zfsSupport = true;
+        efiSupport = true;
+        mirroredBoots = [
+          {
+            devices = [ "nodev" ];
+            path = "/boot0";
+          }
+          {
+            devices = [ "nodev" ];
+            path = "/boot1";
+          }
+        ];
+      };
+      efi.canTouchEfiVariables = true;
+    };
     initrd = {
       availableKernelModules = [
         "ahci"
@@ -18,12 +36,12 @@
       luks.devices = {
         # cspell:disable
         # Root pool
-        "luks-root-pool-wwn-0x500a0751e6c3c01e-part2" = {
-          device = "/dev/disk/by-id/wwn-0x500a0751e6c3c01e-part2";
+        "luks-root-pool-wwn-0x55cd2e4150f01519-part2" = {
+          device = "/dev/disk/by-id/wwn-0x55cd2e4150f01519-part2";
           bypassWorkqueues = true;
         };
-        "luks-root-pool-wwn-0x500a0751e6c3c01c-part2" = {
-          device = "/dev/disk/by-id/wwn-0x500a0751e6c3c01c-part2";
+        "luks-root-pool-wwn-0x55cd2e4150f01556-part2" = {
+          device = "/dev/disk/by-id/wwn-0x55cd2e4150f01556-part2";
           bypassWorkqueues = true;
         };
         # Media pool
@@ -112,8 +130,16 @@
       fsType = "zfs";
     };
 
-    "/boot" = {
-      device = "/dev/disk/by-id/wwn-0x500a0751e6c3c01e-part1";
+    "/boot0" = {
+      device = "/dev/disk/by-id/wwn-0x55cd2e4150f01556-part1";
+      fsType = "vfat";
+      options = [
+        "fmask=0077"
+        "dmask=0077"
+      ];
+    };
+    "/boot1" = {
+      device = "/dev/disk/by-id/wwn-0x55cd2e4150f01519-part1";
       fsType = "vfat";
       options = [
         "fmask=0077"