From 75f6986ae1e5145f85d87e4de4ba752b5c358068 Mon Sep 17 00:00:00 2001
From: Toast <39011842+toast003@users.noreply.github.com>
Date: Sun, 16 Nov 2025 04:54:50 +0100
Subject: [PATCH] nixos/handheld-daemon: update module to reflect package
 changes

---
 .../services/hardware/handheld-daemon.nix     | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/hardware/handheld-daemon.nix b/nixos/modules/services/hardware/handheld-daemon.nix
index 9a599c4009da..35c5840ca300 100644
--- a/nixos/modules/services/hardware/handheld-daemon.nix
+++ b/nixos/modules/services/hardware/handheld-daemon.nix
@@ -7,12 +7,16 @@
 with lib;
 let
   cfg = config.services.handheld-daemon;
-  hhdPackage = cfg.package.override {
-    withAdjustor = cfg.adjustor.enable;
-    adjustor = cfg.adjustor.package;
-  };
 in
 {
+  imports = [
+    (mkRemovedOptionModule [
+      "services"
+      "handheld-daemon"
+      "adjustor"
+      "package"
+    ] "Adjustor is now part of handheld-daemon package, so it can't be overriden")
+  ];
   options.services.handheld-daemon = {
     enable = mkEnableOption "Handheld Daemon";
     package = mkPackageOption pkgs "handheld-daemon" { };
@@ -24,7 +28,6 @@ in
 
     adjustor = {
       enable = mkEnableOption "Handheld Daemon TDP control plugin";
-      package = mkPackageOption pkgs "adjustor" { };
       loadAcpiCallModule = mkOption {
         type = types.bool;
         description = ''
@@ -46,7 +49,7 @@ in
     services.handheld-daemon.ui.enable = mkDefault true;
     services.handheld-daemon.adjustor.loadAcpiCallModule = mkDefault cfg.adjustor.enable;
     environment.systemPackages = [
-      hhdPackage
+      cfg.package
     ]
     ++ lib.optional cfg.ui.enable cfg.ui.package;
     services.udev.packages = [ cfg.package ];
@@ -64,13 +67,17 @@ in
 
       restartIfChanged = true;
 
+      environment = {
+        HHD_ADJ_DISABLE = mkIf (!cfg.adjustor.enable) "1";
+      };
+
       path = mkIf cfg.ui.enable [
         cfg.ui.package
         pkgs.lsof
       ];
 
       serviceConfig = {
-        ExecStart = "${lib.getExe hhdPackage} --user ${cfg.user}";
+        ExecStart = "${lib.getExe cfg.package} --user ${cfg.user}";
         Nice = "-12";
         Restart = "on-failure";
         RestartSec = "10";