From 7ab17f132e77c9cd2d7adec77e98d3d277136e6e Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Wed, 15 Apr 2026 17:33:21 -0400
Subject: [PATCH] kernel: compile for x86_64-v3 (common target)

---
 system/common.nix       | 11 +++++++++++
 system/system-mreow.nix | 11 -----------
 system/system-yarn.nix  | 16 ----------------
 3 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/system/common.nix b/system/common.nix
index b8455df..5c5657e 100644
--- a/system/common.nix
+++ b/system/common.nix
@@ -100,6 +100,17 @@
   # kernel options
   boot = {
 
+    # cachyos kernel: bore scheduler, full lto, x86_64-v3 (common to zen 3 + zen 5)
+    kernelPackages =
+      let
+        helpers = pkgs.callPackage "${inputs.nix-cachyos-kernel}/helpers.nix" { };
+        kernel = pkgs.cachyosKernels.linux-cachyos-bore-lto.override {
+          lto = "full";
+          processorOpt = "x86_64-v3";
+        };
+      in
+      helpers.kernelModuleLLVMOverride (pkgs.linuxKernel.packagesFor kernel);
+
     # disable legacy subsystems neither host will ever use
     kernelPatches = [
       {
diff --git a/system/system-mreow.nix b/system/system-mreow.nix
index eddf970..16d7902 100644
--- a/system/system-mreow.nix
+++ b/system/system-mreow.nix
@@ -14,17 +14,6 @@
     inputs.nixos-hardware.nixosModules.framework-amd-ai-300-series
   ];
 
-  # cachyos kernel: bore scheduler, full lto, zen 4 (amd ai 340)
-  boot.kernelPackages =
-    let
-      helpers = pkgs.callPackage "${inputs.nix-cachyos-kernel}/helpers.nix" { };
-      kernel = pkgs.cachyosKernels.linux-cachyos-bore-lto.override {
-        lto = "full";
-        processorOpt = "zen4";
-      };
-    in
-    helpers.kernelModuleLLVMOverride (pkgs.linuxKernel.packagesFor kernel);
-
   hardware.framework.laptop13.audioEnhancement.rawDeviceName =
     lib.mkDefault "alsa_output.pci-0000_c1_00.6.analog-stereo";
 
diff --git a/system/system-yarn.nix b/system/system-yarn.nix
index 2be8e6a..6a0f0c7 100644
--- a/system/system-yarn.nix
+++ b/system/system-yarn.nix
@@ -19,22 +19,6 @@
     inputs.jovian-nixos.nixosModules.default
   ];
 
-  # cachyos kernel: bore scheduler, full lto, zen 3 (5800x)
-  boot.kernelPackages =
-    let
-      helpers = pkgs.callPackage "${inputs.nix-cachyos-kernel}/helpers.nix" { };
-      kernel = pkgs.cachyosKernels.linux-cachyos-bore-lto.override {
-        lto = "full";
-        processorOpt = "x86_64-v3";
-        structuredExtraConfig = with lib.kernel; {
-          # x86_64-v3 is the ISA level; pin to zen 3 for microarch tuning
-          GENERIC_CPU = lib.mkForce no;
-          MZEN3 = lib.mkForce yes;
-        };
-      };
-    in
-    helpers.kernelModuleLLVMOverride (pkgs.linuxKernel.packagesFor kernel);
-
   fileSystems."/media/games" = {
     device = "/dev/disk/by-uuid/1878136e-765d-4784-b204-3536ab4fdac8";
     fsType = "f2fs";