...flakes

2 files changed, 3 insertions, 28 deletions

diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 258a83f7..2dcf5459 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -13,7 +13,7 @@ in {
   imports = with flake.nixosModules.systemProfiles; [
     ./hw.nix
     ./email ./libvirt ./greetd
-    tmpfs-root bcachefs initrd-all-crypto-modules default-locale openssh rebuild-machines niri-unstable networkmanager lanzaboote
+    tmpfs-root bcachefs initrd-all-crypto-modules default-locale openssh rebuild-machines niri-unstable networkmanager lanzaboote zswap
     flakeInputs.nixos-hardware.nixosModules.lenovo-thinkpad-p1
     flakeInputs.nixVirt.nixosModules.default
   ];
@@ -58,23 +58,7 @@ in {
 
       plymouth.enable = true;
 
-      kernelPackages = pkgs.linuxPackages_latest;
-      kernelPatches = [
-        { name = "edac-config";
-          patch = null;
-          structuredExtraConfig = with lib.kernel; {
-            EDAC = yes;
-            EDAC_IE31200 = yes;
-          };
-        }
-        { name = "zswap-default";
-          patch = null;
-          structuredExtraConfig = with lib.kernel; {
-            ZSWAP_DEFAULT_ON = yes;
-            ZSWAP_SHRINKER_DEFAULT_ON = yes;
-          };
-        }
-      ];
+      kernelPackages = pkgs.linuxPackages_6_18;
       consoleLogLevel = 3;
       kernelParams = [
         "quiet"
diff --git a/hosts/surtr/default.nix b/hosts/surtr/default.nix
index 4a9bd6fe..815cf41a 100644
--- a/hosts/surtr/default.nix
+++ b/hosts/surtr/default.nix
@@ -4,7 +4,7 @@ with lib;
 
 {
   imports = with flake.nixosModules.systemProfiles; [
-    tmpfs-root qemu-guest openssh rebuild-machines zfs
+    tmpfs-root qemu-guest openssh rebuild-machines zfs zswap
     ./zfs.nix ./dns ./tls ./http ./bifrost ./matrix ./postgresql
     ./prometheus ./email ./vpn ./borg.nix ./etebase ./immich.nix
     ./paperless.nix ./hledger.nix ./audiobookshelf.nix ./kimai.nix
@@ -28,15 +28,6 @@ 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;
-          structuredExtraConfig = with lib.kernel; {
-            ZSWAP_DEFAULT_ON = yes;
-            ZSWAP_SHRINKER_DEFAULT_ON = yes;
-          };
-        }
-      ];
     };
 
     fileSystems = {