diff --git a/hosts/biolimo/.config/sway/config.d/custom-keybindings.conf b/hosts/biolimo/.config/sway/config.d/custom-keybindings.conf deleted file mode 100644 index 4aa62cb..0000000 --- a/hosts/biolimo/.config/sway/config.d/custom-keybindings.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Touchpad controls -#bindsym XF86TouchpadToggle exec $HOME/Workspace/ben/toggletouchpad.sh # toggle touchpad - -# Screen brightness controls -bindsym XF86MonBrightnessUp exec "brightnessctl -d intel_backlight set +10%; notify-send $(brightnessctl -d intel_backlight i | awk '/Current/ {print $4}')" -bindsym XF86MonBrightnessDown exec "brightnessctl -d intel_backlight set 10%-; notify-send $(brightnessctl -d intel_backlight i | awk '/Current/ { print $4}')" - -# Keyboard backlight brightness controls -bindsym XF86KbdBrightnessDown exec "brightnessctl -d smc::kbd_backlight set 10%-; notify-send $(brightnessctl -d smc::kbd_backlight i | awk '/Current/ { print $4}')" -bindsym XF86KbdBrightnessUp exec "brightnessctl -d smc::kbd_backlight set +10%; notify-send $(brightnessctl -d smc::kbd_backlight i | awk '/Current/ { print $4}')" diff --git a/hosts/biolimo/configuration.nix b/hosts/biolimo/configuration.nix index 8f72e33..31c07fd 100644 --- a/hosts/biolimo/configuration.nix +++ b/hosts/biolimo/configuration.nix @@ -25,7 +25,6 @@ in { "sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf; "sway/config.d/10-autostart.conf".source = ./.config/sway/config.d/autostart.conf; "sway/config.d/10-input-defaults.conf".source = ./.config/sway/config.d/input-defaults.conf; - "sway/config.d/10-custom-keybindings.conf".source = ./.config/sway/config.d/custom-keybindings.conf; }; }; diff --git a/hosts/stroopwafel/.config/sway/config.d/custom-keybindings.conf b/hosts/stroopwafel/.config/sway/config.d/custom-keybindings.conf deleted file mode 100644 index e94d5c1..0000000 --- a/hosts/stroopwafel/.config/sway/config.d/custom-keybindings.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Touchpad controls -#bindsym XF86TouchpadToggle exec $HOME/Workspace/ben/toggletouchpad.sh # toggle touchpad - -# Screen brightness controls -bindsym XF86MonBrightnessUp exec "brightnessctl -d amdgpu_bl0 set +10%; notify-send $(brightnessctl -d amdgpu_bl0 i | awk '/Current/ {print $4}')" -bindsym XF86MonBrightnessDown exec "brightnessctl -d amdgpu_bl0 set 10%-; notify-send $(brightnessctl -d amdgpu_bl0 i | awk '/Current/ { print $4}')" - -# Keyboard backlight brightness controls -bindsym XF86KbdBrightnessDown exec "brightnessctl -d smc::kbd_backlight set 10%-; notify-send $(brightnessctl -d smc::kbd_backlight i | awk '/Current/ { print $4}')" -bindsym XF86KbdBrightnessUp exec "brightnessctl -d smc::kbd_backlight set +10%; notify-send $(brightnessctl -d smc::kbd_backlight i | awk '/Current/ { print $4}')" diff --git a/hosts/stroopwafel/configuration.nix b/hosts/stroopwafel/configuration.nix index 314dfc2..a9a0623 100644 --- a/hosts/stroopwafel/configuration.nix +++ b/hosts/stroopwafel/configuration.nix @@ -32,7 +32,6 @@ in { "sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf; "sway/config.d/10-autostart.conf".source = ./.config/sway/config.d/autostart.conf; "sway/config.d/10-input-defaults.conf".source = ./.config/sway/config.d/input-defaults.conf; - "sway/config.d/10-custom-keybindings.conf".source = ./.config/sway/config.d/custom-keybindings.conf; }; }; diff --git a/modules/graphical/sway/config/config.d/custom-keybindings.conf b/modules/graphical/sway/config/config.d/custom-keybindings.conf index e6391d8..4ca72c6 100644 --- a/modules/graphical/sway/config/config.d/custom-keybindings.conf +++ b/modules/graphical/sway/config/config.d/custom-keybindings.conf @@ -15,11 +15,19 @@ bindsym $mod+Space exec $menu # Pulse Audio controls bindsym $mod+Ctrl+m exec pavucontrol -bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 && notify-send 'Vol. up' #increase sound volume -bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 && notify-send 'Vol. down' #decrease sound volume -bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle && notify-send 'Mute sound' # mute sound +bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 #increase sound volume +bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 #decrease sound volume +bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle # mute sound # Media player controls bindsym XF86AudioPlay exec "playerctl play-pause; notify-send 'Play/Pause'" bindsym XF86AudioNext exec "playerctl next; notify-send 'Next'" bindsym XF86AudioPrev exec "playerctl previous; notify-send 'Prev.'" + +# Screen brightness controls +bindsym XF86MonBrightnessUp exec "brightnessctl set +10%" +bindsym XF86MonBrightnessDown exec "brightnessctl set 10%-" + +# Keyboard backlight brightness controls +bindsym XF86KbdBrightnessDown exec "brightnessctl -d smc::kbd_backlight set 33%-" +bindsym XF86KbdBrightnessUp exec "brightnessctl -d smc::kbd_backlight set +33%"