Merge branch 'development'

i3/config

@@ -117,6 +117,9 @@ bindsym $mod+j focus down
 bindsym $mod+k focus up
 bindsym $mod+l focus right
 
+# master-stack keybinding (moves stack window to master and current master back to stack window)
+bindsym $mod+m exec "i3-msg \\"move left; focus up; move right; focus left\\""
+
 # container focusing (with fallback for case where window is direct child of workspace container)
 # NOTE: requires xdotool
 #bindsym $mod+Ctrl+h exec "WINDOW=$(xdotool getactivewindow); i3-msg \\"focus parent; focus left; focus child\\"; NEW_WINDOW=$(xdotool getactivewindow); if [ \\"$NEW_WINDOW\\" -eq \\"$WINDOW\\" ]; then i3-msg \\"focus left\\"; fi"
@@ -458,7 +461,7 @@ bar {
 }
 
 # hide/unhide i3status bar
-bindsym $mod+m bar mode toggle
+bindsym $mod+n bar mode toggle
 
 #############################
 ### settings for i3-gaps: ###

i3/config.simple

@@ -72,6 +72,9 @@ bindsym $mod+j focus down
 bindsym $mod+k focus up
 bindsym $mod+l focus right
 
+# master-stack keybinding (moves stack window to master and current master back to stack window)
+bindsym $mod+m exec "i3-msg \\"move left; focus up; move right; focus left\\""
+
 # move focused window
 bindsym $mod+Shift+Left move left 100px
 bindsym $mod+Shift+Down move down 100px