Add DOTFILES env variable and standardize BASH/ZSH paths

bashrc

@@ -66,9 +66,12 @@ vim() {
   stty "$STTYOPTS"
 }
 
-export PATH=$PATH:$HOME/.gem/ruby/2.1.0/bin
+export DOTFILES=$HOME/Documents/dotfiles
+export PATH=$DOTFILES/bin:$PATH
+export PATH=$PATH:$HOME/.rvm/bin
 export PATH=$PATH:/opt/android-sdk/tools:/opt/android-sdk/platform-tools
-export PATH="$PATH:$HOME/.rvm/bin"
+
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
 
 if [ -x /usr/bin/ssh-agent -a -z "$SSH_AUTH_SOCK" ]; then
   eval "$(keychain --eval -Q -q --agents ssh  `find $HOME/.ssh/*  ! -name '*.pub' ! -name 'config' ! -name 'known_hosts'`)"

config/awesome/theme.lua

@@ -1,4 +1,4 @@
 local theme = dofile('/usr/share/awesome/themes/default/theme.lua')
-theme.wallpaper = os.getenv('HOME') .. '/Documents/dotfiles/backgrounds/triforce_1680.jpg'
+theme.wallpaper = os.getenv('DOTFILES') .. '/backgrounds/triforce_1680.jpg'
 
 return theme

fehbg

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-feh --no-fehbg --bg-scale $HOME/Documents/dotfiles/backgrounds/triforce_1680.jpg
+feh --no-fehbg --bg-scale $DOTFILES/backgrounds/triforce_1680.jpg

xbindkeysrc

@@ -18,7 +18,7 @@
   XF86MonBrightnessDown
 "/usr/local/bin/bluetooth_toggle --toggle"
   XF86LaunchB
-"$HOME/Documents/dotfiles/bin/toggle_external_display.rb"
+"$DOTFILES/bin/toggle_external_display.rb"
   XF86LaunchA
-"$HOME/Documents/dotfiles/bin/toggle_external_display.rb"
+"$DOTFILES/bin/toggle_external_display.rb"
   XF86Display

xinitrc

@@ -1,4 +1,5 @@
 #!/bin/sh
+export DOTFILES=$HOME/Documents/dotfiles
 
 ([[ -e $HOME/.Xmodmap ]] && xmodmap $HOME/.Xmodmap) &
 ([[ -e $HOME/.Xresources ]] && xrdb -merge $HOME/.Xresources) &

zshrc

@@ -1,4 +1,3 @@
-# Lines configured by zsh-newuser-install
 HISTFILE=~/.histfile
 HISTSIZE=1000
 SAVEHIST=1000
@@ -41,7 +40,11 @@ if [ -x /usr/bin/ssh-agent -a -z "$SSH_AUTH_SOCK" ]; then
   eval "$(keychain --eval -Q -q --agents ssh  `find $HOME/.ssh/*  ! -name '*.pub' ! -name 'config' ! -name 'known_hosts'`)"
 fi
 
-export PATH="$PATH:$HOME/.rvm/bin"
+export DOTFILES=$HOME/Documents/dotfiles
+export PATH=$DOTFILES/bin:$PATH
+export PATH=$PATH:$HOME/.rvm/bin
+export PATH=$PATH:/opt/android-sdk/tools:/opt/android-sdk/platform-tools
+
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
 
 source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh