From cbece5e2ab15670c31f76e194a82516490760b16 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 15 Jan 2025 22:24:51 +0100
Subject: ...

---
 hosts/sif/default.nix | 27 +++++++++++++--------------
 hosts/sif/hw.nix      |  3 +++
 2 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'hosts')

diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 6dc6f3a9..def59191 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -63,15 +63,20 @@ in {
       plymouth.enable = true;
 
       kernelPackages = pkgs.linuxPackages_latest;
-      extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
-      kernelModules = ["v4l2loopback"];
       kernelPatches = [
         { name = "edac-config";
           patch = null;
-          extraConfig = ''
-            EDAC y
-            EDAC_IE31200 y
-          '';
+          extraStructuredConfig = with lib.kernel; {
+            EDAC = yes;
+            EDAC_IE31200 = yes;
+          };
+        }
+        { name = "zswap-default";
+          patch = null;
+          extraStructuredConfig = with lib.kernel; {
+            ZSWAP_DEFAULT_ON = yes;
+            # ZSWAP_SHRINKER_DEFAULT_ON = yes;
+          };
         }
       ];
 
@@ -440,7 +445,7 @@ in {
       };
 
       xserver = {
-        enable = true;
+        enable = false;
 
         xkb = {
           layout = "us";
@@ -617,7 +622,7 @@ in {
       nvidia = {
         open = true;
         modesetting.enable = true;
-        powerManagement.enable = true;
+        powerManagement.enable = false;
         prime = {
           nvidiaBusId = "PCI:1:0:0";
           intelBusId = "PCI:0:2:0";
@@ -707,12 +712,6 @@ in {
       dconf.enable = true;
     };
 
-    zramSwap = {
-      enable = true;
-      algorithm = "zstd";
-      writebackDevice = "/dev/disk/by-label/swap";
-    };
-
     services.pcscd.enable = true;
 
     sops.secrets.gkleen-rclone = {
diff --git a/hosts/sif/hw.nix b/hosts/sif/hw.nix
index d1fb2934..1bcf0261 100644
--- a/hosts/sif/hw.nix
+++ b/hosts/sif/hw.nix
@@ -19,6 +19,9 @@
     "/var/lib/sops-nix".neededForBoot = true;
     "/var/lib/systemd".neededForBoot = true;
   };
+  swapDevices = [
+    { label = "swap"; }
+  ];
   # system.etc.overlay.enable = false;
 
   boot.initrd.systemd.packages = [
-- 
cgit v1.2.3