From b9a25bcc80d265ceb4f2a3aa4289e903faa0cff4 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Mon, 6 Mar 2023 20:37:28 +0100
Subject: [PATCH] server7: update hardware-configuration to actual disk layout

---
 hosts/server7/hardware-configuration.nix | 36 ++++++++++++------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/hosts/server7/hardware-configuration.nix b/hosts/server7/hardware-configuration.nix
index 00c42542..a90ea5b2 100644
--- a/hosts/server7/hardware-configuration.nix
+++ b/hosts/server7/hardware-configuration.nix
@@ -12,46 +12,46 @@
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
+  boot.supportedFilesystems = [ "zfs" ];
+
+  boot.initrd.luks.devices.server7_nvme0 = {
+    device = "/dev/disk/by-uuid/ea5b5339-be79-4237-9383-4649e336fae6";
+    preLVM = true;
+  };
 
   fileSystems."/" =
-    { device = "server7_root/nixos";
-      fsType = "zfs";
-      options = [ "zfsutil" ];
-    };
-
-  fileSystems."/var" =
-    { device = "server7_root/nixos/var";
-      fsType = "zfs";
-      options = [ "zfsutil" ];
-    };
-
-  fileSystems."/var/lib/resitc" =
-    { device = "server7_hdd/restic";
+    { device = "server7-nvme/nixos";
       fsType = "zfs";
       options = [ "zfsutil" ];
     };
 
   fileSystems."/nix" =
-    { device = "server7_root/nixos/nix";
+    { device = "server7-nvme/nixos/nix";
+      fsType = "zfs";
+      options = [ "zfsutil" ];
+    };
+
+  fileSystems."/var" =
+    { device = "server7-nvme/nixos/var";
       fsType = "zfs";
       options = [ "zfsutil" ];
     };
 
   fileSystems."/nix/store" =
-    { device = "server7_root/nixos/nix/store";
+    { device = "server7-nvme/nixos/nix/store";
       fsType = "zfs";
       options = [ "zfsutil" ];
     };
 
   fileSystems."/nix/var" =
-    { device = "server7_root/nixos/nix/var";
+    { device = "server7-nvme/nixos/nix/var";
       fsType = "zfs";
       options = [ "zfsutil" ];
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/984ea997-9591-4efb-8212-8381ad829d0b";
-      fsType = "ext2";
+    { device = "/dev/disk/by-uuid/8E67-EF31";
+      fsType = "vfat";
     };
 
   swapDevices = [ ];