a bunch of stuff, including upgrade to wayland and ndi streaming to imac

hardware/fusu.nix

@@ -23,6 +23,11 @@
       fsType = "ext4";
     };
 
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-label/FUSU-BOOT";
+      fsType = "vfat";
+    };
+
   swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hardware/hpm-laptop.nix

@@ -23,8 +23,18 @@
 	boot.initrd.kernelModules = [ "dm-snapshot" ];
 	boot.kernelModules = [ "kvm-intel" ];
 	boot.extraModulePackages = [ ];
-  boot.loader.efi.canTouchEfiVariables = true;
+  	boot.loader.efi.canTouchEfiVariables = true;
 
+     	boot.initrd.luks.devices = {
+        	root = {
+                	#name = "root";
+        		device = "/dev/disk/by-partuuid/ffc93316-5bcf-478a-9143-9ccacd428f48";
+        		preLVM = true;
+        		allowDiscards = true;
+        	};
+        };
+
+  /*
 	fileSystems."/" = {
 		device = "/dev/disk/by-uuid/6518e61e-7120-48ef-81a3-5eae0f67297e";
    	fsType = "btrfs";
@@ -34,6 +44,16 @@
 		device = "/dev/disk/by-uuid/0E6C-F209";
 		fsType = "vfat";
 	};
+  */
+	fileSystems."/" = {
+		device = "/dev/disk/by-label/main-root";
+   	fsType = "btrfs";
+   };
+
+	fileSystems."/boot" = {
+		device = "/dev/disk/by-label/MAIN-BOOT";
+		fsType = "vfat";
+	};
 
 	#swapDevices = [
 		#{ device = "/dev/disk/by-uuid/418bf0d8-e548-45d5-802a-53de72707ebc"; }