From 60b28a8d26e799931bb55f331d91619b1159efcf Mon Sep 17 00:00:00 2001
From: Myned <dev@bjork.tech>
Date: Wed, 30 Oct 2024 19:13:07 -0500
Subject: [PATCH] myork: switch to ppd

Signed-off-by: Myned <dev@bjork.tech>
---
 machines/myork/default.nix                        | 10 +++++-----
 options/custom/services/power-profiles-daemon.nix |  5 ++++-
 profiles/laptop/default.nix                       |  6 +++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/machines/myork/default.nix b/machines/myork/default.nix
index 0acc98f..bd3d133 100644
--- a/machines/myork/default.nix
+++ b/machines/myork/default.nix
@@ -23,10 +23,10 @@ in {
     services = {
       fw-fanctrl.enable = true;
 
-      auto-cpufreq.max = {
-        battery = 3; # GHz
-        #// charger = 3.5; # GHz
-      };
+      # auto-cpufreq.max = {
+      #   battery = 3; # GHz
+      #   #// charger = 3.5; # GHz
+      # };
     };
   };
 
@@ -68,7 +68,7 @@ in {
 
       # Force disable display power savings
       # https://wiki.archlinux.org/title/Framework_Laptop_13#(AMD)_Washed-out_colors_when_using_power-profiles-daemon_in_power-saver_or_balanced_mode
-      "amdgpu.abmlevel=0"
+      #// "amdgpu.abmlevel=0"
 
       # Disable AMD scaling driver
       # https://wiki.archlinux.org/title/CPU_frequency_scaling#amd_pstate
diff --git a/options/custom/services/power-profiles-daemon.nix b/options/custom/services/power-profiles-daemon.nix
index a827b06..1d6a870 100644
--- a/options/custom/services/power-profiles-daemon.nix
+++ b/options/custom/services/power-profiles-daemon.nix
@@ -12,6 +12,9 @@ in {
     # https://gitlab.freedesktop.org/upower/power-profiles-daemon
     #!! Usage is imperative
     #?? powerprofilesctl set <performance|balanced|power-saver>
-    services.power-profiles-daemon.enable = true;
+    services = {
+      power-profiles-daemon.enable = true;
+      tlp.enable = false; # Conflicts with PPD
+    };
   };
 }
diff --git a/profiles/laptop/default.nix b/profiles/laptop/default.nix
index 50d47a9..87a8764 100644
--- a/profiles/laptop/default.nix
+++ b/profiles/laptop/default.nix
@@ -2,7 +2,11 @@
   custom = {
     full = true;
     profile = "desktop"; # Inherit desktop
-    services.auto-cpufreq.enable = true;
+
+    services = {
+      #// auto-cpufreq.enable = true;
+      power-profiles-daemon.enable = true;
+    };
   };
 
   #!! Rebuild offline - drastically increases initial download and resulting closure size