linux_cachyos: fix hardened

chaotic-cx · Nov 9, 2023 · d6451e6 · d6451e6
1 parent 7f58aa0
commit d6451e6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/overlays/default.nix b/overlays/default.nix
@@ -107,6 +107,9 @@ in
   linuxPackages_cachyos = cachyosPackages.cachyos;
   linuxPackages_cachyos-server = cachyosPackages.cachyos-server;
   linuxPackages_cachyos-hardened = cachyosPackages.cachyos-hardened;
+  linuxPackages-hardened_cachyos = lib.trivial.warn
+    "`linuxPackages-hardened_cachyos` was renamed to `linuxPackages_cachyos-hardened`"
+    (final.linuxPackages_cachyos-hardened // {recurseForDerivations = false;});
 
   luxtorpeda = final.callPackage ../pkgs/luxtorpeda {
     luxtorpedaVersion = importJSON ../pkgs/luxtorpeda/version.json;

diff --git a/pkgs/linux-cachyos/all-packages.nix b/pkgs/linux-cachyos/all-packages.nix
@@ -31,5 +31,6 @@ in
   cachyos-hardened = mkCachyKernel {
     taste = "archive/linux-cachyos-hardened";
     configPath = ./config-nix/cachyos-hardened.x86_64-linux.nix;
+    cpuSched = "hardened";
   };
 }
diff --git a/pkgs/linux-cachyos/configfile-raw.nix b/pkgs/linux-cachyos/configfile-raw.nix
@@ -79,7 +79,7 @@ let
   cpuSchedConfig =
     if cachyConfig.cpuSched == "eevdf" then
       [ ]
-    else if cachyConfig.cpuSched == "cachyos" then
+    else if cachyConfig.cpuSched == "cachyos" || cachyConfig.cpuSched == "hardened" then
       [ "-e SCHED_BORE" ]
     else throw "Unsupported cachyos scheduler";
 

diff --git a/pkgs/linux-cachyos/kernel.nix b/pkgs/linux-cachyos/kernel.nix
@@ -32,7 +32,7 @@ let
   };
 
   schedPatch =
-    if cachyConfig.cpuSched == "cachyos" then
+    if cachyConfig.cpuSched == "cachyos" || cachyConfig.cpuSched == "hardened" then
       "bore-cachy"
     else throw "Unsupported cachyos _cpu_sched";
 in
@@ -50,6 +50,7 @@ in
     })
     ([ "${patches-src}/${major}/all/0001-cachyos-base-all.patch" ]
       ++ lib.optional (cachyConfig.cpuSched != "eevdf") "${patches-src}/${major}/sched/0001-${schedPatch}.patch"
+      ++ lib.optional (cachyConfig.cpuSched != "hardened") "${patches-src}/${major}/misc/0001-hardened.patch"
       ++ [ "${patches-src}/${major}/misc/0001-Add-extra-version-CachyOS.patch" ]
       ++ lib.optional cachyConfig.withBCacheFS "${patches-src}/${major}/misc/0001-bcachefs.patch"
     );

diff --git a/pkgs/linux-cachyos/make.nix b/pkgs/linux-cachyos/make.nix
@@ -5,6 +5,7 @@
 , fetchFromGitHub
 , linuxPackagesFor
 , nyxUtils
+  # those are set in their PKGBUILDs
 , kernelPatches ? { }
 , basicCachy ? true
 , cpuSched ? "cachyos"