diff --git a/modules/home/wms/hyprland/hotkeys/default.nix b/modules/home/wms/hyprland/hotkeys/default.nix index 12cd5aa..089808f 100644 --- a/modules/home/wms/hyprland/hotkeys/default.nix +++ b/modules/home/wms/hyprland/hotkeys/default.nix @@ -64,12 +64,10 @@ # Screenshots # Display and keyboard brightness - "${primeMod}, equal, exec, light -A 5" - "${primeMod}, minus, exec, light -U 5" - "${primeMod} Shift, equal, exec, light -A 1" - "${primeMod} Shift, minus, exec, light -U 1" - ",XF86KbdBrightnessUp, exec, light -s sysfs/leds/smc::kbd_backlight -A 5" - ",XF86KbdBrightnessDown, exec, light -s sysfs/leds/smc::kbd_backlight -U 5" + "${primeMod}, equal, exec, brightnessctl s +5%" + "${primeMod}, minus, exec, brightnessctl s 5%-" + "${primeMod} Shift, equal, exec, brightnessctl s +1%" + "${primeMod} Shift, minus, exec, brightnessctl s 1%-" ## Window manager "${primeMod}, q, killactive," diff --git a/modules/home/wms/niri/hotkeys/default.nix b/modules/home/wms/niri/hotkeys/default.nix index be2af53..9f3b605 100644 --- a/modules/home/wms/niri/hotkeys/default.nix +++ b/modules/home/wms/niri/hotkeys/default.nix @@ -61,12 +61,10 @@ ${secMod}+Ctrl+F { screenshot-window; } // Display and keyboard brightness - ${primeMod}+equal { spawn "sh" "-c" "light -A 5"; } - ${primeMod}+minus { spawn "sh" "-c" "light -U 5"; } - ${primeMod}+Shift+equal { spawn "sh" "-c" "light -A 1"; } - ${primeMod}+Shift+minus { spawn "sh" "-c" "light -U 1"; } - XF86KbdBrightnessUp { spawn "sh" "-c" "light -s sysfs/leds/smc::kbd_backlight -A 5"; } - XF86KbdBrightnessDown { spawn "sh" "-c" "light -s sysfs/leds/smc::kbd_backlight -U 5"; } + ${primeMod}+equal { spawn "sh" "-c" "brightnessctl s +5%"; } + ${primeMod}+minus { spawn "sh" "-c" "brightnessctl s 5%-"; } + ${primeMod}+Shift+equal { spawn "sh" "-c" "brightnessctl s +1%"; } + ${primeMod}+Shift+minus { spawn "sh" "-c" "brightnessctl s 1%-"; } //// Window manager ${primeMod}+q { close-window; } diff --git a/modules/home/wms/programs/default.nix b/modules/home/wms/programs/default.nix index 9fcde78..2e1682e 100644 --- a/modules/home/wms/programs/default.nix +++ b/modules/home/wms/programs/default.nix @@ -11,6 +11,7 @@ ]; home.packages = with pkgs; [ + brightnessctl clipman libnotify wl-clipboard diff --git a/modules/home/wms/sway/hotkeys/default.nix b/modules/home/wms/sway/hotkeys/default.nix index c9f89d4..d2ab84e 100644 --- a/modules/home/wms/sway/hotkeys/default.nix +++ b/modules/home/wms/sway/hotkeys/default.nix @@ -64,12 +64,10 @@ "${secMod}+Shift+f" = ''exec shot-sway --screen''; # Display and keyboard brightness - "${primeMod}+equal" = ''exec light -A 5''; - "${primeMod}+minus" = ''exec light -U 5''; - "${primeMod}+Shift+equal" = ''exec light -A 1''; - "${primeMod}+Shift+minus" = ''exec light -U 1''; - "XF86KbdBrightnessUp" = ''exec light -s sysfs/leds/smc::kbd_backlight -A 5''; - "XF86KbdBrightnessDown" = ''exec light -s sysfs/leds/smc::kbd_backlight -U 5''; + "${primeMod}+equal" = ''exec brightnessctl s +5%''; + "${primeMod}+minus" = ''exec brightnessctl s 5%-''; + "${primeMod}+Shift+equal" = ''exec brightnessctl s +1%''; + "${primeMod}+Shift+minus" = ''exec brightnessctl s 1%-''; ## Window manager "${primeMod}+q" = ''kill''; diff --git a/modules/system/programs/backlights/default.nix b/modules/system/programs/backlights/default.nix deleted file mode 100644 index 7fffaf9..0000000 --- a/modules/system/programs/backlights/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, config, ... }: -{ - config = lib.mkIf config.system.desktop.enable { - programs = { - light.enable = true; - kbdlight.enable = true; - }; - }; -} diff --git a/modules/system/programs/default.nix b/modules/system/programs/default.nix index 60f0cd5..d20ad63 100644 --- a/modules/system/programs/default.nix +++ b/modules/system/programs/default.nix @@ -1,7 +1,6 @@ { ... }: { imports = [ - ./backlights ./dconf ./desktops ./gaming