Merge branch 'master' of https://josh1147582.jumpingcrab.com:3000/jhb2345/dotfiles

bashrc

@@ -1,3 +1,7 @@
+if [ -f "/usr/local/dcs/lib/config/Bash_Profile" ]; then
+    source /usr/local/dcs/lib/config/Bash_Profile
+fi
+
 PS1='\[\e[1;32m\]\u@\h \W\$ \[\e[0m\]'
 
 # ls pleasantness

vimrc

@@ -56,7 +56,7 @@ set foldmethod=indent
 
 " set shell to zsh (if it exists)
 if !(has("win32") || has("win16") || has("win32unix"))
-    if filereadable("/bin/zsh")
+    if filereadable("/bin/zsh") && $SHELL=="/bin/zsh"
         silent! set shell=/bin/zsh  
     endif
 endif
@@ -70,7 +70,7 @@ function! UnixCapsControl()
 endfunction
 
 " map caps lock to escape under Linux
-if !(has("win32") || has("win16") || has("win32unix"))
+if !(has("win32") || has("win16") || has("win32unix")) && (!$SSH_CLIENT && !$SSH_TTY)
     au VimEnter * silent! !xmodmap -e 'clear Lock' -e 'keycode 0x42 = Escape'
     au VimLeave * :call UnixCapsControl() 
 endif
@@ -169,7 +169,7 @@ if exists(':SyntasticStatuslineFlag()')
 endif
 
 " YouCompleteMe
-let g:ycm_global_ycm_extra_conf = '~/.vim/bundle/ycm_extra_conf.py'    
+let g:ycm_global_ycm_extra_conf = '/home/josh/.vim/bundle/ycm_extra_conf.py'    
 " autoclose suggestion windows
 let g:ycm_autoclose_preview_window_after_insertion=1
 

zshrc

@@ -47,7 +47,9 @@ bindkey "^[OF" end-of-line
 
 # Ctrl-Left and Ctrl-Right keys move between words
 bindkey ";5C" forward-word
+bindkey "^[[C" forward-word
 bindkey ";5D" backward-word
+bindkey "^[[D" backward-word
 
 # bind UP and DOWN arrow keys
 bindkey '^[[A' history-substring-search-up
@@ -84,6 +86,9 @@ if hash fuck 2>/dev/null; then
     eval $(thefuck --alias)
 fi
 
+# For playing raw data
+alias playdata='aplay -c 2 -f S16_LE -r 44100'
+
 # zsh-syntax-highlighting (MUST BE AT THE BOTTOM OF THIS FILE)
 source ~/.zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh