merge to top

[dotfiles.git] / zsh / zshrc

diff --git a/zsh/zshrc b/zsh/zshrc
index 758863f..b0e3857 100644 (file)
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -90,6 +90,8 @@ alias ln='ln -i'
 #alias svn='colorsvn'
 alias sed='/usr/local/bin/gsed'
 
+alias 'git log'='git log  --oneline --graph --all --color --decorate --abbrev-commit'
+
 
 
 ###########################  zsh completion ##########################
@@ -194,14 +196,20 @@ git_prompt_string() {
 RPS1='$(git_prompt_string)'
 
 #source ~/Private/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh
-source ~/Private/zsh_plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+source ~/.zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 # http://stackoverflow.com/questions/3483604/which-shortcut-in-zsh-does-the-same-as-ctrl-u-in-bash
 bindkey \^U backward-kill-line
 
 export PYTHONSTARTUP="$HOME/.pythonrc"
 
-source $HOME/.cpverc
-source $HOME/.eccrc
+export ZSHHOME="$HOME/.zsh"
+[[ -f "$ZSHHOME/cpverc" ]] && . "$ZSHHOME/cpverc"
+[[ -f "$ZSHHOME/eccrc" ]] && . "$ZSHHOME/eccrc"
+
 
 #` git log --oneline --abbrev-commit --all --graph --decorate --color `
 [[ -s `brew --prefix`/etc/autojump.sh ]] && . `brew --prefix`/etc/autojump.sh
+
+alias emacs='TERM=xterm-256color emacs -nw'
+
+alias tw='open -a /Applications/TextWrangler.app/'