diff options
| -rw-r--r-- | _zlogout | 4 | ||||
| -rw-r--r-- | _zshrc | 3 | ||||
| -rw-r--r-- | _zshrc.local | 38 |
3 files changed, 15 insertions, 30 deletions
@@ -4,7 +4,9 @@ # # clear console -if which tput >/dev/null 2>&1; then +if which clear >/dev/null 2>&1; then + clear +elif which tput >/dev/null 2>&1; then tput clear fi @@ -1,12 +1,13 @@ ## ## ~/.zshrc -## Zsh configuration file +## ZSH configuration file ## oh-my-zsh: http://ohmyz.sh/ ## ## Zsh reads this file in all interactive shells, whether they are ## login shells or not. ## ## Aaron LI +## Created: 2014-05-31 ## Updated: 2016-01-26 ## diff --git a/_zshrc.local b/_zshrc.local index 6459c22..addfa6b 100644 --- a/_zshrc.local +++ b/_zshrc.local @@ -1,30 +1,11 @@ +## ## ~/.zshrc.local ## ZSH local configuration file ## -## Weitian LI <liweitianux@gmail.com> -## 2014/05/31 - -### locale {{{ -export LANG="en_US.UTF-8" -export LC_CTYPE="zh_CN.UTF-8" -export LC_COLLATE="C" -### }}} - -### environments {{{ -if [ -d "$HOME/bin" ]; then - export PATH="$HOME/bin:$PATH" -fi -if [ -d "$HOME/.local/bin" ]; then - export PATH="$HOME/.local/bin:$PATH" -fi -# admin -if groups | grep -qE '\b(wheel|adm|sudo)\b'; then - export PATH="$PATH:/usr/local/sbin:/usr/sbin:/sbin" -fi - -# ls colors -[ -x /usr/bin/dircolors ] && eval `dircolors -b` -### environments }}} +## Aaron LI +## Created: 2014-05-31 +## Updated: 2016-01-27 +## ### vi mode {{{ # oh-my-zsh: plugin: vi-mode @@ -64,12 +45,12 @@ export HEADAS="$HOME/local/heasoft/heasoft-6.16/x86_64-unknown-linux-gnu" function heainit() { if [ "x${CALDB}" = "x" ]; then export CALDB="$HOME/local/CALDB" - export CALDBALIAS="${CALDB}/software/tools/alias_config.fits" - export CALDBCONFIG="${CALDB}/software/tools/caldb.config" fi + export CALDBCONFIG="${CALDB}/software/tools/caldb.config" + export CALDBALIAS="${CALDB}/software/tools/alias_config.fits" HEA_STATE="`echo $PATH | tr ':' '\n' | grep 'heasoft'`" if [ "x${HEA_STATE}" = "x" ]; then - source $HEADAS/headas-init.sh > /dev/null + source $HEADAS/headas-init.sh fi unset HEA_STATE export LD_LIBRARY_PATH="${LD_LIBRARY_PATH_BAK}" @@ -81,7 +62,7 @@ function ciaoinit() { HEA_STATE="`echo $PATH | tr ':' '\n' | grep 'heasoft'`" CIAO_STATE="`echo $PATH | tr ':' '\n' | grep 'ciao'`" if [ "x${HEA_STATE}" = "x" ]; then - heainit > /dev/null + heainit fi if [ "x${CIAO_STATE}" = "x" ]; then source $CIAO_PATH/bin/ciao.bash @@ -113,3 +94,4 @@ alias chcld="${CHANDRA_SCRIPT_DIR}/chandra_collect_data_v3.sh" alias chr500="${CHANDRA_SCRIPT_DIR}/ciao_r500avgt_v3.sh" ### aliases }}} +# vim: set ts=8 sw=4 tw=0 fenc=utf-8 ft=zsh: # |