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

i3/config

@@ -122,7 +122,7 @@ bindsym $mod+Shift+q kill
 # start program launcher
 #bindsym $mod+d exec --no-startup-id dmenu_recency
 bindsym $mod_next+d exec --no-startup-id "rofi -show-icons -modi windowcd,window,drun -show drun -kb-row-up \\"Alt+k\\" -kb-row-down \\"Alt+j\\" -theme lb -theme-str '* { font: \\"Sans 16\\"; foreground: #ffffff; border-color: $accent-bg; separatorcolor: $accent-bg; selected-normal-background: $accent-bg; }'"
-bindsym $mod_next+Tab exec --no-startup-id "rofi -show-icons -modi windowcd,window,drun -show windowcd -sort -kb-row-up \\"Alt+k\\" -kb-row-down \\"Alt+j\\" -theme lb -theme-str '* { font: \\"Sans 16\\"; foreground: #ffffff; border-color: $accent-bg; separatorcolor: $accent-bg; selected-normal-background: $accent-bg; }'"
+bindsym $mod_next+Tab exec --no-startup-id "rofi -show-icons -modi windowcd,window,drun -show windowcd -sort -kb-row-up \\"A
 
 # instant layout
 # REQUIRES XDOTOOL
@@ -201,12 +201,11 @@ bindsym $mod+Shift+minus move scratchpad
 # 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+$mod_next+grave [workspace="`"] move container to workspace current
-bindsym $mod+Tab [con_mark="STK"] focus, focus child
-bindsym $mod+Shift+Tab mark ., [con_mark="."] move window to mark STK, unmark .
-bindsym $mod+$mod_next+Tab focus parent, mark --add --toggle STK, focus child
+# move window to mark (by workspace)
+# requires jq
+bindsym $mod+Tab exec --no-startup-id "wn=$(i3-msg -t get_workspaces | jq '.[] | select(.focused==true).num'); i3-msg \\"[con_mark=\\"$wn\\"] focus, focus child\\""
+bindsym $mod+Shift+Tab exec --no-startup-id "wn=$(i3-msg -t get_workspaces | jq '.[] | select(.focused==true).num'); mwn=$(echo \\"m$wn\\"); i3-msg \\"mark $mwn, [con_mark=\\"$mwn\\"] move window to mark $wn, unmark $mwn\\"
+bindsym $mod+$mod_next+Tab exec --no-startup-id "wn=$(i3-msg -t get_workspaces | jq '.[] | select(.focused==true).num'); i3-msg \\"focus parent, mark --add --toggle $wn, focus child\\"
 
 # mark and focus
 bindsym $mod+Ctrl+1 mark --add --toggle 1
@@ -312,6 +311,7 @@ bindsym $mod+Shift+6 move container to workspace $ws6
 bindsym $mod+Shift+7 move container to workspace $ws7
 bindsym $mod+Shift+8 move container to workspace $ws8
 
+
 # Move focused container to workspace, and switch to that workspace
 bindsym $mod+$mod_next+1 move container to workspace $ws1; workspace $ws1
 bindsym $mod+$mod_next+2 move container to workspace $ws2; workspace $ws2
@@ -322,6 +322,10 @@ 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 to wsg workspace
+bindsym $mod+grave move container to workspace $wsg
+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