From 8bbc225e1168fe9da7534c99520bc14258ca2894 Mon Sep 17 00:00:00 2001
From: Lan Tian <xuyh0120@outlook.com>
Date: Wed, 13 May 2026 23:13:25 -0700
Subject: [PATCH] Remove v2 variants and add BORE v3/v4/zen4 variants (#50)

---
 flake.nix                  |   2 +
 kernel-cachyos/default.nix | 101 ++++++++++++++++++++++---------------
 2 files changed, 63 insertions(+), 40 deletions(-)

diff --git a/flake.nix b/flake.nix
index e9a8df4..a0ba2d1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -196,6 +196,8 @@
               cachyos-latest-lto = mkSystem "linuxPackages-cachyos-latest-lto";
               cachyos-lts = mkSystem "linuxPackages-cachyos-lts";
               cachyos-lts-lto = mkSystem "linuxPackages-cachyos-lts-lto";
+              cachyos-bore = mkSystem "linuxPackages-cachyos-bore";
+              cachyos-bore-lto = mkSystem "linuxPackages-cachyos-bore-lto";
             };
         };
       }
diff --git a/kernel-cachyos/default.nix b/kernel-cachyos/default.nix
index 9fbeaa1..4b38a76 100644
--- a/kernel-cachyos/default.nix
+++ b/kernel-cachyos/default.nix
@@ -17,18 +17,12 @@ let
 in
 builtins.listToAttrs (
   builtins.map (v: lib.nameValuePair v.pname v) [
-    # Latest kernel, provide all LTO/CPU arch variants
+    # Latest kernel, provide all LTO and v3/v4/zen4 arch variants
     (mkCachyKernel {
       pname = "linux-cachyos-latest";
       inherit (linuxSources.latest) version src;
       configVariant = "linux-cachyos";
     })
-    (mkCachyKernel {
-      pname = "linux-cachyos-latest-x86_64-v2";
-      inherit (linuxSources.latest) version src;
-      configVariant = "linux-cachyos";
-      processorOpt = "x86_64-v2";
-    })
     (mkCachyKernel {
       pname = "linux-cachyos-latest-x86_64-v3";
       inherit (linuxSources.latest) version src;
@@ -53,13 +47,6 @@ builtins.listToAttrs (
       configVariant = "linux-cachyos";
       lto = "thin";
     })
-    (mkCachyKernel {
-      pname = "linux-cachyos-latest-lto-x86_64-v2";
-      inherit (linuxSources.latest) version src;
-      configVariant = "linux-cachyos";
-      lto = "thin";
-      processorOpt = "x86_64-v2";
-    })
     (mkCachyKernel {
       pname = "linux-cachyos-latest-lto-x86_64-v3";
       inherit (linuxSources.latest) version src;
@@ -88,12 +75,6 @@ builtins.listToAttrs (
       inherit (linuxSources.lts) version src;
       configVariant = "linux-cachyos-lts";
     })
-    (mkCachyKernel {
-      pname = "linux-cachyos-lts-x86_64-v2";
-      inherit (linuxSources.lts) version src;
-      configVariant = "linux-cachyos-lts";
-      processorOpt = "x86_64-v2";
-    })
     (mkCachyKernel {
       pname = "linux-cachyos-lts-x86_64-v3";
       inherit (linuxSources.lts) version src;
@@ -118,13 +99,6 @@ builtins.listToAttrs (
       configVariant = "linux-cachyos-lts";
       lto = "thin";
     })
-    (mkCachyKernel {
-      pname = "linux-cachyos-lts-lto-x86_64-v2";
-      inherit (linuxSources.lts) version src;
-      configVariant = "linux-cachyos-lts";
-      lto = "thin";
-      processorOpt = "x86_64-v2";
-    })
     (mkCachyKernel {
       pname = "linux-cachyos-lts-lto-x86_64-v3";
       inherit (linuxSources.lts) version src;
@@ -147,6 +121,66 @@ builtins.listToAttrs (
       processorOpt = "zen4";
     })
 
+    # BORE variant
+    (mkCachyKernel {
+      pname = "linux-cachyos-bore";
+      inherit (linuxSources.latest) version src;
+      configVariant = "linux-cachyos-bore";
+      cpusched = "bore";
+    })
+    (mkCachyKernel {
+      pname = "linux-cachyos-bore-x86_64-v3";
+      inherit (linuxSources.latest) version src;
+      configVariant = "linux-cachyos-bore";
+      cpusched = "bore";
+      processorOpt = "x86_64-v3";
+    })
+    (mkCachyKernel {
+      pname = "linux-cachyos-bore-x86_64-v4";
+      inherit (linuxSources.latest) version src;
+      configVariant = "linux-cachyos-bore";
+      cpusched = "bore";
+      processorOpt = "x86_64-v4";
+    })
+    (mkCachyKernel {
+      pname = "linux-cachyos-bore-zen4";
+      inherit (linuxSources.latest) version src;
+      configVariant = "linux-cachyos-bore";
+      cpusched = "bore";
+      processorOpt = "zen4";
+    })
+    (mkCachyKernel {
+      pname = "linux-cachyos-bore-lto";
+      inherit (linuxSources.latest) version src;
+      configVariant = "linux-cachyos-bore";
+      lto = "thin";
+      cpusched = "bore";
+    })
+    (mkCachyKernel {
+      pname = "linux-cachyos-bore-lto-x86_64-v3";
+      inherit (linuxSources.latest) version src;
+      configVariant = "linux-cachyos-bore";
+      lto = "thin";
+      cpusched = "bore";
+      processorOpt = "x86_64-v3";
+    })
+    (mkCachyKernel {
+      pname = "linux-cachyos-bore-lto-x86_64-v4";
+      inherit (linuxSources.latest) version src;
+      configVariant = "linux-cachyos-bore";
+      lto = "thin";
+      cpusched = "bore";
+      processorOpt = "x86_64-v4";
+    })
+    (mkCachyKernel {
+      pname = "linux-cachyos-bore-lto-zen4";
+      inherit (linuxSources.latest) version src;
+      configVariant = "linux-cachyos-bore";
+      lto = "thin";
+      cpusched = "bore";
+      processorOpt = "zen4";
+    })
+
     # Additional CachyOS provided variants
     (mkCachyKernel {
       pname = "linux-cachyos-bmq";
@@ -161,19 +195,6 @@ builtins.listToAttrs (
       lto = "thin";
       cpusched = "bmq";
     })
-    (mkCachyKernel {
-      pname = "linux-cachyos-bore";
-      inherit (linuxSources.latest) version src;
-      configVariant = "linux-cachyos-bore";
-      cpusched = "bore";
-    })
-    (mkCachyKernel {
-      pname = "linux-cachyos-bore-lto";
-      inherit (linuxSources.latest) version src;
-      configVariant = "linux-cachyos-bore";
-      lto = "thin";
-      cpusched = "bore";
-    })
     (mkCachyKernel {
       pname = "linux-cachyos-deckify";
       inherit (linuxSources.latest) version src;