This commit is contained in:
mjallen18
2026-03-10 11:13:25 -05:00
parent 2fbfd9c2d3
commit 01f6eeff7c
2 changed files with 22 additions and 17 deletions

View File

@@ -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";

View File

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