From f7baafbc1e45fb4172adec3c0bbc71acf3b4cd6a Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Thu, 28 Dec 2023 14:19:36 -0600 Subject: [PATCH] Use patched power-profiles-daemon for foxtrot --- nixos/foxtrot/default.nix | 44 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/nixos/foxtrot/default.nix b/nixos/foxtrot/default.nix index f8534ff..826bb26 100644 --- a/nixos/foxtrot/default.nix +++ b/nixos/foxtrot/default.nix @@ -25,6 +25,46 @@ inputs.hardware.nixosModules.framework-13-7040-amd ]; + # use updated ppd for framework 13: + # source: https://community.frame.work/t/tracking-ppd-v-tlp-for-amd-ryzen-7040/39423/137?u=lytedev + nixpkgs.overlays = [ + ( + final: prev: { + power-profiles-daemon = prev.power-profiles-daemon.overrideAttrs ( + old: { + version = "0.13-1"; + + patches = + (old.patches or []) + ++ [ + (prev.fetchpatch { + url = "https://gitlab.freedesktop.org/upower/power-profiles-daemon/-/merge_requests/127.patch"; + sha256 = "sha256-jnq5yJvWQHOlZ78SE/4/HqiQfF25YHQH/T4wwDVRHR0="; + }) + (prev.fetchpatch { + url = "https://gitlab.freedesktop.org/upower/power-profiles-daemon/-/merge_requests/128.patch"; + sha256 = "sha256-YD9wn9IQlCp02r4lmwRnx9Eur2VVP1JfC/Bm8hlzF3Q="; + }) + (prev.fetchpatch { + url = "https://gitlab.freedesktop.org/upower/power-profiles-daemon/-/merge_requests/129.patch"; + sha256 = "sha256-9T+I3BAUW3u4LldF85ctE0/PLu9u+KBN4maoL653WJU="; + }) + ]; + + # explicitly fetching the source to make sure we're patching over 0.13 (this isn't strictly needed): + src = prev.fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "hadess"; + repo = "power-profiles-daemon"; + rev = "0.13"; + sha256 = "sha256-ErHy+shxZQ/aCryGhovmJ6KmAMt9OZeQGDbHIkC0vUE="; + }; + } + ); + } + ) + ]; + swapDevices = [ # TODO: move this to disko? # NOTE(oninstall): @@ -119,10 +159,10 @@ # tod.driver = pkgs.libfprint-2-tod1-goodix; }; services.power-profiles-daemon = { - enable = false; + enable = true; }; services.tlp = { - enable = true; + enable = false; settings = { CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; CPU_SCALING_GOVERNOR_ON_BAT = "ondemand";