Merge branch 'reimage/shai-hulud'

ifd3f · Oct 24, 2023 · 247398f · 247398f
2 parents 3c9eb42 + 3fa03f1
commit 247398f
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 44 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/machines/shai-hulud/configuration.nix b/machines/shai-hulud/configuration.nix
@@ -1,16 +1,18 @@
 inputs:
 { config, pkgs, lib, ... }:
 with lib; {
-  imports = [
-    ./hardware-configuration.nix
-    inputs.self.nixosModules.laptop
-    inputs.self.nixosModules.pc
-  ] ++ (with inputs.nixos-hardware.nixosModules; [
-    common-cpu-intel
-    common-pc-ssd
-    microsoft-surface-common
-    microsoft-surface-pro-intel
-  ]);
+  imports = [ ./hardware-configuration.nix ]
+    ++ (with inputs.nixos-hardware.nixosModules; [
+      common-cpu-intel
+      common-pc-ssd
+      microsoft-surface-common
+      microsoft-surface-pro-intel
+    ]) ++ [
+      inputs.self.nixosModules.laptop
+      inputs.self.nixosModules.pc
+
+      ./fs.nix
+    ];
 
   microsoft-surface.kernelVersion = "6.1.53";
 

diff --git a/machines/shai-hulud/fs.nix b/machines/shai-hulud/fs.nix
@@ -0,0 +1,23 @@
+{
+  fileSystems."/" = {
+    device = "tank/enc/root";
+    fsType = "zfs";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/4DC0-283F";
+    fsType = "vfat";
+  };
+
+  fileSystems."/home" = {
+    device = "tank/enc/home";
+    fsType = "zfs";
+  };
+
+  fileSystems."/nix" = {
+    device = "tank/nix";
+    fsType = "zfs";
+  };
+
+  swapDevices = [ ];
+}
diff --git a/machines/shai-hulud/hardware-configuration.nix b/machines/shai-hulud/hardware-configuration.nix
@@ -12,28 +12,6 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/b1bf3fde-687c-4c9b-b1f4-d660bd062deb";
-    fsType = "xfs";
-  };
-
-  fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/07b362e1-c917-40c9-8486-9a8a87857e60";
-    fsType = "xfs";
-  };
-
-  fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/efd6ef1b-56b4-4b5c-bb6b-e263c1c988fa";
-    fsType = "xfs";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/4DC0-283F";
-    fsType = "vfat";
-  };
-
-  swapDevices = [ ];
-
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction