From 5f674f92eb056b9f696a3ca34c5012935cfa5d42 Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Fri, 22 Aug 2014 19:37:05 -0400
Subject: [PATCH] Fixed vimrc reloading, minor i3 improvements

---
 i3/Xmodmap    | 0
 i3/i3config   | 9 ++++++++-
 shells/bashrc | 2 +-
 shells/tmprc  | 4 ++--
 shells/zshrc  | 2 +-
 vim/vimrc     | 4 ++++
 6 files changed, 16 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 i3/Xmodmap

diff --git a/i3/Xmodmap b/i3/Xmodmap
old mode 100644
new mode 100755
diff --git a/i3/i3config b/i3/i3config
index a079598..0352fc9 100644
--- a/i3/i3config
+++ b/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}/*`"
diff --git a/shells/bashrc b/shells/bashrc
index bb6fd75..09dfa7a 100644
--- a/shells/bashrc
+++ b/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'
diff --git a/shells/tmprc b/shells/tmprc
index 8d9c31e..92b3565 100644
--- a/shells/tmprc
+++ b/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
\ No newline at end of file
+fi
diff --git a/shells/zshrc b/shells/zshrc
index 51db392..7e353af 100644
--- a/shells/zshrc
+++ b/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'
diff --git a/vim/vimrc b/vim/vimrc
index fbcf8f7..f78464c 100644
--- a/vim/vimrc
+++ b/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.