Change memory management slightly, enable zram by default

base.nix

@@ -116,6 +116,15 @@
   };
   time.timeZone = "Europe/Helsinki";
 
+  #################### Memory management ####################
+  zramSwap.enable = true;
+  swapDevices = [
+    {
+      device = "/var/lib/swapfile";
+      size = 16 * 1024;
+    }
+  ];
+
   #################### Housekeeping ####################
   system.autoUpgrade = {
     enable = true;

machine-confs/generic.nix

@@ -12,11 +12,4 @@
 
   #Prevent user from being locked out of the system before switching to proper config
   users.mutableUsers = pkgs.lib.mkForce true;
-
-  swapDevices = [
-    {
-      device = "/var/lib/swapfile";
-      size = 8 * 1024;
-    }
-  ];
 }

machine-confs/helium.nix

@@ -53,11 +53,6 @@
     RestartSec = "1s";
   };
 
-  nix.settings = {
-    cores = 3;
-    max-jobs = 4;
-  };
-
   services.openssh.enable = pkgs.lib.mkForce false;
   services.fail2ban.enable = pkgs.lib.mkForce false;
 
@@ -88,11 +83,4 @@
       efi.canTouchEfiVariables = true;
     };
   };
-
-  swapDevices = [
-    {
-      device = "/var/lib/swapfile";
-      size = 16 * 1024;
-    }
-  ];
 }

machine-confs/lithium.nix

@@ -20,11 +20,4 @@
       efi.canTouchEfiVariables = true;
     };
   };
-
-  swapDevices = [
-    {
-      device = "/var/lib/swapfile";
-      size = 16 * 1024;
-    }
-  ];
 }

machine-confs/wg-rpi.nix

@@ -100,7 +100,7 @@ in
     max-jobs = 2;
   };
 
-  swapDevices = [
+  swapDevices = pkgs.lib.mkForce [
     {
       device = "/var/lib/swapfile";
       size = 8 * 1024;