Move battery options to non-asus specific folder

NixOS · Jun 4, 2024 · e8f916c · e8f916c
1 parent 753176b
commit e8f916c
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 7 deletions.
diff --git a/asus/ally/rc71l/default.nix b/asus/ally/rc71l/default.nix
@@ -6,7 +6,7 @@
     ../../../common/gpu/amd
     ../../../common/pc/laptop
     ../../../common/pc/laptop/ssd
-    ../../battery.nix
+    ../../../common/pc/laptop/battery.nix
   ];
 
   # 6.5 adds many fixes and improvements for the Ally

diff --git a/asus/rog-strix/g513im/default.nix b/asus/rog-strix/g513im/default.nix
@@ -6,7 +6,7 @@
 		../../../common/gpu/nvidia/prime.nix
 		../../../common/pc/laptop
 		../../../common/pc/ssd
-		../../battery.nix
+		../../../common/pc/laptop/battery.nix
 	];
 
 	hardware.nvidia.prime = {

diff --git a/asus/rog-strix/g733qs/default.nix b/asus/rog-strix/g733qs/default.nix
@@ -5,7 +5,7 @@
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/pc/laptop
     ../../../common/pc/ssd
-    ../../battery.nix
+    ../../../common/pc/laptop/battery.nix
   ];
 
   # fixing audio by overriding pins as suggested in

diff --git a/asus/battery.nix → common/pc/laptop/battery.nix b/asus/battery.nix → common/pc/laptop/battery.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   p = pkgs.writeScriptBin "charge-upto" ''
     echo ''${0:-100} > /sys/class/power_supply/BAT?/charge_control_end_threshold
@@ -7,7 +12,7 @@ let
 in
 
 {
-  options.hardware.asus.battery = {
+  options.hardware.battery = {
     chargeUpto = lib.mkOption {
       description = "Maximum level of charge for your battery, as a percentage.";
       default = 100;
@@ -19,11 +24,33 @@ in
       type = lib.types.bool;
     };
   };
+  imports = (
+    map
+      (
+        option:
+        lib.mkRemovedOptionModule [
+          "hardware"
+          "asus"
+          "battery"
+          option
+        ] "The hardware.asus.battery.* options were removed in favor of `hardware.battery.*`."
+      )
+      [
+        "chargeUpto"
+        "enableChargeUptoScript"
+      ]
+  );
   config = {
     environment.systemPackages = lib.mkIf cfg.enableChargeUptoScript [ p ];
     systemd.services.battery-charge-threshold = {
-      wantedBy = [ "local-fs.target" "suspend.target" ];
-      after = [ "local-fs.target" "suspend.target" ];
+      wantedBy = [
+        "local-fs.target"
+        "suspend.target"
+      ];
+      after = [
+        "local-fs.target"
+        "suspend.target"
+      ];
       description = "Set the battery charge threshold to ${toString cfg.chargeUpto}%";
       startLimitBurst = 5;
       startLimitIntervalSec = 1;