1 files changed, 13 insertions, 8 deletions

diff --git a/hosts/surtr/default.nix b/hosts/surtr/default.nix
index b8a639d5..9d3101c0 100644
--- a/hosts/surtr/default.nix
+++ b/hosts/surtr/default.nix
@@ -7,6 +7,7 @@ with lib;
     tmpfs-root qemu-guest openssh rebuild-machines zfs
     ./zfs.nix ./dns ./tls ./http ./bifrost ./matrix ./postgresql
     ./prometheus ./email ./vpn ./borg.nix ./etebase ./immich.nix
+    ./paperless.nix ./hledger.nix ./audiobookshelf.nix ./kimai.nix
   ];
 
   config = {
@@ -14,9 +15,6 @@ with lib;
       system = "x86_64-linux";
     };
 
-    networking.hostId = "a64cf4d7";
-    environment.etc."machine-id".text = "a64cf4d793ab0a0ed3892ead609fc0bc";
-
     boot = {
       loader.grub = {
         enable = true;
@@ -30,6 +28,15 @@ with lib;
       zfs.devNodes = "/dev"; # /dev/vda2 does not show up in /dev/disk/by-id
 
       kernelModules = ["ptp_kvm"];
+      kernelPatches = [
+        { name = "zswap-default";
+          patch = null;
+          extraStructuredConfig = with lib.kernel; {
+            ZSWAP_DEFAULT_ON = yes;
+            ZSWAP_SHRINKER_DEFAULT_ON = yes;
+          };
+        }
+      ];
     };
 
     fileSystems = {
@@ -38,6 +45,9 @@ with lib;
           fsType = "vfat";
         };
     };
+    swapDevices = [
+      { label = "swap"; }
+    ];
 
     networking = {
       hostName = "surtr";
@@ -163,11 +173,6 @@ with lib;
       stateful = true;
     };
 
-    zramSwap = {
-      enable = true;
-      algorithm = "zstd";
-    };
-
     systemd.sysusers.enable = false;
     system.etc.overlay.mutable = true;
     boot.enableContainers = true;