diff --git a/src/home/wm/common-i3.nix b/src/home/wm/common-i3.nix index 8a03a84..b16c29d 100644 --- a/src/home/wm/common-i3.nix +++ b/src/home/wm/common-i3.nix @@ -4,7 +4,6 @@ lib, menu, terminal, - light ? lib.getExe' pkgs.brightnessctl "brightnessctl", playerctl ? lib.getExe' pkgs.playerctl "playerctl", sound ? "pactl", alt ? "Mod1", @@ -119,7 +118,7 @@ let )); in { - inherit modifier terminal; + inherit modifier terminal playerctl; helpers = { inherit mapDirection mapDirectionDefault mapWorkspacesStr; @@ -162,11 +161,6 @@ in "${modifier}+Shift+k" = "move up"; "${modifier}+Shift+l" = "move right"; - # "XF86MonBrightnessUp" = "exec --no-startup-id ${light} -A 10%"; - # "XF86MonBrightnessDown" = "exec --no-startup-id ${light} -U 10%"; - "XF86MonBrightnessUp" = "exec --no-startup-id ${light} s +10%"; - "XF86MonBrightnessDown" = "exec --no-startup-id ${light} s 10%-"; - "XF86AudioPlay" = "exec --no-startup-id ${playerctl} play-pause"; "XF86AudioPause" = "exec --no-startup-id ${playerctl} play-pause"; "XF86AudioNext" = "exec --no-startup-id ${playerctl} next"; diff --git a/src/home/wm/i3.nix b/src/home/wm/i3.nix index 5001e65..474a193 100644 --- a/src/home/wm/i3.nix +++ b/src/home/wm/i3.nix @@ -5,6 +5,7 @@ ... }: let + light = lib.getExe' pkgs.brightnessctl "brightnessctl"; pactl = lib.getExe' pkgs.pulseaudio "pactl"; maim = lib.getExe' pkgs.maim "maim"; clipboard-copy = lib.getExe' pkgs.xclip "xclip"; @@ -45,6 +46,8 @@ in "XF86AudioLowerVolume" = "exec --no-startup-id ${pactl} set-sink-volume @DEFAULT_SINK@ -1%"; "XF86AudioMute" = "exec --no-startup-id ${pactl} set-sink-mute @DEFAULT_SINK@ toggle"; "XF86AudioMicMute" = "exec --no-startup-id ${pactl} set-source-mute @DEFAULT_SOURCE@ toggle"; + "XF86MonBrightnessUp" = "exec --no-startup-id '${light} s +10%'"; + "XF86MonBrightnessDown" = "exec --no-startup-id '${light} s 10%-'"; "${commonOptions.modifier}+o" = "exec --no-startup-id ${maim} -s ~/pictures/screenshots/$(date +%Y-%m-%d-%H-%M-%S).png"; "${commonOptions.modifier}+Shift+o" = "exec --no-startup-id ${maim} -s | ${clipboard-copy} -selection clipboard -t image/png"; "PRINT" = "exec --no-startup-id ${maim} -s | ${clipboard-copy} -selection clipboard -t image/png"; diff --git a/src/home/wm/sway.nix b/src/home/wm/sway.nix index ccc69cf..d106c1c 100644 --- a/src/home/wm/sway.nix +++ b/src/home/wm/sway.nix @@ -97,6 +97,8 @@ in "XF86AudioLowerVolume" = "exec --no-startup-id '${swayosd} --output-volume=lower'"; "XF86AudioMute" = "exec --no-startup-id '${swayosd} --output-volume=mute-toggle"; "XF86AudioMicMute" = "exec --no-startup-id '${pactl} set-source-mute @DEFAULT_SOURCE@ toggle'"; + "XF86MonBrightnessUp" = "exec --no-startup-id '${swayosd} --brightness=raise'"; + "XF86MonBrightnessDown" = "exec --no-startup-id '${swayosd} --brightness=lower'"; "${commonOptions.modifier}+o" = "exec --no-startup-id ${grim} -g \"\$(${slurp})\" ~/pictures/screenshots/$(date +%Y-%m-%d-%H-%M-%S).png"; "${commonOptions.modifier}+Shift+o" = "exec --no-startup-id ${grim} -g \"\$(${slurp})\" -t png - | ${clipboard-copy}"; "PRINT" = "exec --no-startup-id ${grim} -g \"\$(${slurp})\" -t png - | ${clipboard-copy}";