2 files changed, 13 insertions, 32 deletions
diff --git a/nixos/alpha/configuration.nix b/nixos/alpha/configuration.nix
index bf9b7e1..e259f33 100644
--- a/nixos/alpha/configuration.nix
+++ b/nixos/alpha/configuration.nix
@@ -221,10 +221,16 @@
     ];
   };
 
+  users.mutableUsers = false;
+
+  fileSystems."/persist".neededForBoot = true;
+
   users.users = {
+    root.passwordFile = "/persist/passwords/root";
     zach = {
       isNormalUser = true;
       shell = pkgs.zsh;
+      passwordFile = "/persist/passwords/zach";
 
       extraGroups = [
         "wheel"
diff --git a/nixos/alpha/hardware-configuration.nix b/nixos/alpha/hardware-configuration.nix
index 0d0593f..8636fad 100644
--- a/nixos/alpha/hardware-configuration.nix
+++ b/nixos/alpha/hardware-configuration.nix
@@ -10,52 +10,27 @@
   hardware.enableRedistributableFirmware = true;
 
   fileSystems."/" = {
-    device = "rpool/root/nixos";
+    device = "rpool/local/root";
     fsType = "zfs";
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/55B4-0E38";
+    device = "/dev/disk/by-uuid/31C2-3406";
     fsType = "vfat";
   };
 
   fileSystems."/nix" = {
-    device = "rpool/root/nixos/nix";
-    fsType = "zfs";
-  };
-
-  fileSystems."/etc" = {
-    device = "rpool/root/nixos/etc";
-    fsType = "zfs";
-  };
-
-  fileSystems."/var" = {
-    device = "rpool/root/nixos/var";
-    fsType = "zfs";
-  };
-
-  fileSystems."/var/lib" = {
-    device = "rpool/root/nixos/var/lib";
-    fsType = "zfs";
-  };
-
-  fileSystems."/var/log" = {
-    device = "rpool/root/nixos/var/log";
-    fsType = "zfs";
-  };
-
-  fileSystems."/var/spool" = {
-    device = "rpool/root/nixos/var/spool";
+    device = "rpool/local/nix";
     fsType = "zfs";
   };
 
   fileSystems."/home" = {
-    device = "rpool/home";
+    device = "rpool/safe/home";
     fsType = "zfs";
   };
 
-  fileSystems."/home/zach" = {
-    device = "rpool/home/zach";
+  fileSystems."/persist" = {
+    device = "rpool/safe/persist";
     fsType = "zfs";
   };
 
@@ -64,7 +39,7 @@
     fsType = "ext4";
   };
 
-  swapDevices = [ ];
+  swapDevices = [ { device = "/dev/disk/by-uuid/ff8bd8d2-2b3b-495d-8865-9cd140dd1f54"; } ];
 
   nix.settings.max-jobs = lib.mkDefault 4;
   powerManagement.cpuFreqGovernor = lib.mkDefault "schedutil";