Merge branch 'i3-remap-experimental' into development

i3/config

@@ -65,15 +65,15 @@ workspace_layout tabbed
 title_align center
 
 # Configure border style <normal|1pixel|pixel xx|none|pixel>
-for_window [class=".*"] $border_no_name
+for_window [class=".*"] $border_normal
 for_window [class=".*"] title_window_icon on
 for_window [class=".*"] title_window_icon padding 3px
 
-# i3-overview (https://github.com/milgra/i3-overview)
-for_window [class="i3-overview"] floating enable
-for_window [class="i3-overview"] sticky enable
-no_focus [class="i3-overview"]
-exec --no-startup-id i3-overview
+## i3-overview (https://github.com/milgra/i3-overview)
+#for_window [class="i3-overview"] floating enable
+#for_window [class="i3-overview"] sticky enable
+#no_focus [class="i3-overview"]
+#exec --no-startup-id i3-overview
 
 # focus_wrapping <yes|no|force|workspace>
 # Legacy syntax: "force_focus_wrapping force"
@@ -278,10 +278,6 @@ bindsym $mod++Shift+i exec --no-startup-id xprop -id $(xdotool getactivewindow)
 bindsym $mod+q focus parent
 bindsym $mod+e focus child
 
-# navigate workspaces next / previous
-bindsym $mod+Ctrl+h workspace prev
-bindsym $mod+Ctrl+l workspace next
-
 # Workspace names
 # to display names or symbols instead of plain workspace numbers you can use
 # something like: set $ws1 1:mail
@@ -295,6 +291,10 @@ bindsym $mod+Ctrl+l workspace next
 #set $ws7 number 7
 #set $ws8 number 8
 
+# navigate workspaces next / previous
+bindsym $mod+Ctrl+h workspace prev
+bindsym $mod+Ctrl+l workspace next
+
 # switching back and forth
 bindsym $mod+Tab workspace back_and_forth
 bindsym $mod+Shift+Tab move container to workspace back_and_forth
@@ -303,10 +303,10 @@ bindsym $mod+$mod_next+Tab move container to workspace back_and_forth; workspace
 # switch to workspace
 bindsym $mod+1 workspace prev
 bindsym $mod+2 workspace next
-bindsym $mod+3 exec --no-startup-id i3-input -f $i3inputfont -P "Go to Workspace (number): " -l 2 -F 'workspace number "%s"'
+bindsym $mod+3 exec --no-startup-id i3-input -f $i3inputfont -P "Go to Workspace (number): " -F 'workspace number "%s"'
 bindsym $mod+Ctrl+3 exec --no-startup-id i3-input -f $i3inputfont -P "Go to Workspace (name): " -F 'workspace "%s"'
-bindsym $mod+Shift+3 exec --no-startup-id i3-input -f $i3inputfont -P "Move to Workspace: " -l 2 -F 'move container to workspace number "%s"'
-bindsym $mod+$mod_next+3 exec --no-startup-id "i3-input -f $i3inputfont -P \\"Move with Workspace: \\" -l 2 -F 'move container to workspace number \\"%s\\", workspace number \\"%s\\"'"
+bindsym $mod+Shift+3 exec --no-startup-id i3-input -f $i3inputfont -P "Move to Workspace: " -F 'move container to workspace number "%s"'
+bindsym $mod+$mod_next+3 exec --no-startup-id "i3-input -f $i3inputfont -P \\"Move with Workspace: \\" -F 'move container to workspace \\"%s\\", workspace \\"%s\\"'"
 bindsym $mod+4 exec --no-startup-id i3-input -f $i3inputfont -P "Rename Workspace: " -F 'rename workspace to "%s"'
 
 # new iterative workspaces
@@ -463,8 +463,8 @@ bindsym $mod+$mod_next+Shift+k resize shrink height 100 px or 10 ppt
 bindsym $mod+$mod_next+Shift+l resize grow width 100 px or 10 ppt
 
 # "netflix" and "spotify" modes
-bindsym $mod+$mod_next+n floating enable;sticky enable; move position 1300px 708px resize set 612 343;border none
-bindsym $mod+$mod_next+m floating enable;sticky enable; move position 1123px 983px resize set 791 70;border none
+bindsym $mod+$mod_next+n floating enable;sticky enable; move position 1632px 864px resize set 912 543; border none
+bindsym $mod+$mod_next+m floating enable;sticky enable; move position 1123px 983px resize set 791 70; border none
 bindsym $mod+$mod_next+Shift+m resize set height 64; border none
 
 # redshift modes

i3/config.simple

@@ -65,15 +65,15 @@ workspace_layout tabbed
 title_align center
 
 # Configure border style <normal|1pixel|pixel xx|none|pixel>
-for_window [class=".*"] $border_no_name
+for_window [class=".*"] $border_normal
 for_window [class=".*"] title_window_icon on
 for_window [class=".*"] title_window_icon padding 3px
 
-# i3-overview (https://github.com/milgra/i3-overview)
-for_window [class="i3-overview"] floating enable
-for_window [class="i3-overview"] sticky enable
-no_focus [class="i3-overview"]
-exec --no-startup-id i3-overview
+## i3-overview (https://github.com/milgra/i3-overview)
+#for_window [class="i3-overview"] floating enable
+#for_window [class="i3-overview"] sticky enable
+#no_focus [class="i3-overview"]
+#exec --no-startup-id i3-overview
 
 # focus_wrapping <yes|no|force|workspace>
 # Legacy syntax: "force_focus_wrapping force"
@@ -249,10 +249,6 @@ bindsym $mod++Shift+i exec --no-startup-id xprop -id $(xdotool getactivewindow)
 bindsym $mod+q focus parent
 bindsym $mod+e focus child
 
-# navigate workspaces next / previous
-bindsym $mod+Ctrl+h workspace prev
-bindsym $mod+Ctrl+l workspace next
-
 # Workspace names
 # to display names or symbols instead of plain workspace numbers you can use
 # something like: set $ws1 1:mail
@@ -266,6 +262,10 @@ bindsym $mod+Ctrl+l workspace next
 #set $ws7 number 7
 #set $ws8 number 8
 
+# navigate workspaces next / previous
+bindsym $mod+Ctrl+h workspace prev
+bindsym $mod+Ctrl+l workspace next
+
 # switching back and forth
 bindsym $mod+Tab workspace back_and_forth
 bindsym $mod+Shift+Tab move container to workspace back_and_forth
@@ -274,13 +274,17 @@ bindsym $mod+$mod_next+Tab move container to workspace back_and_forth; workspace
 # switch to workspace
 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'
+bindsym $mod+3 exec --no-startup-id i3-input -f $i3inputfont -P "Go to Workspace (number): " -F 'workspace number "%s"'
+bindsym $mod+Ctrl+3 exec --no-startup-id i3-input -f $i3inputfont -P "Go to Workspace (name): " -F 'workspace "%s"'
+bindsym $mod+Shift+3 exec --no-startup-id i3-input -f $i3inputfont -P "Move to Workspace: " -F 'move container to workspace number "%s"'
+bindsym $mod+$mod_next+3 exec --no-startup-id "i3-input -f $i3inputfont -P \\"Move with Workspace: \\" -F 'move container to workspace \\"%s\\", workspace \\"%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 $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 prev
@@ -361,7 +365,7 @@ bar {
 
     bindsym button4 nop bindsym button5 nop
 #   font xft:URWGothic-Book 11
-    strip_workspace_numbers yes
+    strip_workspace_numbers no
 
     colors {
         #background #4a4a4a

vim/vimrc

 " source defaults
-so /usr/share/vim/vim82/defaults.vim
+so /usr/share/vim/vim90/defaults.vim
 
 " my settings
 set number