Fixed vimrc reloading, minor i3 improvements

i3/i3config

@@ -1,3 +1,6 @@
+#exec xrandr --output HDMI3 --left-of HDMI1 &
+#exec xmodmap ~/.Xmodmap &
+
 #Audio
 bindsym XF86AudioRaiseVolume exec "amixer set Master 5%+ unmute"
 bindsym XF86AudioLowerVolume exec "amixer set Master 5%- unmute"
@@ -191,7 +194,7 @@ bindsym $mod+Shift+r reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+grave exec "i3lock -i `shuf -n1 -e ~/.i3/wall/*`; sleep 60; pgrep i3lock && xset dpms force off"
 # 
-bindsym $mod+Shift+grave exec "~/.i3/sleep.sh"
+bindsym $mod+Shift+grave exec "sudo pm-suspend | i3lock -i `shuf -n1 -e ~/.i3/wall/*`"
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+q restart
 # exit i3 (logs you out of your X session)
@@ -200,9 +203,13 @@ bindsym $mod+Shift+q exec "i3-nagbar -t warning -m 'You pressed the exit shortcu
 # resize window (you can also use the mouse for that)
 
 bindsym $mod+r mode "resize"
+bindsym $mod+u focus parent
+bindsym $mod+shift+u focus child
+bindsym $mod+m focus mode_toggle
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 #bar {
 #        #status_command i3status
 #}
+exec feh --bg-scale "`shuf -n1 -e ~/ownCloud/wallpaper/{std,mlp}/*`"

shells/bashrc

@@ -60,7 +60,7 @@ if [ -x /usr/bin/dircolors ]; then
 fi
 alias bat='upower -i /org/freedesktop/UPower/devices/battery_BAT0| grep -E "state|to\ full|percentage"'
 alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-alias vim='vim +"au BufWritePost .vimrc so ~/.vimrc" +"au BufWritePost vimrc so ~/.vimrc"'
+#alias vim='vim +"au BufWritePost .vimrc so ~/.vimrc" +"au BufWritePost vimrc so ~/.vimrc"'
 alias disphost='export DISPLAY=:0.0'
 alias ll='ls -alF'
 alias la='ls -A'

shells/tmprc

@@ -60,7 +60,7 @@ if [ -x /usr/bin/dircolors ]; then
     alias egrep='egrep --color=auto'
 fi
 alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-alias vim='vim +"au BufWritePost .vimrc so ~/.vimrc" +"au BufWritePost vimrc so ~/.vimrc"'
+#alias vim='vim +"au BufWritePost .vimrc so ~/.vimrc" +"au BufWritePost vimrc so ~/.vimrc"'
 alias disphost='export DISPLAY=:0.0'
 alias ll='ls -alF'
 alias la='ls -A'
@@ -254,4 +254,4 @@ if [ "$BASH" ]; then
   #readonly HISTSIZE
   #readonly HISTFILE
   #readonly HISTCONTROL
-fi
+fi

shells/zshrc

@@ -82,7 +82,7 @@ alias ls='ls --color=always -F'
 alias ehistory='cat ~/.bash_eternal_history|grep $@'
 alias bat='upower -i /org/freedesktop/UPower/devices/battery_BAT0| grep -E "state|to\ full|percentage"'
 alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-alias vim='vim +"au BufWritePost .vimrc so ~/.vimrc" +"au BufWritePost vimrc so ~/.vimrc"'
+#alias vim='vim +"au BufWritePost .vimrc so ~/.vimrc" +"au BufWritePost vimrc so ~/.vimrc"'
 alias disphost='export DISPLAY=:0.0'
 alias ll='ls -alF'
 alias la='ls -A'

vim/vimrc

@@ -313,6 +313,10 @@ if exists("+undofile")
   set undodir+=~/.vim/undo//
   set undofile
 endif
+augroup vimrc
+  au!
+  au BufWritePost .vimrc,vimrc source %
+augroup END
 augroup vimrcEx
   au!
   " When editing a file, always jump to the last known cursor position.