diff --git a/nixos/stolas/default.nix b/nixos/stolas/default.nix
index 696f55f..9ae2d23 100644
--- a/nixos/stolas/default.nix
+++ b/nixos/stolas/default.nix
@@ -23,7 +23,14 @@
       pkiBundle = "/var/lib/sbctl";
     };
     kernelModules = [ "kvm-amd" ];
-    extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ];
+    # Hopefully fixes suspend issues with wifi card
+    kernelPackages = pkgs.linuxPackages_latest;
+    kernelParams = [
+      "resume=UUID=81dfbfa5-d578-479c-b11c-3ee5abd6848a"
+      "resume_offset=79859524"
+      "zswap.enabled=1"
+    ];
+    extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
     # Lanzaboote currently replaces the systemd-boot module.
     # This setting is usually set to true in configuration.nix
     # generated at installation time. So we force it to false
@@ -65,10 +72,6 @@
   powerManagement = {
     enable = true;
     cpuFreqGovernor = "schedutil";
-    # TODO: Limit charge of battery, does this work without kernel patches from hardware.frameworkenableKmod?
-    powerUpCommands = ''
-      echo 80 > /sys/class/power_supply/BAT0/charge_control_stop_threshold
-    '';
   };
 
   networking = {
@@ -174,10 +177,6 @@
     "dbus-org.freedesktop.ModemManager1".enable = lib.mkForce false;
   };
 
-  systemd.sleep.extraConfig = ''
-    HibernateDelaySec=1h
-  '';
-
   systemd.tmpfiles.rules = [
     "v /var/.snapshots 0755 root root - -"
     "v /var/paperless/.snapshots 0755 root root - -"
@@ -205,20 +204,7 @@
           "wireshark"
           "paperless"
         ];
-        shell = "/run/current-system/sw/bin/zsh";
       };
     };
   };
-
-  # TODO
-  # age.secrets = {
-  #   paperless = {
-  #     file = "${config.dadada.secrets.path}/paperless.age";
-  #     mode = "700";
-  #     owner = "paperless";
-  #   };
-  # };
-
-  # Create compressing swap space in RAM
-  zramSwap.enable = true;
 }
diff --git a/nixos/stolas/disks.nix b/nixos/stolas/disks.nix
index 01cf635..eff5680 100644
--- a/nixos/stolas/disks.nix
+++ b/nixos/stolas/disks.nix
@@ -86,7 +86,7 @@
                     };
                     "/swap" = {
                       mountpoint = "/.swapvol";
-                      swap.swapfile.size = "64G";
+                      swap.swapfile.size = "128G";
                     };
                   };
                 };