From 693967cf49dd795fa6c51d456053b3de382c0cd3 Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Mon, 27 Nov 2023 02:22:08 +0800
Subject: [PATCH] system.kernel: remove preempt patch

---
 flake.nix                 |  8 +++-----
 modules/system/kernel.nix | 14 +-------------
 secrets/vps6.yaml         |  5 +++--
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/flake.nix b/flake.nix
index 13152fba..52be3676 100644
--- a/flake.nix
+++ b/flake.nix
@@ -137,7 +137,7 @@
                 };
                 nixpkgs = { march = "alderlake"; cudaSupport = true; };
                 gui = { enable = true; preferred = true; };
-                kernel.patches = [ "cjktty" "preempt" ];
+                kernel.patches = [ "cjktty" ];
                 impermanence.enable = true;
                 networking =
                   { hostname = "pc"; nebula = { enable = true; lighthouse = "vps6.chn.moe"; useRelay = true; }; };
@@ -255,7 +255,6 @@
                   autoOptimiseStore = true;
                 };
                 initrd.sshd.enable = true;
-                kernel.patches = [ "preempt" ];
                 impermanence.enable = true;
                 networking = { hostname = "vps6"; nebula.enable = true; };
               };
@@ -325,7 +324,6 @@
                 nixpkgs.march = "broadwell";
                 nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
                 initrd.sshd.enable = true;
-                kernel.patches = [ "preempt" ];
                 impermanence.enable = true;
                 networking = { hostname = "vps7"; nebula = { enable = true; lighthouse = "vps6.chn.moe"; }; };
                 gui.enable = true;
@@ -406,7 +404,7 @@
                 grub.installDevice = "efi";
                 nixpkgs.march = "silvermont";
                 nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
-                kernel.patches = [ "cjktty" "preempt" ];
+                kernel.patches = [ "cjktty" ];
                 impermanence.enable = true;
                 networking =
                   { hostname = "nas"; nebula = { enable = true; lighthouse = "vps6.chn.moe"; useRelay = true; }; };
@@ -487,7 +485,7 @@
                 gui.enable = true;
                 grub.installDevice = "efi";
                 nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
-                kernel.patches = [ "cjktty" "preempt" ];
+                kernel.patches = [ "cjktty" ];
                 impermanence.enable = true;
                 networking.hostname = "yoga";
               };
diff --git a/modules/system/kernel.nix b/modules/system/kernel.nix
index 93a351dd..4c56d4f2 100644
--- a/modules/system/kernel.nix
+++ b/modules/system/kernel.nix
@@ -3,7 +3,7 @@ inputs:
   options.nixos.system.kernel = let inherit (inputs.lib) mkOption types; in
   {
     useLts = mkOption { type = types.bool; default = false; };
-    patches = mkOption { type = types.listOf (types.enum [ "cjktty" "preempt" ]); default = []; };
+    patches = mkOption { type = types.listOf (types.enum [ "cjktty" ]); default = []; };
     modules =
     {
       install = mkOption { type = types.listOf types.str; default = []; };
@@ -60,18 +60,6 @@ inputs:
               extraStructuredConfig =
                 { FONT_CJK_16x16 = inputs.lib.kernel.yes; FONT_CJK_32x32 = inputs.lib.kernel.yes; };
             };
-            preempt =
-            {
-              patch = null;
-              extraStructuredConfig =
-              {
-                PREEMPT_VOLUNTARY = inputs.lib.mkForce inputs.lib.kernel.no;
-                PREEMPT = inputs.lib.mkForce inputs.lib.kernel.yes;
-                HZ_500 = inputs.lib.mkForce inputs.lib.kernel.no;
-                HZ_1000 = inputs.lib.mkForce inputs.lib.kernel.yes;
-                HZ = inputs.lib.mkForce (inputs.lib.kernel.freeform "1000");
-              };
-            };
           };
         in
           builtins.map (name: { inherit name; } // patches.${name}) kernel.patches;
diff --git a/secrets/vps6.yaml b/secrets/vps6.yaml
index c2931f16..0892dc1b 100644
--- a/secrets/vps6.yaml
+++ b/secrets/vps6.yaml
@@ -42,6 +42,7 @@ xray-server:
         user17: ENC[AES256_GCM,data:Wz7tWzASeIKE9TzicUIwyOnjZDDICYvDAUu/scHrQoFjoOlE,iv:A2gPFSiIXaf1dQkFlXjw5yesKtv3qOVcIXzM2QspvDk=,tag:JWCVx2FJS84v2iMdzBxhlQ==,type:str]
         #ENC[AES256_GCM,data:b839t/OihMOmz0gIcTo43r2MIw==,iv:8kaAFG7DhFOoitcvbFaAvE1NUSLFrFhy1KiMrqs4r/c=,tag:G4vSADa52ZfN5y5ytoFJoQ==,type:comment]
         user18: ENC[AES256_GCM,data:xQMRt+YC1Kn0Qxtis9QVIypq4uHNLq2sWKxxQe515Kfg+zzw,iv:28nQibxqzx5Q17UkEwK0zYhu6mFJ8LUk78xxlQrIqFY=,tag:B7N/fC81v8VBTsDdIZDvDw==,type:str]
+        #ENC[AES256_GCM,data:fZFxSd9QDRBg/X5yFQia96I=,iv:cd9vJ+f+TJr4mmXPNwcsce0p7i36Nkt1OnUzqDhK4hE=,tag:FsOHS+zhr5wZNmJpMfG97w==,type:comment]
         user19: ENC[AES256_GCM,data:Qjajmu6cfACT4eho6BK56zRd7BSXxo4fUeJ2RRawopVFZESJ,iv:QZN81pQxspe76V90NQxzsKmMwtvaC1qwuvd5a6WbrdU=,tag:/+LYeQLqvwM60DgIPtZzKA==,type:str]
         user20: ENC[AES256_GCM,data:uRSG6jOks7utk2bRdd5sndvqVnSGRhjkts2f3+V7JdEwQf4k,iv:xZdVv/H5RuliwSEWmgLViLquWZ5znGOpP9YwwLJfsyo=,tag:JR3BsCKkHpkE7woTaMHXwQ==,type:str]
         user21: ENC[AES256_GCM,data:9cd7IY3zzoziXznclguxbmmZ5hfc2H1DPa+KW1geuybRlpB9,iv:NKwdt7ppRuNpn44f1ypNOoPS27Yqk3Z31ABQbflS9Gg=,tag:S2B1vR0PVd3FYu24XwTfpQ==,type:str]
@@ -96,8 +97,8 @@ sops:
             ZXFTU3ZCaW1pTVh0RUJzdDdGdHlPYTgK2mlgcX2kEc8+2UDdBnhUm6IIuh8V6agW
             ooxH9OEPXUVI/4JcDo4v8ZUhAyU1ehLH0Ef7PJCChOZe2KZmWSNbhA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-11-18T15:17:58Z"
-    mac: ENC[AES256_GCM,data:L8aX2FWeHLxtNz/a2sdkPNnd00Rf8a2snSxXWd6prwMfHAjzhNtgrA9AdRes3gCGY50NwkcOVyxmQ5YFvlsYaqjHUHlFehQtZwO6TI7x31rKuhWiejiiB5fcLqd2jKb9ZZYXIw1KemqPDZGo70vkYBFpAT94mx92nubQJwl01ao=,iv:UrdPEMwiPKyEZqRoZbLXfUZfRLPdGlkr+mFMXlrLjjU=,tag:6s2a0L8bFtCvsePclBw1Hg==,type:str]
+    lastmodified: "2023-11-25T17:17:14Z"
+    mac: ENC[AES256_GCM,data:MXexJbNs0mJ7M0DCWwMajsfm0cMigHqppWEBsaqw1i3DSHHWiY4ZRHqzTKBIZWFNqffoFWn4kUBc9reQgjfEfTcXSuDwiPboynj4itm88hAAEfleWKcwyEdD6WA5uV9AVteGYCtqhgtK3rogPNEo224wBCJgWDxLBYUBk45xsuk=,iv:QZNQIVHPuDic5VXqWFLJh+9XEqIsPEJDH2AwarXDerc=,tag:SlYq4BeU1I8NS/Jr2V/xIQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3