This commit is contained in:
Joaquín Triñanes 2025-11-06 13:38:39 -05:00 committed by GitHub
commit 4996a18d75
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 6 deletions

View file

@ -1,4 +1,9 @@
{ config, lib, ... }:
{
config,
lib,
options,
...
}:
{
imports = [ ../. ];
@ -7,7 +12,7 @@
# However, these 2 services clash when enabled simultaneously.
# https://github.com/NixOS/nixos-hardware/issues/260
services.tlp.enable = lib.mkDefault (
(lib.versionOlder (lib.versions.majorMinor lib.version) "21.05")
|| !config.services.power-profiles-daemon.enable
!(options.services ? power-profiles-daemon && config.services.power-profiles-daemon.enable)
&& !(options.services ? tuned && config.services.tuned.enable)
);
}

View file

@ -1,4 +1,9 @@
{ config, lib, ... }:
{
config,
lib,
options,
...
}:
{
imports = [
../../common/cpu/intel
@ -11,8 +16,8 @@
];
services.tlp.enable = lib.mkDefault (
(lib.versionOlder (lib.versions.majorMinor lib.version) "21.05")
|| !config.services.power-profiles-daemon.enable
!(options.services ? power-profiles-daemon && config.services.power-profiles-daemon.enable)
&& !(options.services ? tuned && config.services.tuned.enable)
);
# Required for grub to properly display the boot menu.