tobias/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware.git synced 2025-11-09 16:16:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge 111d7c3baa into 24084931d8

Browse source
This commit is contained in:
Joaquín Triñanes 2025-11-06 13:38:39 -05:00 committed by GitHub
parent 24084931d8 111d7c3baa
commit 4996a18d75
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/pc/laptop/default.nix
View file

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

11
gpd/win-2/default.nix
View file

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