From 5e6c43c6fbc9405059cdce4aa7a8421f39193633 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Mon, 25 Mar 2024 22:14:11 +0000
Subject: [PATCH] rexxar: fix up boot process

---
 ops/nixos/rexxar/default.nix | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/ops/nixos/rexxar/default.nix b/ops/nixos/rexxar/default.nix
index 85ab32e79b..05662484c2 100644
--- a/ops/nixos/rexxar/default.nix
+++ b/ops/nixos/rexxar/default.nix
@@ -23,16 +23,6 @@
       "sr_mod"
     ];
     systemd.enable = true;
-    systemd.services."zfs-import-zu2" = {
-      after = [ "zfs-import-zboot.service" ];
-      requires = [ "zfs-import-zboot.service" ];
-
-      script = lib.mkBefore ''
-        test -d /sysroot/persist || mount -t zfs zboot/local/root /sysroot
-        test -f /sysroot/persist/zu2-key || mount -t zfs zboot/safe/persist /sysroot/persist
-        ln -s /sysroot/persist /persist
-      '';
-    };
   };
   security.tpm2.enable = true;
   boot.kernelModules = [ "kvm-amd" ];
@@ -49,10 +39,6 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
-  services.zfs.rollbackOnBoot = {
-    enable = true;
-    snapshot = "zboot/local/root@blank";
-  };
 
   fileSystems = let
     zfs = device: {
@@ -65,7 +51,7 @@
     "/persist" = zfs "zboot/safe/persist";
 
     "/store" = zfs "zu2/safe/store";
-    "/home" = (zfs "zu2/safe/home") // { neededForBoot = true; };
+    "/home" = zfs "zu2/safe/home";
 
     "/boot" = {
       device = "/dev/disk/by-label/ESP";