# HG changeset patch # User zegervdv # Date 1393173817 -3600 # Node ID 44d3af8838f8ade2ffb511a77a55d1b680584c63 # Parent a8279f1d5b390f2a859b7d6ba95491ac354545fe Add support for local zshrc and vimrc files diff -r a8279f1d5b39 -r 44d3af8838f8 vimrc --- a/vimrc Sun Feb 23 17:38:49 2014 +0100 +++ b/vimrc Sun Feb 23 17:43:37 2014 +0100 @@ -334,3 +334,7 @@ nnoremap y :YRShow let g:livepreview_previewer = 'open -a Preview' + +if filereadable($HOME . "/.vimrc.local") + source ~/.vimrc.local +endif diff -r a8279f1d5b39 -r 44d3af8838f8 zshrc --- a/zshrc Sun Feb 23 17:38:49 2014 +0100 +++ b/zshrc Sun Feb 23 17:43:37 2014 +0100 @@ -32,7 +32,7 @@ # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) -plugins=(git z textmate sublime ruby history-substring-search brew gitfast osx terminalapp tmuxinator vagrant web-search) +plugins=(git z textmate sublime ruby history-substring-search brew gitfast osx terminalapp vagrant web-search) source $ZSH/oh-my-zsh.sh @@ -44,9 +44,7 @@ export PATH="$(brew --prefix ruby)/bin:$PATH" export NODE_PATH="/usr/local/lib/node" export PATH="/usr/local/share/npm/bin:$PATH" -export PATH="$HOME/.tmuxifier/bin:$PATH" eval "$(rbenv init -)" -eval "$(tmuxifier init -)" export GNUTERM=X11 @@ -59,8 +57,6 @@ export GREP_COLOR=32 -export TMUXIFIER_LAYOUT_PATH="$HOME/.tmux-layouts" - # Shortcuts alias blade="cd \"/Volumes/Blade 32GB/\"" alias p="~/Documents/projects" @@ -69,7 +65,6 @@ alias grep="grep --color=auto" alias beer="bundle exec rake" alias ll="ls -al" -alias mux="tmuxifier" # Functions gcat () { @@ -85,3 +80,5 @@ alias ag="ag --color" # Syntax Highlighting # source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +# +[[ -f ~/.zshrc.local ]] && source ~/.zshrc.local