From d97344170b49dc303f9ddcbecaf0d6c38f31da7c Mon Sep 17 00:00:00 2001
From: Matthieu Morin <matt.b.morin@protonmail.com>
Date: Sun, 9 Jun 2024 20:18:16 +0000
Subject: [PATCH] Make a systemd mount unit instead of unfunctioning sh script
 in systemd stage 1

---
 systems/jeroboam/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/systems/jeroboam/default.nix b/systems/jeroboam/default.nix
index 432be09..8403a9c 100644
--- a/systems/jeroboam/default.nix
+++ b/systems/jeroboam/default.nix
@@ -7,11 +7,7 @@
 # ===========================================================
 #############################################################
 
-{ inputs, configLib, ... }: 
-let
-  PRIMARYUSBID = "720657da-2c89-4f47-aba9-b43618778a3d";
-  BACKUPUSBID = "b501f1b9-7714-472c-988f-3c997f146a18";
-in {
+{ inputs, configLib, ... }: {
   imports = [
     #################### Every Host Needs This ####################
     ./hardware-configuration.nix
@@ -94,9 +90,15 @@ in {
         #   sleep 2 # To make sure the usb key has been loaded
         #   mount -n -t vfat -o ro `findfs UUID=${PRIMARYUSBID}` /key || mount -n -t vfat -o ro `findfs UUID=${BACKUPUSBID}` /key
         # '';
-        
-        systemd.enable = true; # tpm2 unlock requires systemd initrd
-        
+        ### ----> Instead use systemd mount unit
+        systemd = {
+          enable = true; # tpm2 unlock requires systemd initrd
+          mounts = [{
+            what = "UUID=720657da-2c89-4f47-aba9-b43618778a3d";
+            where = "/key";
+            type = "btrfs";
+          }];
+        };
         luks.devices."crypted" = {
             bypassWorkqueues = true;
             device = "/dev/nvme0n1p2";