diff --git a/framework/configuration.nix b/framework/configuration.nix
index e80989f..73f0263 100644
--- a/framework/configuration.nix
+++ b/framework/configuration.nix
@@ -15,9 +15,9 @@ in
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = true;
     #initrd.luks.devices."cryptroot".device = "/dev/disk/by-partlabel/cryptroot";
-    initrd.luks.devices."cryptswap".device = "/dev/disk/by-partlabel/cryptswap";
+    #initrd.luks.devices."cryptswap".device = "/dev/disk/by-partlabel/cryptswap";
 
-    resumeDevice = "/dev/mapper/cryptswap";
+    resumeDevice = "/dev/nvme0n1p2";
     kernelParams = [
       "resume_offset=0"
       "mem_sleep_default=deep"
@@ -31,8 +31,6 @@ in
       options = [ "defaults" "size=4G" "mode=755" ];
     };
     "/persist" = {
-      device = "/dev/disk/by-uuid/64d32a97-9d65-4562-9c3c-f19935c04be5";
-      fsType = "btrfs";
       neededForBoot = true;
     };
   };
diff --git a/framework/disko-btrfs.nix b/framework/disko-btrfs.nix
index 1efb00a..e0142f5 100644
--- a/framework/disko-btrfs.nix
+++ b/framework/disko-btrfs.nix
@@ -21,17 +21,12 @@
                 mountOptions = [ "umask=0077" "defaults" ];
               };
             };
-            cryptswap = {
+            swap = {
               size = "70G";
-	      type = "8300";
+	      type = "8200";
               content = {
-                type = "luks";
-		name = "cryptswap";
-		passwordFile = "/tmp/secret.key";
-		content = {
-		  type = "swap";
-		  resumeDevice = true;
-		};
+                type = "swap";
+		resumeDevice = true;
               };
             };
             cryptroot = {