refactor(sway): reorganize config

1 files changed, 23 insertions, 38 deletions

diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index 2f44069..2057932 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -1,5 +1,3 @@
-### Variables
-
 set $mod Mod4
 set $menu bemenu
 
@@ -33,7 +31,11 @@ client.urgent           $base08 $base08 $base00 $base08 $base08
 client.placeholder      $base00 $base00 $base05 $base00 $base00
 client.background       $base07
 
-output * bg ~/.local/share/swaybg/gruvbox_sway.png fill
+font "Fira Code Nerd Font" Normal 12
+focus_on_window_activation focus
+default_border pixel
+hide_edge_borders smart
+
 for_window [shell=".*"] inhibit_idle fullscreen
 for_window [app_id="pavucontrol" title="^Volume Control$"] border none, floating enable
 for_window [app_id="" title="^Streamlink Twitch GUI$"] border none, floating enable
@@ -43,6 +45,8 @@ for_window [app_id="firefox" title="Firefox — Sharing Indicator"] kill
 # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1652820#c51
 exec_always swaymsg seat * hide_cursor 8000
 
+output * bg ~/.local/share/swaybg/gruvbox_sway.png fill
+
 input type:pointer {
     accel_profile flat
 }
@@ -56,51 +60,46 @@ input type:keyboard {
     xkb_options "caps:escape"
 }
 
-bindsym $mod+Escape exec powermenu list | $menu | powermenu
+bindsym $mod+q kill
+bindsym $mod+Shift+c reload
 bindsym $mod+Shift+Escape exec swaynag -t warning -m 'Exit sway?' -B 'Yes' 'swaymsg exit'
-bindsym $mod+space exec j4-dmenu-desktop --dmenu='$menu' --term="$TERMINAL"
+bindsym $mod+ctrl+q exec loginctl lock-session
+bindsym $mod+Escape exec powermenu list | $menu | powermenu
+bindsym $mod+space exec j4-dmenu-desktop --no-generic --dmenu='$menu' --term="$TERMINAL"
+# rg --pcre2 '(?<=^Name=).*' /usr/share/applications --only-matching --max-count=1 --no-filename |
+# bemenu | xargs -I_ rg "^Name=_" /usr/share/applications --max-count=1 --files-with-matches |
+# xargs basename 2>/dev/null
 bindsym $mod+shift+space exec bemenu-run
+bindsym $mod+v exec clipman pick --tool=bemenu
+bindsym $mod+p exec passmenu
+bindsym $mod+Shift+p exec passmenu --type
+bindsym $mod+y exec yubikey-oath-dmenu --notify --clipboard
+bindsym $mod+Shift+y exec yubikey-oath-dmenu --notify --type
 bindsym $mod+return exec $TERMINAL
 bindsym $mod+w exec $BROWSER
 bindsym Print exec grim "screenshot-$(date +'%F-%H-%M-%S').png"
 bindsym $mod+Print exec slurp | grim -g - "screenshot-$(date +'%F-%H-%M-%S').png"
 
-bindsym $mod+ctrl+q exec loginctl lock-session
-
 bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
 bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
 bindsym --locked XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
 bindsym --locked XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
-bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%-
-bindsym --locked XF86MonBrightnessUp exec brightnessctl set +5%
 bindsym --locked XF86AudioPlay exec playerctl play-pause
 bindsym --locked XF86AudioNext exec playerctl next
 bindsym --locked XF86AudioPrev exec playerctl previous
-
-bindsym $mod+q kill
-
-bindsym $mod+Shift+c reload
+bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%-
+bindsym --locked XF86MonBrightnessUp exec brightnessctl set +5%
 
 bindsym $mod+$left focus left
 bindsym $mod+$down focus down
 bindsym $mod+$up focus up
 bindsym $mod+$right focus right
 
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
 bindsym $mod+Shift+$left move left
 bindsym $mod+Shift+$down move down
 bindsym $mod+Shift+$up move up
 bindsym $mod+Shift+$right move right
 
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
 bindsym $mod+1 workspace number 1
 bindsym $mod+2 workspace number 2
 bindsym $mod+3 workspace number 3
@@ -124,12 +123,10 @@ bindsym $mod+Shift+8 move container to workspace number 8; workspace number 8
 bindsym $mod+Shift+9 move container to workspace number 9; workspace number 9
 bindsym $mod+Shift+0 move container to workspace number 10
 
+bindsym $mod+f fullscreen
 bindsym $mod+Shift+backslash split toggle
 bindsym $mod+minus splith
 bindsym $mod+backslash splitv
-
-bindsym $mod+f fullscreen
-
 bindsym $mod+r mode 'resize'
 mode 'resize' {
     bindsym $left resize shrink width 10px
@@ -137,19 +134,9 @@ mode 'resize' {
     bindsym $up resize shrink height 10px
     bindsym $right resize grow width 10px
 
-    bindsym Left resize shrink width 10px
-    bindsym Down resize grow height 10px
-    bindsym Up resize shrink height 10px
-    bindsym Right resize grow width 10px
-
     bindsym Escape mode 'default'
 }
 
-bindsym $mod+v exec clipman pick --tool=bemenu
-bindsym $mod+p exec passmenu
-bindsym $mod+y exec yubikey-oath-dmenu --notify --clipboard
-bindsym $mod+Shift+y exec yubikey-oath-dmenu --notify --type
-
 bar {
     status_command i3status-rs
     font "Fira Code Nerd Font" Normal 12
@@ -167,8 +154,6 @@ bar {
     }
 }
 
-default_border pixel
-hide_edge_borders smart
 
 include ~/.config/sway/config.d/*
 include /etc/sway/config.d/*