summaryrefslogtreecommitdiff
path: root/zsh/.zshrc
diff options
context:
space:
mode:
Diffstat (limited to 'zsh/.zshrc')
-rw-r--r--zsh/.zshrc28
1 files changed, 6 insertions, 22 deletions
diff --git a/zsh/.zshrc b/zsh/.zshrc
index a60304d..271d475 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -37,12 +37,16 @@ if [[ -d ~/nlp_scripts ]]; then
export PATH=~/nlp_scripts:$PATH
fi
+if [[ -d /usr/lib/colorgcc/bin ]]; then
+ PATH=/usr/lib/colorgcc/bin:$PATH
+fi
+
which R &>/dev/null
if [[ $? == 0 ]]; then
export R_LIBS_USER=$HOME/.R
fi
-export EDITOR='vim -p'
+export EDITOR='nvim -p'
export LC_ALL=en_US.UTF-8
export LANG=en_US.UTF-8
@@ -165,26 +169,6 @@ case $TERM in
esac
# #############################################################################
-# host specifics
-# #############################################################################
-
-case `hostname` in
- 2pac|CLuster|coltrane|donna|vicious|lemmy)
- umask u=rwx,g=rwx,o=rx
- alias tmux="tmux -f ~/.tmux.`hostname`.conf"
- ;;
- bryant|barkley|bogues|curry|durant|iverson|nowitzki|oneal|ming|*.uberspace.de)
- PATH=/usr/lib/colorgcc/bin:$PATH
- ;;
-esac
-
-case `hostname` in
- CLuster|node*|gpu*)
- alias tmux="tmux -f ~/.tmux.cluster.conf"
- ;;
-esac
-
-# #############################################################################
# aliases
# #############################################################################
@@ -223,7 +207,7 @@ alias jpegtran='jpegtran -trim'
alias pdfmerge='gs -dNOPAUSE -sDEVICE=pdfwrite -sOUTPUTFILE=/tmp/merged.pdf -dBATCH'
alias thumb='convert -resize 200x200'
-alias qmv='qmv -evim -fdo'
+alias qmv='qmv -envim -fdo'
alias radio='mocp ~/.moc/radio.m3u'
alias muxn='tmux new -s'