about summary refs log tree commit diff
path: root/modules
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2018-07-16 02:25:03 +0200
committeraszlig <aszlig@nix.build>2018-07-16 02:25:03 +0200
commit388902a5afad2469db181e096b999630a22baeb6 (patch)
treee4679d4ea62b43a0ed2cfcc7927ec83b65482881 /modules
parent5658505b8631d28a09fc1f75481397c192e6f0eb (diff)
profiles/workstation: Switch to zswap module
The zswap module is essentially what I had here, so let's just use that
instead.

Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'modules')
-rw-r--r--modules/user/aszlig/profiles/workstation/default.nix24
1 files changed, 3 insertions, 21 deletions
diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix
index c425d750..790ca92f 100644
--- a/modules/user/aszlig/profiles/workstation/default.nix
+++ b/modules/user/aszlig/profiles/workstation/default.nix
@@ -3,10 +3,6 @@
 let
   cfg = config.vuizvui.user.aszlig.profiles.workstation;
   inherit (config.services.xserver) xrandrHeads;
-
-  kernelVersion = config.boot.kernelPackages.kernel.version;
-  hasZstd = lib.versionAtLeast kernelVersion "4.18";
-
 in {
   options.vuizvui.user.aszlig.profiles.workstation = {
     enable = lib.mkEnableOption "Workstation profile for aszlig";
@@ -15,23 +11,7 @@ in {
   config = lib.mkIf cfg.enable {
     vuizvui.user.aszlig.profiles.base.enable = true;
 
-    boot.kernelPatches = lib.singleton {
-      name = "zswap-config";
-      patch = null;
-      extraConfig = ''
-        CRYPTO_${if hasZstd then "ZSTD" else "LZO"} y
-        ZSWAP y
-        Z3FOLD y
-      '';
-    };
-
-    boot.kernelParams = [
-      "zswap.enabled=1"
-      "zswap.zpool=z3fold"
-      "zswap.compressor=${if hasZstd then "zstd" else "lzo"}"
-      "panic=1800"
-    ];
-
+    boot.kernelParams = [ "panic=1800" ];
     boot.cleanTmpDir = true;
 
     environment.systemPackages = with lib; let
@@ -134,6 +114,8 @@ in {
     vuizvui.programs.gnupg.agent.sshSupport = true;
     vuizvui.programs.gnupg.agent.scdaemon.enable = true;
 
+    vuizvui.system.kernel.zswap.enable = true;
+
     services = {
       openssh.enable = true;