diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2024-05-07 22:18:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-07 22:18:31 +0200 |
commit | dc79d5b1b32bd4f06ec4a6001f3f21c35a6b270f (patch) | |
tree | 942b3ed79aefa44b5ae2ebc826db0bd283d23970 /nixos | |
parent | 5f27694cd5810931a7697349874b0477db165d8e (diff) | |
parent | b2fd3016038c82a3ac8c9c938ba82301b70fb6d2 (diff) |
Merge pull request #308904 from SuperSandro2000/273761-follow-up
nixos/openrazer: properly rename mouseBatteryNotifier option
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/hardware/openrazer.nix | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/nixos/modules/hardware/openrazer.nix b/nixos/modules/hardware/openrazer.nix index 5ba6abfdb3d7e..6f61254a60c1f 100644 --- a/nixos/modules/hardware/openrazer.nix +++ b/nixos/modules/hardware/openrazer.nix @@ -19,7 +19,7 @@ let [Startup] sync_effects_enabled = ${toPyBoolStr cfg.syncEffectsEnabled} devices_off_on_screensaver = ${toPyBoolStr cfg.devicesOffOnScreensaver} - battery_notifier = ${toPyBoolStr (cfg.mouseBatteryNotifier || cfg.batteryNotifier.enable)} + battery_notifier = ${toPyBoolStr cfg.batteryNotifier.enable} battery_notifier_freq = ${builtins.toString cfg.batteryNotifier.frequency} battery_notifier_percent = ${builtins.toString cfg.batteryNotifier.percentage} @@ -80,14 +80,6 @@ in ''; }; - mouseBatteryNotifier = mkOption { - type = types.bool; - default = true; - description = '' - Mouse battery notifier. - ''; - }; - batteryNotifier = mkOption { description = '' Settings for device battery notifications. @@ -143,14 +135,11 @@ in }; }; - config = mkIf cfg.enable { - warnings = flatten [ - (optional cfg.mouseBatteryNotifier '' - The option openrazer.mouseBatteryNotifier is deprecated. - Please use openrazer.batteryNotifier instead to enable and configure battery notifications. - '') - ]; + imports = [ + (mkRenamedOptionModule [ "hardware" "openrazer" "mouseBatteryNotifier" ] [ "hardware" "openrazer" "batteryNotifier" "enable" ]) + ]; + config = mkIf cfg.enable { boot.extraModulePackages = [ kernelPackages.openrazer ]; boot.kernelModules = drivers; |