diff --git a/common/pc/laptop/default.nix b/common/pc/laptop/default.nix index abc76fa..5711e53 100644 --- a/common/pc/laptop/default.nix +++ b/common/pc/laptop/default.nix @@ -3,11 +3,5 @@ { imports = [ ../. ]; - # Gnome 40 introduced a new way of managing power, without tlp. - # 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 - ); + services.tlp.enable = lib.mkDefault (!config.services.power-profiles-daemon.enable); } diff --git a/gpd/win-2/default.nix b/gpd/win-2/default.nix index e724753..c281789 100644 --- a/gpd/win-2/default.nix +++ b/gpd/win-2/default.nix @@ -10,10 +10,7 @@ "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 - ); + services.tlp.enable = lib.mkDefault (!config.services.power-profiles-daemon.enable); # Required for grub to properly display the boot menu. boot.loader.grub.gfxmodeEfi = lib.mkDefault "720x1280x32";