From 1c8f2f1c74ac9c83eef0c484e3a202f2e4f5ef5d Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 17 Jan 2025 18:55:59 -0500
Subject: [PATCH] Switch back to regular linux.

---
 .../hosts/odo/optimized_build.nix             | 51 ++++++++++++++++++-
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/nix/configuration/hosts/odo/optimized_build.nix b/nix/configuration/hosts/odo/optimized_build.nix
index 56edc2a..81dc96e 100644
--- a/nix/configuration/hosts/odo/optimized_build.nix
+++ b/nix/configuration/hosts/odo/optimized_build.nix
@@ -10,8 +10,9 @@
   nix.settings.system-features = lib.mkForce [
     "gccarch-znver4"
     "gccarch-skylake"
-    # "gccarch-alderlake" missing pkgwait
+    # "gccarch-alderlake" missing WAITPKG
     "gccarch-x86-64-v3"
+    "gccarch-x86-64-v4"
     "benchmark"
     "big-parallel"
     "kvm"
@@ -35,12 +36,58 @@
           });
       in
       {
-        linux_znver4 = optimizeWithFlags super.linux_zen [
+        # linux
+        # linux_6_11
+        # linux_zen
+        linux_znver4 = optimizeWithFlags super.linux_6_11 [
           "-march=znver4"
           "-mtune=znver4"
         ];
       }
     )
+    # (
+    #   self: super:
+    #   let
+    #     optimizeWithFlags =
+    #       pkg: flags:
+    #       pkg.overrideAttrs (old: {
+    #         NIX_CFLAGS_COMPILE = [ (old.NIX_CFLAGS_COMPILE or "") ] ++ flags;
+    #       });
+    #     addConfig =
+    #       additionalConfig: pkg:
+    #       pkg.override (oldconfig: {
+    #         structuredExtraConfig = pkg.structuredExtraConfig // additionalConfig;
+    #       });
+    #   in
+    #   {
+    #     linux_znver4 =
+    #       addConfig
+    #         {
+    #           # CPUFreq governor Performance
+    #           CPU_FREQ_DEFAULT_GOV_PERFORMANCE = lib.mkOverride 60 lib.kernel.yes;
+    #           CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = lib.mkOverride 60 lib.kernel.no;
+
+    #           # Full preemption
+    #           PREEMPT = lib.mkOverride 60 lib.kernel.yes;
+    #           PREEMPT_VOLUNTARY = lib.mkOverride 60 lib.kernel.no;
+
+    #           # Google's BBRv3 TCP congestion Control
+    #           TCP_CONG_BBR = lib.kernel.yes;
+    #           DEFAULT_BBR = lib.kernel.yes;
+
+    #           # Preemptive Full Tickless Kernel at 250Hz
+    #           HZ = lib.kernel.freeform "250";
+    #           HZ_250 = lib.kernel.yes;
+    #           HZ_1000 = lib.kernel.no;
+    #         }
+    #         (
+    #           optimizeWithFlags super.linux_6_11 [
+    #             "-march=znver4"
+    #             "-mtune=znver4"
+    #           ]
+    #         );
+    #   }
+    # )
   ];
 
   boot.kernelPackages = lib.mkIf (!config.me.buildingIso) (pkgs.linuxPackagesFor pkgs.linux_znver4);