sway: various tweaks to binds.conf

* firefox
* grimshot
* swap mode
* introduce playcerctld
* cleanup resize mode

2 files changed, 29 insertions, 25 deletions

diff --git a/.config/sway/binds.conf b/.config/sway/binds.conf
index 4cf286b..e2aeb9b 100644
--- a/.config/sway/binds.conf
+++ b/.config/sway/binds.conf
@@ -1,10 +1,11 @@
-# vim: ft=i3
+# vim: ft=i3config
 
 # Basics {{{
 bindsym $mod+Return exec swx -a $term
 bindsym $mod+Shift+Return exec $floating_term
 bindsym $mod+b exec pkill -USR1 waybar
-bindsym $mod+w exec firefox
+bindsym $mod+w exec $firefox
+bindsym $mod+Shift+w exec $firefox --private-window
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -36,7 +37,8 @@ bindsym $mod+Shift+backspace exec lock
 
 bindsym $mod+Shift+s mode "screengrab"
 mode "screengrab" {
-bindsym f exec grimshot save screen; mode "default"
+bindsym a exec grimshot save screen; mode "default"
+bindsym o exec grimshot save output; mode "default"
 bindsym s exec grimshot save area; mode "default"
 bindsym c exec grimshot copy area; mode "default"
 bindsym p exec colorpick; mode "default"
@@ -116,6 +118,18 @@ bindsym $mod+Backslash splith
 # bindsym $mod+Bracketright splith
 bindsym $mod+g layout toggle split
 
+mode "swap" {
+    bindsym $left move left ; focus right ; mode "default"
+    bindsym $down move down ; focus up ; mode "default"
+    bindsym $up move up ; focus down ; mode "default"
+    bindsym $right move right ; focus left ; mode "default"
+
+    # return to default mode
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+bindsym $mod+i mode "swap"
+
 # Make the current focus fullscreen
 bindsym $mod+f fullscreen
 bindsym $mod+Shift+f fullscreen global
@@ -166,23 +180,14 @@ bindsym $mod+backspace scratchpad show
 
 # Resizing containers {{{
 mode "resize" {
-    # 1x
-    set $resizeRate1x 50
-    bindsym $left resize shrink width $resizeRate1x px
-    bindsym $down resize grow height $resizeRate1x px
-    bindsym $up resize shrink height $resizeRate1x px
-    bindsym $right resize grow width $resizeRate1x px
-    bindsym Shift+$down resize shrink width $resizeRate1x px ; resize shrink height $resizeRate1x px
-    bindsym Shift+$up resize grow width $resizeRate1x px ; resize grow height $resizeRate1x px
-
-    # 2x
-    set $resizeRate2x 100
-    bindsym Left resize shrink width $resizeRate1x px
-    bindsym Down resize grow height $resizeRate1x px
-    bindsym Up resize shrink height $resizeRate1x px
-    bindsym Right resize grow width $resizeRate1x px
-    bindsym Shift+Down resize shrink width $resizeRate2x px ; resize shrink height $resizeRate2x px
-    bindsym Shift+Up resize grow width $resizeRate2x px ; resize grow height $resizeRate2x px
+    set $rate 25
+    bindsym $left resize shrink width $rate
+    bindsym $down resize grow height $rate
+    bindsym $up resize shrink height $rate
+    bindsym $right resize grow width $rate
+
+    bindsym Shift+$down resize shrink width $rate; resize shrink height $rate
+    bindsym Shift+$up resize grow width $rate; resize grow height $rate
 
     # return to default mode
     bindsym Return mode "default"
@@ -222,9 +227,7 @@ bindsym XF86MonBrightnessUp exec light -A 5
 bindsym XF86MonBrightnessDown exec light -U 5
 
 # Media player controls
-bindsym XF86AudioPlay exec playerctl play-pause
-# bindsym XF86AudioForward exec playerctl next
-# bindsym XF86AudioRewind exec playerctl previous
-bindsym XF86AudioNext exec playerctl next
-bindsym XF86AudioPrev exec playerctl previous
+bindsym XF86AudioPlay exec playerctl -p playerctld play-pause
+bindsym XF86AudioNext exec playerctl -p playerctld next
+bindsym XF86AudioPrev exec playerctl -p playerctld previous
 # }}}
diff --git a/.config/sway/config b/.config/sway/config
index 625f642..9b8abce 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -45,6 +45,7 @@ set $run_menu menu -run
 set $bpix 3
 default_border pixel $bpix
 default_floating_border pixel $bpix
+set $firefox nightly
 
 # workspaces {{{
 set $ws1 1