Merge branch 'i3-remap-experimental' into development

i3/config

@@ -281,8 +281,8 @@ bindsym $mod+q focus parent
 bindsym $mod+e focus child
 
 # navigate workspaces next / previous
-bindsym $mod_next+Ctrl+h workspace prev
-bindsym $mod_next+Ctrl+l workspace next
+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
@@ -299,25 +299,25 @@ set $ws7 number 7:7
 set $ws8 number 8:8
 
 # switch to workspace
-bindsym $mod_next+1 workspace $ws1
-bindsym $mod_next+2 workspace $ws2
-bindsym $mod_next+3 workspace $ws3
-bindsym $mod_next+4 workspace $ws4
-bindsym $mod_next+5 workspace $ws5
-bindsym $mod_next+6 workspace $ws6
-bindsym $mod_next+7 workspace $ws7
-bindsym $mod_next+8 workspace $ws8
+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
 
 # Move focused container to workspace
-bindsym $mod_next+Shift+1 move container to workspace $ws1
-bindsym $mod_next+Shift+2 move container to workspace $ws2
-bindsym $mod_next+Shift+3 move container to workspace $ws3
-bindsym $mod_next+Shift+4 move container to workspace $ws4
-bindsym $mod_next+Shift+5 move container to workspace $ws5
-bindsym $mod_next+Shift+6 move container to workspace $ws6
-bindsym $mod_next+Shift+7 move container to workspace $ws7
-bindsym $mod_next+Shift+8 move container to workspace $ws8
+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
 
 # Move focused container to workspace, and switch to that workspace
 bindsym $mod+$mod_next+1 move container to workspace $ws1; workspace $ws1

i3/config.simple

@@ -251,8 +251,8 @@ bindsym $mod+q focus parent
 bindsym $mod+e focus child
 
 # navigate workspaces next / previous
-bindsym $mod_next+Ctrl+h workspace prev
-bindsym $mod_next+Ctrl+l workspace next
+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
@@ -269,25 +269,25 @@ set $ws7 number 7:7
 set $ws8 number 8:8
 
 # switch to workspace
-bindsym $mod_next+1 workspace $ws1
-bindsym $mod_next+2 workspace $ws2
-bindsym $mod_next+3 workspace $ws3
-bindsym $mod_next+4 workspace $ws4
-bindsym $mod_next+5 workspace $ws5
-bindsym $mod_next+6 workspace $ws6
-bindsym $mod_next+7 workspace $ws7
-bindsym $mod_next+8 workspace $ws8
+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
 
 # Move focused container to workspace
-bindsym $mod_next+Shift+1 move container to workspace $ws1
-bindsym $mod_next+Shift+2 move container to workspace $ws2
-bindsym $mod_next+Shift+3 move container to workspace $ws3
-bindsym $mod_next+Shift+4 move container to workspace $ws4
-bindsym $mod_next+Shift+5 move container to workspace $ws5
-bindsym $mod_next+Shift+6 move container to workspace $ws6
-bindsym $mod_next+Shift+7 move container to workspace $ws7
-bindsym $mod_next+Shift+8 move container to workspace $ws8
+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
 
 # Move focused container to workspace, and switch to that workspace
 bindsym $mod+$mod_next+1 move container to workspace $ws1; workspace $ws1