From 5bd71f522a4a52f60e454c8f3a5c27b5ba3ecdc9 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 24 Dec 2019 23:11:58 +0000
Subject: sys/x220: migrate to ZFS

---
 sys/x220.nix | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

(limited to 'sys')

diff --git a/sys/x220.nix b/sys/x220.nix
index c994134a054c..537dfd211790 100644
--- a/sys/x220.nix
+++ b/sys/x220.nix
@@ -20,22 +20,45 @@
 
   boot.cleanTmpDir = true;
 
-  boot.initrd.luks.devices."nixos-decrypted".device =
-    "/dev/disk/by-uuid/bb59aa96-f934-4900-a98b-a364b8dccefe";
+  networking.hostId = "008dd68a";
+
+  boot.supportedFilesystems = [ "zfs" ];
+
+  boot.zfs.requestEncryptionCredentials = true;
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/002e2225-6a03-4692-bac2-f57e5588ee49";
-    fsType = "ext4";
+    device = "rpool/root";
+    fsType = "zfs";
+  };
+
+  fileSystems."/home" = {
+    device = "rpool/home/qyliss";
+    fsType = "zfs";
+  };
+
+  fileSystems."/root" = {
+    device = "rpool/home/root";
+    fsType = "zfs";
+  };
+
+  fileSystems."/nix" = {
+    device = "rpool/nix";
+    fsType = "zfs";
+  };
+
+  fileSystems."/var" = {
+    device = "rpool/var";
+    fsType = "zfs";
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/01ac4fac-03c2-433e-9297-eb84268a0c0f";
+    device = "/dev/disk/by-uuid/6c2a9dd7-45b4-413a-bded-fccf682ffa36";
     fsType = "ext4";
   };
 
   swapDevices = [
     {
-      device = "/dev/disk/by-partuuid/201f5472-f45e-49b7-88c9-7fd9458a30f7";
+      device = "/dev/disk/by-partuuid/82326179-f409-4f28-9233-805c44a04879";
       randomEncryption = true;
     }
   ];
-- 
cgit 1.4.1