merge origine/master

[dotfiles.git] / zsh / zshrc

diff --git a/zsh/zshrc b/zsh/zshrc
index 9f1a748..9301e4a 100644 (file)
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -47,17 +47,17 @@ man() {
 
 export PYTHONPATH="/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/"
 export DEV_ENV_ROOT=$HOME/android/
-export ANDROID_NDK_ROOT="${DEV_ENV_ROOT}/android-ndk-r8c/"
+export ANDROID_NDK_ROOT="${DEV_ENV_ROOT}/android-ndk-r10d/"
 export ANDROID_SDK_ROOT="${DEV_ENV_ROOT}/android-sdk-macosx/"
 #export ANDROID_TOOLCHAIN="${DEV_ENV_ROOT}/standalone-toolchain-api14/"
-export ANDROID_NDK_HOME="$HOME/android/android-ndk-r8c"
+export ANDROID_NDK_HOME="$HOME/android/android-ndk-r10d"
 
 
 
 export ANDROID_TOOLCHAIN="$ANDROID_NDK_HOME/standalone-toolchain-api14/"
 
 
-export ANDROID_HOME="/Users/peli3/android/android-sdk-macosx/"
+export ANDROID_HOME="$HOME/android/android-sdk-macosx/"
 
 export PATH=$PATH:"${ANDROID_TOOLCHAIN}/bin/":"${ANDROID_HOME}/platform-tools/"
 export PATH="$HOME/bin":"/usr/local/bin":$PATH
@@ -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 ##########################
@@ -200,9 +202,32 @@ bindkey \^U backward-kill-line
 
 export PYTHONSTARTUP="$HOME/.pythonrc"
 
-[[ -f "$HOME/.cpverc" ]] && . "$HOME/.cpverc"
-[[ -f "$HOME/.eccrc" ]] && . "$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/'
+
+#
+#function exists { which $1 &> /dev/null }
+#
+#if exists percol; then
+#    function percol_select_history() {
+#        local tac
+#        exists gtac && tac="gtac" || { exists tac && tac="tac" || { tac="tail -r" } }
+#        BUFFER=$(fc -l -n 1 | eval $tac | percol --query "$LBUFFER")
+#        CURSOR=$#BUFFER         # move cursor
+#        zle -R -c               # refresh
+#    }
+#
+#    zle -N percol_select_history
+#    bindkey '^R' percol_select_history
+#fi
+export LANG='en_US.UTF-8'
+export LC_ALL="en_US.UTF-8"