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 e60c66bd0b into 52113c4f5c

Browse source
This commit is contained in:
Jörg Thalheim 2025-11-07 13:00:41 +01:00 committed by GitHub
parent 52113c4f5c e60c66bd0b
commit 15138004ab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 5 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CONTRIBUTING.md
View file

@ -14,8 +14,9 @@ For example:
```nix ```nix
{ lib }: { { lib }: {
# Using mkDefault, because the user might want to disable tlp # Using mkDefault, because the user might want to disable power-profiles-daemon
services.tlp.enable = lib.mkDefault true; services.power-profiles-daemon.enable = lib.mkDefault true;
# No need to use mkDefault, because the setting will merge with the user's setting # No need to use mkDefault, because the setting will merge with the user's setting
boot.kernelModules = [ "tmp_smapi" ]; boot.kernelModules = [ "tmp_smapi" ];
} }

4
asus/fa507nv/default.nix
View file

@ -25,10 +25,6 @@
lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8") lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8")
[ "rtc_cmos.use_acpi_alarm=1" ]; [ "rtc_cmos.use_acpi_alarm=1" ];
# AMD has better battery life with PPD over TLP:
# https://community.frame.work/t/responded-amd-7040-sleep-states/38101/13
services.power-profiles-daemon.enable = lib.mkDefault true;
# Adds the missing asus functionality to Linux. # Adds the missing asus functionality to Linux.
# https://asus-linux.org/manual/asusctl-manual/ # https://asus-linux.org/manual/asusctl-manual/
services = { services = {

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

@ -1,13 +1,6 @@
{ config, lib, ... }: { lib, config, ... }:
{ {
imports = [ ../. ]; imports = [ ../. ];
# Gnome 40 introduced a new way of managing power, without tlp. config.services.power-profiles-daemon.enable = lib.mkDefault (!config.services.tlp.enable);
# 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
);
} }

3
dell/inspiron/14-5420/README.md
View file

@ -8,6 +8,3 @@
`fwupd` is used to receive firmware updates from vendors. This device is in its [supported devices list](https://fwupd.org/lvfs/devices/) `fwupd` is used to receive firmware updates from vendors. This device is in its [supported devices list](https://fwupd.org/lvfs/devices/)
`thermald` is used to achieve better thermal behaviour `thermald` is used to achieve better thermal behaviour
##### TLP
TLP is a battery power optimizer for laptops. It is enabled by default, however, since it conflicts with power-profiles-daemon which is GNOME's power management system, TLP will not be installed with if power-profiles-daemon or a recent version of GNOME is present.

4
framework/13-inch/common/amd.nix
View file

@ -18,8 +18,4 @@
++ lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8") [ ++ lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8") [
"rtc_cmos.use_acpi_alarm=1" "rtc_cmos.use_acpi_alarm=1"
]; ];
# AMD has better battery life with PPD over TLP:
# https://community.frame.work/t/responded-amd-7040-sleep-states/38101/13
services.power-profiles-daemon.enable = lib.mkDefault true;
} }

4
framework/16-inch/common/amd.nix
View file

@ -18,8 +18,4 @@
++ lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8") [ ++ lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8") [
"rtc_cmos.use_acpi_alarm=1" "rtc_cmos.use_acpi_alarm=1"
]; ];
# AMD has better battery life with PPD over TLP:
# https://community.frame.work/t/responded-amd-7040-sleep-states/38101/13
services.power-profiles-daemon.enable = lib.mkDefault true;
} }

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

@ -10,11 +10,6 @@
"video=eDP-1:panel_orientation=right_side_up" "video=eDP-1:panel_orientation=right_side_up"
]; ];
services.tlp.enable = lib.mkDefault (
(lib.versionOlder (lib.versions.majorMinor lib.version) "21.05")
|| !config.services.power-profiles-daemon.enable
);
# Required for grub to properly display the boot menu. # Required for grub to properly display the boot menu.
boot.loader.grub.gfxmodeEfi = lib.mkDefault "720x1280x32"; boot.loader.grub.gfxmodeEfi = lib.mkDefault "720x1280x32";

5
lenovo/ideapad/15arh05/default.nix
View file

@ -17,9 +17,4 @@
# Cooling management # Cooling management
services.thermald.enable = lib.mkDefault true; services.thermald.enable = lib.mkDefault true;
# tlp defaults to "powersave", which doesn't exist on this laptop
services.tlp.settings = {
CPU_SCALING_GOVERNOR_ON_BAT = "schedutil";
};
} }

4
lenovo/legion/16aph8/default.nix
View file

@ -32,8 +32,4 @@
# Avoid issues with modesetting causing blank screen # Avoid issues with modesetting causing blank screen
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];
# AMD has better battery life with PPD over TLP:
# https://community.frame.work/t/responded-amd-7040-sleep-states/38101/13
services.power-profiles-daemon.enable = lib.mkDefault true;
} }

3
microsoft/surface/common/default.nix
View file

@ -110,9 +110,6 @@ in
kernelParams = mkDefault [ "mem_sleep_default=deep" ]; kernelParams = mkDefault [ "mem_sleep_default=deep" ];
}; };
# NOTE: Check the README before enabling TLP:
services.tlp.enable = mkDefault false;
# Needed for wifi firmware, see https://github.com/NixOS/nixos-hardware/issues/364 # Needed for wifi firmware, see https://github.com/NixOS/nixos-hardware/issues/364
hardware = { hardware = {
enableRedistributableFirmware = mkDefault true; enableRedistributableFirmware = mkDefault true;