linux_cachyos: 6.6.0 -> 6.6.1; refactor (#427)

overlays/default.nix

@@ -12,12 +12,12 @@
 { flakes, self ? flakes.self, selfOverlay ? self.overlays.default }:
 final: prev:
 let
-  # Required to load version files.
-  inherit (final.lib.trivial) importJSON;
+  # Required to load version files and warning.
+  inherit (final.lib.trivial) importJSON warn;
 
   # Our utilities/helpers.
   nyxUtils = import ../shared/utils.nix { inherit (final) lib; nyxOverlay = selfOverlay; };
-  inherit (nyxUtils) dropAttrsUpdateScript dropUpdateScript multiOverride multiOverrides overrideDescription;
+  inherit (nyxUtils) dropUpdateScript multiOverride multiOverrides overrideDescription;
 
   # Helps when calling .nix that will override packages.
   callOverride = path: attrs: import path ({ inherit final flakes nyxUtils prev gitOverride; } // attrs);
@@ -29,37 +29,16 @@ let
     prev = prev.pkgsi686Linux;
   } // attrs);
 
-  # CachyOS repeating stuff.
-  cachyVersions = importJSON ../pkgs/linux-cachyos/versions.json;
-
-  # CachyOS repeating stuff.
-  cachyZFS = _finalAttrs: prevAttrs:
-    let
-      zfs = prevAttrs.zfsUnstable.overrideAttrs (prevAttrs: {
-        src =
-          final.fetchFromGitHub {
-            owner = "cachyos";
-            repo = "zfs";
-            inherit (cachyVersions.zfs) rev hash;
-          };
-        meta = prevAttrs.meta // { broken = false; };
-        patches = [ ];
-      });
-    in
-    {
-      kernel_configfile = prevAttrs.kernel.configfile;
-      inherit zfs;
-      zfsStable = zfs;
-      zfsUnstable = zfs;
-    };
-
   # Magic helper for _git packages.
   gitOverride = import ../shared/git-override.nix {
     inherit (final) lib callPackage fetchFromGitHub fetchFromGitLab;
     nyx = self;
     fetchRevFromGitHub = final.callPackage ../shared/github-rev-fetcher.nix { };
     fetchRevFromGitLab = final.callPackage ../shared/gitlab-rev-fetcher.nix { };
   };
+
+  # Too much variations
+  cachyosPackages = callOverride ../pkgs/linux-cachyos/all-packages.nix { };
 in
 {
   inherit nyxUtils;
@@ -125,65 +104,12 @@ in
 
   latencyflex-vulkan = final.callPackage ../pkgs/latencyflex-vulkan { };
 
-  linux_cachyos = final.callPackage ../pkgs/linux-cachyos {
-    inherit cachyVersions;
-    cachyFlavor = rec {
-      taste = "linux-cachyos";
-      configfile = final.callPackage ../pkgs/linux-cachyos/configfile-raw.nix {
-        inherit cachyVersions;
-        cachyTaste = taste;
-      };
-      config = import ../pkgs/linux-cachyos/config-x86_64-linux.nix;
-      baked = final.callPackage ../pkgs/linux-cachyos/configfile-bake.nix {
-        inherit configfile;
-      };
-    };
-    kernelPatches = [ ]; # feel free to override.
-  };
-
-  linux_cachyos-server = final.callPackage ../pkgs/linux-cachyos {
-    inherit cachyVersions;
-    cachyFlavor = rec {
-      taste = "linux-cachyos-server";
-      configfile = final.callPackage ../pkgs/linux-cachyos/configfile-raw.nix {
-        inherit cachyVersions;
-        cachyTaste = taste;
-      };
-      config = import ../pkgs/linux-cachyos/config-x86_64-linux-server.nix;
-      baked = final.callPackage ../pkgs/linux-cachyos/configfile-bake.nix {
-        inherit configfile;
-      };
-    };
-    kernelPatches = [ ]; # feel free to override.
-  };
-
-  linux-hardened_cachyos = final.callPackage ../pkgs/linux-cachyos {
-    inherit cachyVersions;
-    cachyFlavor = rec {
-      taste = "linux-cachyos-hardened";
-      configfile = final.callPackage ../pkgs/linux-cachyos/configfile-raw.nix {
-        inherit cachyVersions;
-        cachyTaste = taste;
-      };
-      config = import ../pkgs/linux-cachyos/config-x86_64-linux-hardened.nix;
-      baked = final.callPackage ../pkgs/linux-cachyos/configfile-bake.nix {
-        inherit configfile;
-      };
-    };
-    kernelPatches = [ ]; # feel free to override.
-  };
-
-  linuxPackages_cachyos = (dropAttrsUpdateScript
-    ((final.linuxPackagesFor final.linux_cachyos).extend cachyZFS)
-  ) // { _description = "Kernel modules for linux_cachyos"; };
-
-  linuxPackages_cachyos-server = (dropAttrsUpdateScript
-    ((final.linuxPackagesFor final.linux_cachyos-server).extend cachyZFS)
-  ) // { _description = "Kernel modules for linux_cachyos-server"; };
-
-  linuxPackages-hardened_cachyos = (dropAttrsUpdateScript
-    ((final.linuxPackagesFor final.linux-hardened_cachyos).extend cachyZFS)
-  ) // { _description = "Kernel modules for linux-hardened_cachyos"; };
+  linuxPackages_cachyos = cachyosPackages.cachyos;
+  linuxPackages_cachyos-server = cachyosPackages.cachyos-server;
+  linuxPackages_cachyos-hardened = cachyosPackages.cachyos-hardened;
+  linuxPackages-hardened_cachyos = 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;

pkgs/linux-cachyos/all-packages.nix

@@ -0,0 +1,36 @@
+{ final, ... }:
+
+let
+  # CachyOS repeating stuff.
+  mainVersions = final.lib.trivial.importJSON ./versions.json;
+
+  mkCachyKernel = attrs: final.callPackage ./make.nix
+    ({ versions = mainVersions; } // attrs);
+in
+{
+  inherit mainVersions mkCachyKernel;
+
+  cachyos = mkCachyKernel {
+    taste = "linux-cachyos";
+    configPath = ./config-nix/cachyos.x86_64-linux.nix;
+  };
+
+  cachyos-server = mkCachyKernel {
+    taste = "linux-cachyos-server";
+    configPath = ./config-nix/cachyos-server.x86_64-linux.nix;
+    basicCachy = false;
+    cpuSched = "eevdf";
+    ticksHz = 300;
+    tickRate = "idle";
+    preempt = "server";
+    hugePages = "madvise";
+    withDAMON = true;
+    description = "Linux EEVDF scheduler Kernel by CachyOS targeted for Servers";
+  };
+
+  cachyos-hardened = mkCachyKernel {
+    taste = "archive/linux-cachyos-hardened";
+    configPath = ./config-nix/cachyos-hardened.x86_64-linux.nix;
+    cpuSched = "hardened";
+  };
+}