lol

packages/linux-cachyos/prepare.nix

@@ -105,8 +105,10 @@ let
     ++ cpuSchedConfig
     ++ [
       "-m CONFIG_CRYPTO_BLAKE2B"
-      # _nr_cpus, defaults to empty, which later set this
+    ]
-      "--set-val NR_CPUS 320"
+    # _nr_cpus — skip for Asahi; asahiPlatformConfig sets the correct value (64)
+    ++ lib.optional (cachyConfig.taste != "linux-cachyos-asahi") "--set-val NR_CPUS 320"
+    ++ [
 
       # _per_gov, defaults to empty [but PERSONAL CHANGE to "y"]
       "-d CPU_FREQ_DEFAULT_GOV_SCHEDUTIL"
@@ -144,9 +146,9 @@ let
       # _vma_config, defaults to "standard"
       "-e PER_VMA_LOCK"
       "-d PER_VMA_LOCK_STATS"
-
-      "-m BCACHEFS_FS"
     ]
+    # bcachefs is not in the Asahi 6.18 tree
+    ++ lib.optional (cachyConfig.taste != "linux-cachyos-asahi") "-m BCACHEFS_FS"
     ++ hugePagesConfig
     ++ damonConfig
     ++ ntSyncConfig
@@ -229,7 +231,6 @@ let
         "-e HAS_LTO_CLANG"
         "-d LTO_CLANG_FULL"
         "-e LTO_CLANG_THIN"
-        "-e HAVE_GCC_PLUGINS"
       ]
     else if cachyConfig.useLTO == "full" then
       [
@@ -241,7 +242,6 @@ let
         "-e HAS_LTO_CLANG"
         "-e LTO_CLANG_FULL"
         "-d LTO_CLANG_THIN"
-        "-e HAVE_GCC_PLUGINS"
       ]
     else if cachyConfig.useLTO == "none" then
       [ ]
@@ -262,13 +262,16 @@ let
       [
         "-d HZ_PERIODIC"
         "-d NO_HZ_IDLE"
-        "-d CONTEXT_TRACKING_FORCE"
-        "-e NO_HZ_FULL_NODEF"
         "-e NO_HZ_FULL"
         "-e NO_HZ"
         "-e NO_HZ_COMMON"
         "-e CONTEXT_TRACKING"
       ]
+      # x86-only tickrate symbols — absent on aarch64, silently ignored but excluded for clarity
+      ++ lib.optionals (!stdenv.isAarch64) [
+        "-d CONTEXT_TRACKING_FORCE"
+        "-e NO_HZ_FULL_NODEF"
+      ]
     else
       throw "Unsupported cachyos _tickrate";
 

systems/aarch64-linux/macbook-pro-nixos/boot.nix

@@ -55,12 +55,14 @@ in
   };
 
   specialisation =
-  let
+    let
-    kernel = pkgs.${namespace}.linuxPackages_cachyos-asahi-lto;
+      kernel = pkgs.${namespace}.linuxPackages_cachyos-asahi-lto;
-  in {
+    in
-    "cachyos-asahi".configuration = {
+    {
-      boot = {
+      "cachyos-asahi".configuration = {
-        kernelPackages = lib.mkOverride 90 kernel;
+        boot = {
+          kernelPackages = lib.mkOverride 90 kernel;
+        };
       };
-  };
+    };
 }