diff --git a/nix/configuration/roles/kernel/default.nix b/nix/configuration/roles/kernel/default.nix index 58493fc..6686b8e 100644 --- a/nix/configuration/roles/kernel/default.nix +++ b/nix/configuration/roles/kernel/default.nix @@ -14,30 +14,12 @@ let full = { PREEMPT_DYNAMIC = yes; PREEMPT = yes; - PREEMPT_VOLUNTARY = lib.mkForce no; PREEMPT_LAZY = lib.mkForce no; - PREEMPT_NONE = no; }; lazy = { PREEMPT_DYNAMIC = yes; PREEMPT = no; - PREEMPT_VOLUNTARY = lib.mkForce no; PREEMPT_LAZY = yes; - PREEMPT_NONE = no; - }; - voluntary = { - PREEMPT_DYNAMIC = no; - PREEMPT = no; - PREEMPT_VOLUNTARY = yes; - PREEMPT_LAZY = lib.mkForce no; - PREEMPT_NONE = no; - }; - none = { - PREEMPT_DYNAMIC = no; - PREEMPT = no; - PREEMPT_VOLUNTARY = lib.mkForce no; - PREEMPT_LAZY = lib.mkForce no; - PREEMPT_NONE = yes; }; }; tick_hz = @@ -99,16 +81,14 @@ let TRANSPARENT_HUGEPAGE_MADVISE = yes; }; }; - common_config = - with lib.kernel; - { - # Google's BBRv3 TCP congestion Control - TCP_CONG_BBR = yes; - DEFAULT_BBR = yes; - }; + common_config = with lib.kernel; { + # Google's BBRv3 TCP congestion Control + TCP_CONG_BBR = yes; + DEFAULT_BBR = yes; + }; flavors = { server = lib.mkMerge [ - preemption_type.none + preemption_type.lazy tick_hz."300" performance_governor.default tick_rate.tickless @@ -142,7 +122,8 @@ in kernel.version = lib.mkOption { type = lib.types.str; - default = "linux"; # LTS + # default = "linux"; # LTS + default = "linux_7_2"; # LTS example = "linux_6_18"; description = "What version of the kernl should we use."; };