Merge branch 'i3-remap-experimental' into development

i3/config

@@ -129,8 +129,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 window,drun -show drun -scroll-method 1 -kb-row-tab \\"\\" -kb-mode-next \\"Tab\\" -kb-row-up \\"Super+k\\" -kb-row-down \\"Super+j\\" -theme lb -theme-str '* { font: \\"Sans 16\\"; foreground: #ffffff; border-color: $accent-bg; separatorcolor: $accent-bg; selected-normal-background: $accent-bg; } window { height: 80%; }'"
-bindsym $mod_next+Tab exec --no-startup-id "rofi -show-icons -modi window,drun -show window -scroll-method 1 -kb-row-tab \\"\\" -kb-mode-next \\"Tab\\" -kb-row-up \\"Super+k\\" -kb-row-down \\"Super+j\\" -theme lb -theme-str '* { font: \\"Sans 16\\"; foreground: #ffffff; border-color: $accent-bg; separatorcolor: $accent-bg; selected-normal-background: $accent-bg; } window { height: 80%; }'"
+bindsym $mod_next+Tab exec --no-startup-id "rofi -show-icons -modi window,drun -show window -scroll-method 1 -kb-row-tab \\"\\" -kb-mode-next \\"Tab\\" -kb-row-up \\"Super+k\\" -kb-row-down \\"Super+j\\" -theme lb -theme-str '* { font: \\"DejaVu Sans Mono 16\\"; foreground: #ffffff; border-color: $accent-bg; separatorcolor: $accent-bg; selected-normal-background: $accent-bg; } window { height: 80%; }'"
 
 # instant layout
 # REQUIRES i3-instant-layout and XDOTOOL
@@ -210,23 +209,22 @@ bindsym $mod+minus scratchpad show
 
 # move window to mark (by workspace)
 # requires jq
-set $setwn wn=$(i3-msg -t get_workspaces | jq '.[] | select(.focused==true).num');
-bindsym $mod+Tab exec --no-startup-id "$setwn i3-msg \\"[con_mark=\\"$wn\\"] focus, focus child\\""
-bindsym $mod+Shift+Tab exec --no-startup-id "$setwn mwn=$(echo \\"m$wn\\"); i3-msg \\"mark $mwn, [con_mark=\\"$mwn\\"] move window to mark $wn, unmark $mwn\\"
-bindsym $mod+Escape exec --no-startup-id "$setwn i3-msg \\"[workspace=__focused__] move window to mark $wn\\"
-bindsym $mod+$mod_next+Tab exec --no-startup-id "$setwn i3-msg \\"split h, layout stacking reverse, focus parent, mark --add --toggle $wn, focus child\\"
-
-# mark and focus
-bindsym $mod+Ctrl+1 mark --add --toggle 1
-bindsym $mod+Ctrl+2 mark --add --toggle 2
-bindsym $mod+Ctrl+3 mark --add --toggle 3
-bindsym $mod+Ctrl+4 mark --add --toggle 4
-bindsym $mod+Ctrl+5 mark --add --toggle 5
-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 --no-startup-id "i3-input -f $i3inputfont -l 1 -P \\"Goto Mark: \\" -F '[con_mark=\\"%s\\"] focus'; i3-msg focus child"
+#set $setwn wn=$(i3-msg -t get_workspaces | jq '.[] | select(.focused==true).num');
+#bindsym $mod+Tab exec --no-startup-id "$setwn i3-msg \\"[con_mark=\\"$wn\\"] focus, focus child\\""
+#bindsym $mod+Shift+Tab exec --no-startup-id "$setwn mwn=$(echo \\"m$wn\\"); i3-msg \\"mark $mwn, [con_mark=\\"$mwn\\"] move window to mark $wn, unmark $mwn\\"
+#bindsym $mod+Escape exec --no-startup-id "$setwn i3-msg \\"[workspace=__focused__] move window to mark $wn\\"
+#bindsym $mod+$mod_next+Tab exec --no-startup-id "$setwn i3-msg \\"split h, layout stacking reverse, focus parent, mark --add --toggle $wn, focus child\\"
+
+## mark and focus
+#bindsym $mod+Ctrl+1 mark --add --toggle 1
+#bindsym $mod+Ctrl+2 mark --add --toggle 2
+#bindsym $mod+Ctrl+3 mark --add --toggle 3
+#bindsym $mod+Ctrl+4 mark --add --toggle 4
+#bindsym $mod+Ctrl+5 mark --add --toggle 5
+#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
 
 # workspace back and forth (with/without active container)
 workspace_auto_back_and_forth yes
@@ -288,50 +286,43 @@ bindsym $mod+Ctrl+l workspace next
 # to display names or symbols instead of plain workspace numbers you can use
 # something like: set $ws1 1:mail
 #                 set $ws2 2:
-set $wsg number 0:`
-set $ws1 number 1:1
-set $ws2 number 2:2
-set $ws3 number 3:3
-set $ws4 number 4:4
-set $ws5 number 5:5
-set $ws6 number 6:6
-set $ws7 number 7:7
-set $ws8 number 8:8
+#set $ws1 number 1
+#set $ws2 number 2
+#set $ws3 number 3
+#set $ws4 number 4
+#set $ws5 number 5
+#set $ws6 number 6
+#set $ws7 number 7
+#set $ws8 number 8
+
+# switching back and forth
+bindsym $mod+Tab workspace back_and_forth
+bindsym $mod+Shift+Tab move container to workspace back_and_forth
+bindsym $mod+$mod_next+Tab move container to workspace back_and_forth; workspace back_and_forth
 
 # switch to workspace
-bindsym $mod+1 workspace $ws1
-bindsym $mod+2 workspace $ws2
-bindsym $mod+3 workspace $ws3
-bindsym $mod+4 workspace $ws4
-bindsym $mod+5 workspace $ws5
-bindsym $mod+6 workspace $ws6
-bindsym $mod+7 workspace $ws7
-bindsym $mod+8 workspace $ws8
-bindsym $mod_next+grave workspace $wsg
+bindsym $mod+1 workspace prev
+bindsym $mod+2 workspace next
+bindsym $mod+3 exec --no-startup-id i3-input -f $i3inputfont -P "Goto Workspace: " -l 2 -F 'workspace number "%s"'
+bindsym $mod+4 exec --no-startup-id i3-input -f $i3inputfont -P "Rename Workspace: " -F 'rename workspace to "%s"'
+
+# new iterative workspaces
+set $workspace_dynamic $(($(i3-msg -t get_workspaces | tr , '\n' | grep '\\"num\\":' | cut -d : -f 2 | sort -rn | head -1) + 1))
+bindsym $mod+grave exec --no-startup-id "i3-msg workspace $workspace_dynamic"
+bindsym $mod+Shift+grave exec --no-startup-id "i3-msg move container to workspace $workspace_dynamic"
+bindsym $mod+$mod_next+grave exec --no-startup-id "i3-msg move container to workspace $workspace_dynamic, workspace number $workspace_dynamic"
 
 # Move focused container to workspace
-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
-bindsym $mod+Shift+4 move container to workspace $ws4
-bindsym $mod+Shift+5 move container to workspace $ws5
-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
+bindsym $mod+Shift+1 move container to workspace prev
+bindsym $mod+Shift+2 move container to workspace next
 
 # 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
-bindsym $mod+$mod_next+3 move container to workspace $ws3; workspace $ws3
-bindsym $mod+$mod_next+4 move container to workspace $ws4; workspace $ws4
-bindsym $mod+$mod_next+5 move container to workspace $ws5; workspace $ws5
-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
+bindsym $mod+$mod_next+1 move container to workspace prev; workspace next
+bindsym $mod+$mod_next+2 move container to workspace prev; workspace next
 
 # Move to wsg workspace
-bindsym $mod+grave move container to workspace $wsg
-bindsym $mod+$mod_next+grave [workspace="`"] move container to workspace current
+#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
@@ -379,7 +370,7 @@ bindsym $mod_next+bracketleft exec --no-startup-id nautilus
 bindsym $mod+Shift+Ctrl+v exec --no-startup-id "sleep 1; /usr/bin/xdotool type --delay 100 \\"$(xclip -o)\\""
 
 # shortcuts to often used applications
-bindsym $mod_next+Return exec --no-startup-id i3-sensible-terminal
+bindsym $mod+Return exec --no-startup-id i3-sensible-terminal
 bindsym Print exec --no-startup-id flameshot gui
 bindsym $mod_next+Ctrl+x --release exec --no-startup-id xkill
 
@@ -502,7 +493,7 @@ bar {
 
     bindsym button4 nop bindsym button5 nop
 #   font xft:URWGothic-Book 11
-    strip_workspace_numbers yes
+    strip_workspace_numbers no
 
     colors {
         #background #4a4a4a

i3/config.simple

@@ -180,23 +180,22 @@ bindsym $mod+minus scratchpad show
 
 # move window to mark (by workspace)
 # requires jq
-set $setwn wn=$(i3-msg -t get_workspaces | jq '.[] | select(.focused==true).num');
-bindsym $mod+Tab exec --no-startup-id "$setwn i3-msg \\"[con_mark=\\"$wn\\"] focus, focus child\\""
-bindsym $mod+Shift+Tab exec --no-startup-id "$setwn mwn=$(echo \\"m$wn\\"); i3-msg \\"mark $mwn, [con_mark=\\"$mwn\\"] move window to mark $wn, unmark $mwn\\"
-bindsym $mod+Escape exec --no-startup-id "$setwn i3-msg \\"[workspace=__focused__] move window to mark $wn\\"
-bindsym $mod+$mod_next+Tab exec --no-startup-id "$setwn i3-msg \\"split h, layout stacking reverse, focus parent, mark --add --toggle $wn, focus child\\"
-
-# mark and focus
-bindsym $mod+Ctrl+1 mark --add --toggle 1
-bindsym $mod+Ctrl+2 mark --add --toggle 2
-bindsym $mod+Ctrl+3 mark --add --toggle 3
-bindsym $mod+Ctrl+4 mark --add --toggle 4
-bindsym $mod+Ctrl+5 mark --add --toggle 5
-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 --no-startup-id "i3-input -f $i3inputfont -l 1 -P \\"Goto Mark: \\" -F '[con_mark=\\"%s\\"] focus'; i3-msg focus child"
+#set $setwn wn=$(i3-msg -t get_workspaces | jq '.[] | select(.focused==true).num');
+#bindsym $mod+Tab exec --no-startup-id "$setwn i3-msg \\"[con_mark=\\"$wn\\"] focus, focus child\\""
+#bindsym $mod+Shift+Tab exec --no-startup-id "$setwn mwn=$(echo \\"m$wn\\"); i3-msg \\"mark $mwn, [con_mark=\\"$mwn\\"] move window to mark $wn, unmark $mwn\\"
+#bindsym $mod+Escape exec --no-startup-id "$setwn i3-msg \\"[workspace=__focused__] move window to mark $wn\\"
+#bindsym $mod+$mod_next+Tab exec --no-startup-id "$setwn i3-msg \\"split h, layout stacking reverse, focus parent, mark --add --toggle $wn, focus child\\"
+
+## mark and focus
+#bindsym $mod+Ctrl+1 mark --add --toggle 1
+#bindsym $mod+Ctrl+2 mark --add --toggle 2
+#bindsym $mod+Ctrl+3 mark --add --toggle 3
+#bindsym $mod+Ctrl+4 mark --add --toggle 4
+#bindsym $mod+Ctrl+5 mark --add --toggle 5
+#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
 
 # workspace back and forth (with/without active container)
 workspace_auto_back_and_forth yes
@@ -258,50 +257,42 @@ bindsym $mod+Ctrl+l workspace next
 # to display names or symbols instead of plain workspace numbers you can use
 # something like: set $ws1 1:mail
 #                 set $ws2 2:
-set $wsg number 0:`
-set $ws1 number 1:1
-set $ws2 number 2:2
-set $ws3 number 3:3
-set $ws4 number 4:4
-set $ws5 number 5:5
-set $ws6 number 6:6
-set $ws7 number 7:7
-set $ws8 number 8:8
+#set $ws1 number 1
+#set $ws2 number 2
+#set $ws3 number 3
+#set $ws4 number 4
+#set $ws5 number 5
+#set $ws6 number 6
+#set $ws7 number 7
+#set $ws8 number 8
+
+# switching back and forth
+bindsym $mod+Tab workspace back_and_forth
+bindsym $mod+Shift+Tab move container to workspace back_and_forth
+bindsym $mod+$mod_next+Tab move container to workspace back_and_forth; workspace back_and_forth
 
 # switch to workspace
-bindsym $mod+1 workspace $ws1
-bindsym $mod+2 workspace $ws2
-bindsym $mod+3 workspace $ws3
-bindsym $mod+4 workspace $ws4
-bindsym $mod+5 workspace $ws5
-bindsym $mod+6 workspace $ws6
-bindsym $mod+7 workspace $ws7
-bindsym $mod+8 workspace $ws8
-bindsym $mod_next+grave workspace $wsg
+bindsym $mod+1 workspace prev
+bindsym $mod+2 workspace next
+bindsym $mod+3 exec --no-startup-id i3-input -f $i3inputfont -l 2 -P "Goto Workspace: " -F 'workspace %s'
+
+# new iterative workspaces
+set $workspace_dynamic $(($(i3-msg -t get_workspaces | tr , '\n' | grep '\\"num\\":' | cut -d : -f 2 | sort -rn | head -1) + 1))
+bindsym $mod+grave exec --no-startup-id "i3-msg workspace $workspace_dynamic"
+bindsym $mod+Shift+grave exec --no-startup-id "i3-msg move container to workspace $workspace_dynamic"
+bindsym $mod+$mod_next+grave exec --no-startup-id "i3-msg move container to workspace $workspace_dynamic, workspace $workspace_dynamic"
 
 # Move focused container to workspace
-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
-bindsym $mod+Shift+4 move container to workspace $ws4
-bindsym $mod+Shift+5 move container to workspace $ws5
-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
+bindsym $mod+Shift+1 move container to workspace prev
+bindsym $mod+Shift+2 move container to workspace next
 
 # 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
-bindsym $mod+$mod_next+3 move container to workspace $ws3; workspace $ws3
-bindsym $mod+$mod_next+4 move container to workspace $ws4; workspace $ws4
-bindsym $mod+$mod_next+5 move container to workspace $ws5; workspace $ws5
-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
+bindsym $mod+$mod_next+1 move container to workspace prev; workspace next
+bindsym $mod+$mod_next+2 move container to workspace prev; workspace next
 
 # Move to wsg workspace
-bindsym $mod+grave move container to workspace $wsg
-bindsym $mod+$mod_next+grave [workspace="`"] move container to workspace current
+#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