Refactor sway keybindings, services & formatting

1 files changed, 27 insertions, 23 deletions

diff --git a/dot-config/sway/config b/dot-config/sway/config
index 6607ccc..9c658e6 100644
--- a/dot-config/sway/config
+++ b/dot-config/sway/config
@@ -17,38 +17,41 @@
 # | mpd            | music server
 # | lavalauncher   | shortcut menu
 
-# Variables
+# Keys
 set $mod Mod4
-
 set $up j
 set $down k
 set $left l
 set $right semicolon
 
+# Applications
 set $term footclient
 set $shell bash -c
 set $lock swaylock
 
+# Sizes
 set $igap 20
 set $ogap 30
 
+# Wallpaper
 set $wallpaper ~/.cache/wallpaper
 set $lockwallpaper ~/.cache/lockwallpaper
 exec [ -f ~/.cache/wallpaper ] || cp /usr/share/backgrounds/sway/*_1920x1080.png ~/.cache/wallpaper
 exec [ -f ~/.cache/lockwallpaper ] || cp ~/.cache/wallpaper ~/.cache/lockwallpaper
 
-# Processes
+# Default settings
 exec brightnessctl set 20%
-exec foot --server >> /var/log/user/foot.log 2>&1
-exec mako >> /var/log/user/mako.log 2>&1
-exec wlsunset -l 51.5 -L -0.1 -t 3000 -T 6000 >> /var/log/user/wlsunset.log 2>&1
-exec mpd
-exec_always sh -c "pkill pipewire; pipewire >> /var/log/user/lavalauncher.log 2>&1"
-exec_always sh -c "pkill pipewire-pulse; pipewire-pulse >> /var/log/user/pipewire-pulse.log 2>&1"
-exec_always sh -c "pkill wireplumber; wireplumber >> /var/log/user/wireplumber.log 2>&1"
-exec_always sh -c "pkill yambar; yambar >> /var/log/user/yambar.log 2>&1"
-exec_always sh -c "pkill lavalauncher; lavalauncher >> /var/log/user/lavalauncher.log 2>&1"
 
+# Services
+exec mpd
+exec foot --server >/var/log/user/foot.log 2>&1
+exec mako >/var/log/user/mako.log 2>&1
+exec wlsunset -l 51.5 -L -0.1 -t 3000 -T 6000 >/var/log/user/wlsunset.log 2>&1
+exec pipewire >/var/log/user/pipewire.log 2>&1
+exec pipewire-pulse >/var/log/user/pipewire-pulse.log 2>&1
+exec wireplumber >/var/log/user/wireplumber.log 2>&1
+exec lavalauncher >/var/log/user/lavalauncher.log 2>&1
+exec_always sh -c "pkill yambar; yambar >/var/log/user/yambar.log 2>&1"
 exec swayidle -w \
      timeout 300 'swaylock' \
      timeout 310 'swaymsg "output * dpms off"' \
@@ -57,7 +60,7 @@ exec swayidle -w \
        resume 'swaymsg "output * dpms on"' \
      before-sleep 'swaylock'
 
-# Input
+# Inputs
 seat * hide_cursor when-typing enable
 
 input "type:touchpad" {
@@ -72,7 +75,7 @@ input "type:keyboard" {
   xkb_options caps:ctrl_modifier
 }
 
-# Output
+# Outputs
 output * bg $wallpaper fill
 output eDP-1 {
   resolution 1920x1080@60Hz
@@ -83,8 +86,8 @@ output eDP-1 {
 gaps inner $igap
 gaps outer $ogap
 
-# Style
-smart_borders on
+# Borders
+# smart_borders on
 default_border pixel 2px
 set $focuscol "#b4befe"
 set $inactcol "#313244"
@@ -92,19 +95,20 @@ client.focused $focuscol $focuscol #000000 $focuscol
 client.unfocused $inactcol $inactcol #000000 $inactcol
 client.focused_inactive $inactcol $inactcol #000000 $inactcol
 
-# Bindings
+# Keybindings
 floating_modifier $mod normal
 bindsym $mod+Space exec bemenu-run --prompt='Run: '
-bindsym Menu exec bemenu-run --prompt='Run: '
+# bindsym Menu exec bemenu-run --prompt='Run: '
 bindsym $mod+Return exec $term
 bindsym $mod+q kill
 bindsym $mod+r reload
-bindsym $mod+e exec swaynag -t warning -m 'Do you want to logout of Sway?' -B 'Yes, exit sway' 'swaymsg exit'
-bindsym $mod+Shift+e exit
+bindsym $mod+e exec thunar
+bindsym $mod+Shift+e exec swaynag -t warning -m 'Exit Sway?' -B 'Yes, exit sway' 'swaymsg exit'
+bindsym Ctrl+Alt+Delete exit
 bindsym $mod+n exec makoctl dismiss
 bindsym $mod+i exec $term vim
 bindsym $mod+w exec swayimg -g ~/images/wallpaper
-bindsym $mod+p exec mpc toggle
+bindsym $mod+p exec mpd-menu
 bindsym $mod+bracketright exec mpc next
 bindsym $mod+bracketleft exec mpc prev
 bindsym $mod+o exec mpc stop
@@ -113,8 +117,8 @@ bindswitch --reload --locked lid:off exec $lock
 bindsym XF86Sleep exec $lock
 bindsym XF86PowerOff exec sudo halt
 
-bindsym --locked XF86MonBrightnessUp exec brightnessctl set +10% && brightnessctl --save
-bindsym --locked XF86MonBrightnessDown exec brightnessctl --min-value=10 set 10-% && brightnessctl --save
+bindsym --locked XF86MonBrightnessUp exec brightnessctl -s set +10%
+bindsym --locked XF86MonBrightnessDown exec brightnessctl -s set 10-%
 
 bindsym XF86AudioMute exec wpctl set-mute @DEFAULT_SINK@ toggle
 bindsym XF86AudioRaiseVolume exec wpctl set-volume --limit 1.0 @DEFAULT_SINK@ 5%+