Merge branch 'development'

i3/config

@@ -106,7 +106,8 @@ bindsym $mod+F2 exec amixer -qc 0 set Master 2db-; exec notify-send 'volume decr
 bindsym $mod+F3 exec amixer -qc 0 set Master 2db+; exec notify-send 'volume increased'
 
 # Screen brightness controls
-bindsym $mod+F8 exec sudo xbacklight -10
+#bindsym $mod+F8 exec sudo xbacklight -10
+bindsym $mod+F8 exec "sleep 1; xset dpms force off"
 bindsym $mod+F9 exec sudo xbacklight +10
 
 # focus_follows_mouse no
@@ -118,7 +119,10 @@ 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\\""
+bindsym $mod+m exec "i3-msg \\"move left, focus up, move right, focus left\\""
+bindsym $mod+Shift+m exec "i3-msg \\"focus right, move left, focus up, move right, focus left\\""
+bindsym $mod+comma exec "i3-msg \\"focus up, move right, focus up, focus left\\""
+bindsym $mod+Shift+comma exec "i3-msg \\"focus up, move right, focus left\\""
 
 # container focusing (with fallback for case where window is direct child of workspace container)
 # NOTE: requires xdotool
@@ -461,7 +465,7 @@ bar {
 }
 
 # hide/unhide i3status bar
-bindsym $mod+n bar mode toggle
+bindsym $mod+Control+m bar mode toggle
 
 #############################
 ### settings for i3-gaps: ###

i3/config.simple

@@ -44,6 +44,11 @@ popup_during_fullscreen leave_fullscreen
 bindsym $mod+period $border_no_name
 bindsym $mod+$mod_next+period $border_normal
 
+# Font for window titles. Will also be used by the bar unless a different font
+# # is used in the bar {} block below.
+#font pango:monospace 8
+font xft:BitstreamVeraSans-Roman 10
+
 # Use Mouse+$mod to drag floating windows
 floating_modifier $mod
 
@@ -73,7 +78,10 @@ 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\\""
+bindsym $mod+m exec "i3-msg \\"move left, focus up, move right, focus left\\""
+bindsym $mod+Shift+m exec "i3-msg \\"focus right, move left, focus up, move right, focus left\\""
+bindsym $mod+comma exec "i3-msg \\"focus up, move right, focus up, focus left\\""
+bindsym $mod+Shift+comma exec "i3-msg \\"focus up, move right, focus left\\""
 
 # move focused window
 bindsym $mod+Shift+Left move left 100px
@@ -195,7 +203,7 @@ bindsym $mod+Ctrl+x --release exec --no-startup-id xkill
 
 # shortcuts to often used applications
 bindsym $mod_next+u exec --no-startup-id pamac-manager
-bindsym $mod_next+i exec --no-startup-id firefox
+bindsym $mod_next+i exec --no-startup-id chromium-browser
 bindsym $mod_next+o exec --no-startup-id xfce4-appfinder
 bindsym $mod_next+p exec --no-startup-id putty
 bindsym $mod_next+bracketleft exec --no-startup-id nautilus
@@ -268,4 +276,4 @@ bar {
 }
 
 # hide/unhide i3status bar
-bindsym $mod+m bar mode toggle
+bindsym $mod+Control+m bar mode toggle