Merge branch 'reverse-layout' into i3-remap-experimental

i3/config

@@ -12,10 +12,10 @@ set $border_normal border normal 3
 set $i3inputfont \\"-*-*-*-*-*-*-24-*-*-*-*-*-*-*\\"  
 
 # Theme options (comment/uncomment theme group)
-## Theme 1 "paradise pink"
-#set $accent-bg #d64161
-#set $accent-txt #F9FAF9
-#set $indicator #109648
+# Theme 1 "paradise pink"
+set $accent-bg #d64161
+set $accent-txt #F9FAF9
+set $indicator #109648
 
 # Theme 2 "sheen green"
 #set $accent-bg #8ae234
@@ -43,9 +43,9 @@ set $i3inputfont \\"-*-*-*-*-*-*-24-*-*-*-*-*-*-*\\"
 #set $indicator #109648
 
 # Theme 6 "yellow green"
-set $accent-bg #8ac926
-set $accent-txt #363636
-set $indicator #109648
+#set $accent-bg #8ac926
+#set $accent-txt #363636
+#set $indicator #109648
 
 # set other colors
 set $inactive-bg #3A4141
@@ -211,6 +211,19 @@ bindsym $mod+Shift+a move left 100px
 bindsym $mod+Shift+s move down 100px
 bindsym $mod+Shift+d move right 100px
 
+# move the currently focused window to the scratchpad
+#bindsym $mod+Shift+Tab move scratchpad
+
+# Show the next scratchpad window or hide the focused scratchpad window.
+# If there are multiple scratchpad windows, this command cycles through them.
+#bindsym $mod+minus scratchpad show
+
+# move all windows on workspace cache to mark STK
+bindsym $mod+grave move container to workspace $wsg
+bindsym $mod+Shift+grave [workspace="`"] move container to workspace current
+bindsym $mod+Shift+Tab [workspace="`"] move container to mark STK
+bindsym $mod+$mod_next+Tab focus parent, mark --add --toggle STK, focus child
+
 # mark and focus
 bindsym $mod+Ctrl+1 mark --add --toggle 1
 bindsym $mod+Ctrl+2 mark --add --toggle 2
@@ -221,7 +234,7 @@ bindsym $mod+Ctrl+6 mark --add --toggle 6
 bindsym $mod+Ctrl+7 mark --add --toggle 7
 bindsym $mod+Ctrl+8 mark --add --toggle 8
 bindsym $mod+Ctrl+9 mark --add --toggle 9
-bindsym $mod+g exec "i3-input -f $i3inputfont -l 1 -P \\"Goto Mark: \\" -F '[con_mark=\\"%s\\"] focus'"
+bindsym $mod+g exec "i3-input -f $i3inputfont -l 1 -P \\"Goto Mark: \\" -F '[con_mark=\\"%s\\"] focus'; i3-msg focus child"
 
 # workspace back and forth (with/without active container)
 workspace_auto_back_and_forth yes
@@ -257,7 +270,7 @@ bindsym $mod+Ctrl+v sticky toggle;exec notify-send 'sticky windows toggled'
 
 # focus last window
 # requires (https://crates.io/crates/i3-focus-last)
-bindsym $mod+Tab exec i3-focus-last
+#bindsym $mod+Tab exec i3-focus-last
 
 # window transparency adjustment (and alias to restart picom)
 bindsym $mod+$mod_next+z exec transset-df -a --min 0.20 --dec 0.20
@@ -279,13 +292,6 @@ bindsym $mod+ctrl+Shift+i exec xprop -id $(xdotool getactivewindow) -remove INVE
 bindsym $mod+q focus parent
 bindsym $mod+e focus child
 
-# move the currently focused window to the scratchpad
-bindsym $mod+Shift+Tab move scratchpad
-
-# Show the next scratchpad window or hide the focused scratchpad window.
-# If there are multiple scratchpad windows, this command cycles through them.
-bindsym $mod+minus scratchpad show
-
 # navigate workspaces next / previous
 bindsym $mod+Ctrl+h workspace prev
 bindsym $mod+Ctrl+l workspace next
@@ -316,7 +322,6 @@ bindsym $mod+8 workspace $ws8
 bindsym $mod+Ctrl+grave workspace $wsg
 
 # Move focused container to workspace
-bindsym $mod+grave move container to workspace $wsg
 bindsym $mod+Shift+1 move container to workspace $ws1
 bindsym $mod+Shift+2 move container to workspace $ws2
 bindsym $mod+Shift+3 move container to workspace $ws3
@@ -336,9 +341,6 @@ bindsym $mod+$mod_next+6 move container to workspace $ws6; workspace $ws6
 bindsym $mod+$mod_next+7 move container to workspace $ws7; workspace $ws7
 bindsym $mod+$mod_next+8 move container to workspace $ws8; workspace $ws8
 
-# move all windows on workspace cache to current container
-bindsym $mod+$mod_next+grave [workspace="`"] move container to workspace current
-
 # Open applications on specific workspaces
 # assign [class="Thunderbird"] $ws1
 # assign [class="Pale moon"] $ws2

i3/config.simple

@@ -187,6 +187,19 @@ bindsym $mod+Shift+a move left 100px
 bindsym $mod+Shift+s move down 100px
 bindsym $mod+Shift+d move right 100px
 
+# move the currently focused window to the scratchpad
+#bindsym $mod+Shift+Tab move scratchpad
+
+# Show the next scratchpad window or hide the focused scratchpad window.
+# If there are multiple scratchpad windows, this command cycles through them.
+#bindsym $mod+minus scratchpad show
+
+# move all windows on workspace cache to mark STK
+bindsym $mod+grave move container to workspace $wsg
+bindsym $mod+Shift+grave [workspace="`"] move container to workspace current
+bindsym $mod+Shift+Tab [workspace="`"] move container to mark STK
+bindsym $mod+$mod_next+Tab focus parent, mark --add --toggle STK, focus child
+
 # mark and focus
 bindsym $mod+Ctrl+1 mark --add --toggle 1
 bindsym $mod+Ctrl+2 mark --add --toggle 2
@@ -197,7 +210,7 @@ bindsym $mod+Ctrl+6 mark --add --toggle 6
 bindsym $mod+Ctrl+7 mark --add --toggle 7
 bindsym $mod+Ctrl+8 mark --add --toggle 8
 bindsym $mod+Ctrl+9 mark --add --toggle 9
-bindsym $mod+g exec "i3-input -f $i3inputfont -l 1 -P \\"Goto Mark: \\" -F '[con_mark=\\"%s\\"] focus'"
+bindsym $mod+g exec "i3-input -f $i3inputfont -l 1 -P \\"Goto Mark: \\" -F '[con_mark=\\"%s\\"] focus'; i3-msg focus child"
 
 # workspace back and forth (with/without active container)
 workspace_auto_back_and_forth yes
@@ -233,7 +246,7 @@ bindsym $mod+Ctrl+v sticky toggle;exec notify-send 'sticky windows toggled'
 
 # focus last window
 # requires (https://crates.io/crates/i3-focus-last)
-bindsym $mod+Tab exec i3-focus-last
+#bindsym $mod+Tab exec i3-focus-last
 
 # window transparency adjustment (and alias to restart picom)
 bindsym $mod+$mod_next+z exec transset-df -a --min 0.20 --dec 0.20
@@ -255,13 +268,6 @@ bindsym $mod+ctrl+Shift+i exec xprop -id $(xdotool getactivewindow) -remove INVE
 bindsym $mod+q focus parent
 bindsym $mod+e focus child
 
-# move the currently focused window to the scratchpad
-bindsym $mod+Shift+Tab move scratchpad
-
-# Show the next scratchpad window or hide the focused scratchpad window.
-# If there are multiple scratchpad windows, this command cycles through them.
-bindsym $mod+minus scratchpad show
-
 # navigate workspaces next / previous
 bindsym $mod+Ctrl+h workspace prev
 bindsym $mod+Ctrl+l workspace next
@@ -292,7 +298,6 @@ bindsym $mod+8 workspace $ws8
 bindsym $mod+Ctrl+grave workspace $wsg
 
 # Move focused container to workspace
-bindsym $mod+grave move container to workspace $wsg
 bindsym $mod+Shift+1 move container to workspace $ws1
 bindsym $mod+Shift+2 move container to workspace $ws2
 bindsym $mod+Shift+3 move container to workspace $ws3
@@ -312,9 +317,6 @@ bindsym $mod+$mod_next+6 move container to workspace $ws6; workspace $ws6
 bindsym $mod+$mod_next+7 move container to workspace $ws7; workspace $ws7
 bindsym $mod+$mod_next+8 move container to workspace $ws8; workspace $ws8
 
-# move all windows on workspace cache to current container
-bindsym $mod+$mod_next+grave [workspace="`"] move container to workspace current
-
 # Open applications on specific workspaces
 # assign [class="Thunderbird"] $ws1
 # assign [class="Pale moon"] $ws2