From 569b23fd8271ec562652295bf67e7378cca6570e Mon Sep 17 00:00:00 2001 From: mexisme Date: Fri, 9 Aug 2024 23:59:14 +1200 Subject: [PATCH] Simplify the diff, by moving the (mkIf ...) for the keyboard.autosuspend.enable option to within the associated services.udev.extraRules attr-set --- asus/zephyrus/ga402x/shared.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/asus/zephyrus/ga402x/shared.nix b/asus/zephyrus/ga402x/shared.nix index 78f5d58..a45c241 100644 --- a/asus/zephyrus/ga402x/shared.nix +++ b/asus/zephyrus/ga402x/shared.nix @@ -29,7 +29,8 @@ in { # enables it for kernel 6.9.x onwards. # # Note: the device name is "ASUS N-KEY Device". - keyboard.autosuspend.enable = (mkEnableOption "Enable auto-suspend on the internal USB keyboard (ASUS N-KEY Device) on Zephyrus GA402X" + keyboard.autosuspend.enable = ( + mkEnableOption "Enable auto-suspend on the internal USB keyboard (ASUS N-KEY Device) on Zephyrus GA402X" ) // { default = defaultAutosuspendEnable; }; }; @@ -58,19 +59,14 @@ in { evdev:name:*:dmi:bvn*:bvr*:bd*:svnASUS*:pn*:* KEYBOARD_KEY_ff31007c=f20 ''; - }; - }; - } - - (mkIf (! cfg.keyboard.autosuspend.enable) { - services.udev = { - extraRules = '' + extraRules = mkIf (! cfg.keyboard.autosuspend.enable) '' # Disable auto-suspend for the ASUS N-KEY Device, i.e. USB Keyboard # Otherwise on certain kernel-versions, it will tend to take 1-2 key-presses to wake-up after the device suspends ACTION=="add", SUBSYSTEM=="usb", TEST=="power/autosuspend", ATTR{idVendor}=="0b05", ATTR{idProduct}=="19b6", ATTR{power/autosuspend}="-1" ''; + }; }; - }) + } (mkIf (versionOlder version "23.11") { # See https://asus-linux.org/wiki/nixos/ for info about some problems