diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 53b00b93358a..e38db853ff45 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -5,20 +5,23 @@ let ltsVariant = { version = "5.15.60"; hash = "sha256-XSOYgrJ/uvPpEG+P3Zy1geFeF/HMZ4LejsKWtTxMUTs="; + variant = "lts"; }; edgeVariant = { version = "5.19.1"; hash = "sha256-Fw+XW2YDAGKEzZ4AO88Y8GcypfOb6AjKp3XOlkT8ZTQ="; + variant = "edge"; }; ttVariant = { version = "5.15.54"; suffix = "xanmod1-tt"; hash = "sha256-4ck9PAFuIt/TxA/U+moGlVfCudJnzSuAw7ooFG3OJis="; + variant = "tt"; }; - xanmodKernelFor = { version, suffix ? "xanmod1", hash }: buildLinux (args // rec { + xanmodKernelFor = { version, suffix ? "xanmod1", hash, variant }: buildLinux (args // rec { inherit version; modDirVersion = "${version}-${suffix}"; @@ -30,11 +33,6 @@ let }; structuredExtraConfig = with lib.kernel; { - # removed options - CFS_BANDWIDTH = lib.mkForce (option no); - RT_GROUP_SCHED = lib.mkForce (option no); - SCHED_AUTOGROUP = lib.mkForce (option no); - # AMD P-state driver X86_AMD_PSTATE = yes; @@ -43,13 +41,6 @@ let NTFS3_LZX_XPRESS = yes; NTFS3_FS_POSIX_ACL = yes; - # Preemptive Full Tickless Kernel at 500Hz - SCHED_CORE = lib.mkForce (option no); - PREEMPT_VOLUNTARY = lib.mkForce no; - PREEMPT = lib.mkForce yes; - NO_HZ_FULL = yes; - HZ_500 = yes; - # Google's BBRv2 TCP congestion Control TCP_CONG_BBR2 = yes; DEFAULT_BBR2 = yes; @@ -67,6 +58,12 @@ let # WineSync driver for fast kernel-backed Wine WINESYNC = module; + } // lib.optionalAttrs (variant == "tt") { + # removed options + CFS_BANDWIDTH = lib.mkForce (option no); + RT_GROUP_SCHED = lib.mkForce (option no); + SCHED_AUTOGROUP = lib.mkForce (option no); + SCHED_CORE = lib.mkForce (option no); }; extraMeta = {