Merge branch 'development'

conky/conky_shortcuts_numix

@@ -26,7 +26,7 @@ ${color2}bmenu - ${color}mod+Ctrl+b
 ${color2}morc_menu - ${color}mod+z
 ${color2}kill focused - ${color}mod+Shift+q
 
-${color2}toggle split direction - ${color}mod+q
+${color2}toggle split direction - ${color}mod+q[e]
 ${color2}container layout (tabd) - ${color}mod+w
 ${color2}container layout (stck) - ${color}mod+s
 ${color2}child container (horz) - ${color}mod+Alt+q

i3/config

@@ -5,7 +5,7 @@
 set $mod Mod4
 
 # set default desktop layout (default is tiling) <stacking|tabbed>
-workspace_layout tabbed
+#workspace_layout tabbed
 
 # Configure border style <normal|1pixel|pixel xx|none|pixel>
 #new_window pixel 1
@@ -110,18 +110,19 @@ bindsym $mod+Shift+b move container to workspace back_and_forth; workspace back_
 # split orientations
 #bindsym $mod+h split h;exec notify-send 'tile horizontally'
 #bindsym $mod+v split v;exec notify-send 'tile vertically'
-bindsym $mod+Mod1+q layout toggle split;exec notify-send 'layout toggled'
-bindsym $mod+q split h;
-bindsym $mod+e split v;
+bindsym $mod+q layout toggle split;exec notify-send 'layout toggled'
+bindsym $mod+e layout toggle split;exec notify-send 'layout toggled'
+bindsym $mod+Mod1+q split h;
+bindsym $mod+Mod1+e split v;
 
 # toggle fullscreen mode for the focused container
 bindsym $mod+f fullscreen toggle
 
 # change container layout (stacked, tabbed, toggle split)
-bindsym $mod+Mod1+s layout stacking;exec notify-send 'stacking layout'
-bindsym $mod+s split h; layout stacking
-bindsym $mod+Mod1+w layout tabbed;exec notify-send 'tabbed layout'
-bindsym $mod+w split h; layout tabbed
+bindsym $mod+s layout stacking;exec notify-send 'stacking layout'
+bindsym $mod+Mod1+s split h; layout stacking
+bindsym $mod+w layout tabbed;exec notify-send 'tabbed layout'
+bindsym $mod+Mod1+w split h; layout tabbed
 
 # toggle tiling / floating
 bindsym $mod+Shift+space floating toggle