X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=zsh%2Fzshrc;h=71f19549110694c87778110307bc9d0375fe7260;hb=f0b093b74f4cc6e028bbfcade027a6b56814c44c;hp=1ea7de2dd8c022fb0cade2e02f04145f2dde61b5;hpb=22f28f7c2a5db5aa66de01e75d614ba18e60642b;p=dotfiles.git

diff --git a/zsh/zshrc b/zsh/zshrc
index 1ea7de2..71f1954 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -114,7 +114,14 @@ alias ln='ln -i'
 #alias svn='colorsvn'
 alias sed='/usr/local/bin/gsed'
 
+##### Git 
+alias 'gs'='git status'
+alias 'ga'='git add'
+alias 'gc'='git commit'
+alias 'gl'='git log  --oneline --graph --all --color --decorate --abbrev-commit'
 alias 'git-log'='git log  --oneline --graph --all --color --decorate --abbrev-commit'
+alias 'gdiff'='git diff'
+alias 'gpush'='git push origin master'
 
 
 
@@ -302,7 +309,7 @@ if [[ $OSNAME == 'Darwin' ]]; then
     export ANDROID_TOOLCHAIN="$ANDROID_NDK_HOME/standalone-toolchain-api14/"
     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
+    export PATH="$HOME/bin":"/usr/local/bin":"/usr/local/sbin":$PATH
     
     
     ## appended by cpan initializaion
@@ -312,3 +319,29 @@ if [[ $OSNAME == 'Darwin' ]]; then
     PERL_MB_OPT="--install_base \"$HOME/perl5\""; export PERL_MB_OPT;
     PERL_MM_OPT="INSTALL_BASE=$HOME/perl5"; export PERL_MM_OPT;
 fi
+
+# add Racket into PATH
+export PATH="/Applications/Racket v6.6/bin":$PATH;
+export MANPATH="/Applications/Racket v6.6/man":$MANPATH;
+
+# export ~/.bin into PATH
+export PATH="$HOME/.bin":$PATH;
+
+
+# source Android bin
+[[ -f "$ZSHHOME/androidrc" ]] && . "$ZSHHOME/androidrc"
+
+if which pyenv > /dev/null; then eval "$(pyenv init -)"; fi
+export PYENV_ROOT="$HOME/.pyenv"
+export PATH="$PYENV_ROOT/bin:$PATH"
+
+# tmux variable
+export TMUX_IP=`echo $SSH_CONNECTION | awk '{print $3}'`
+if [[ $OSNAME == 'Darwin' ]]; then
+    ip=`ifconfig | grep "inet .*broadcast" | head -1 | awk '{print $2}'`
+    [[ $TMUX_IP = "" ]] && TMUX_IP=$ip
+else
+    ip=`ip addr | grep 'inet .*global' | head -1 | sed 's/^.*inet //g; s/\/.*$//g'`
+    [[ $TMUX_IP = "" ]] && TMUX_IP=$ip
+fi
+