From 3b9da241775ad8a8852eabe72227dd8b20d8b244 Mon Sep 17 00:00:00 2001
From: Giulio De Pasquale <git@depasquale.giugl.io>
Date: Wed, 21 Feb 2024 11:32:42 +0000
Subject: [PATCH] architect: update hardware mounts after nvme switch

---
 hosts/architect/hardware.nix | 96 ++++++++++++++++++++----------------
 1 file changed, 54 insertions(+), 42 deletions(-)

diff --git a/hosts/architect/hardware.nix b/hosts/architect/hardware.nix
index ceddaf2..9e715f2 100644
--- a/hosts/architect/hardware.nix
+++ b/hosts/architect/hardware.nix
@@ -1,57 +1,69 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/28ce6650-de21-4c1d-ae42-95d1e3507740";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/B790-869D";
-    fsType = "vfat";
-  };
-
   hardware.cpu.amd.updateMicrocode =
     lib.mkDefault config.hardware.enableRedistributableFirmware;
 
-  fileSystems."/media" = {
-    device = "datapool/media";
-    fsType = "zfs";
+  environment.etc."crypttab".text = ''
+    backedNvme /dev/disk/by-uuid/92cfaa4a-82a1-4336-b552-b7f4f3c68613 /newdrive.key
+  '';
+
+  boot = {
+    kernelModules = [ "kvm-amd" "dm-snapshot" ];
+    initrd = {
+      luks.devices = {
+        # backedNvme = {
+        #   device = "/dev/disk/by-uuid/92cfaa4a-82a1-4336-b552-b7f4f3c68613";
+        #   keyFile = "/newdrive.key";
+        #   allowDiscards = true;
+
+        # };
+        root = {
+          device = "/dev/disk/by-uuid/bdd5f111-ecec-48d8-861f-94083098c724";
+          preLVM = true;
+          allowDiscards = true;
+          fallbackToPassword = true;
+        };
+      };
+      availableKernelModules =
+        [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+    };
   };
 
-  fileSystems."/secrets" = {
-    device = "backedpool/secrets";
-    fsType = "zfs";
-  };
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/28ce6650-de21-4c1d-ae42-95d1e3507740";
+      fsType = "ext4";
+    };
 
-  fileSystems."/services" = {
-    device = "backedpool/services";
-    fsType = "zfs";
+    "/boot" = {
+      device = "/dev/disk/by-uuid/B790-869D";
+      fsType = "vfat";
+    };
+
+    "/backednvme" = {
+      device = "/dev/mapper/backedNvme";
+    };
+
+    "/services" = {
+      device = "/backednvme/services";
+      options = [ "bind" ];
+    };
+
+    "/secrets" = {
+      device = "/backednvme/secrets";
+      options = [ "bind" ];
+    };
+
+    "/media" = {
+      device = "nvmedata/media";
+      fsType = "zfs";
+    };
   };
+  
   swapDevices = [{
     device = "/swapfile";
     size = 1024 * 64;
   }];
-
-  boot = {
-    initrd.luks.devices = {
-      root = {
-        device = "/dev/disk/by-uuid/bdd5f111-ecec-48d8-861f-94083098c724";
-        preLVM = true;
-        allowDiscards = true;
-        fallbackToPassword = true;
-      };
-    };
-    initrd.availableKernelModules =
-      [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-    initrd.kernelModules = [ "dm-snapshot" ];
-  };
 }