summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.tmux.CLuster.conf (renamed from .tmux.cluster.conf)0
-rw-r--r--.zshrc15
2 files changed, 6 insertions, 9 deletions
diff --git a/.tmux.cluster.conf b/.tmux.CLuster.conf
index 6364e4e..6364e4e 100644
--- a/.tmux.cluster.conf
+++ b/.tmux.CLuster.conf
diff --git a/.zshrc b/.zshrc
index cb00614..17946ad 100644
--- a/.zshrc
+++ b/.zshrc
@@ -15,7 +15,6 @@ zstyle ':completion:*' menu select
setopt completealiases
compdef mosh=ssh
zstyle '*' hosts # do not use /etc/hosts
-#setopt multios
setopt no_multios
ex () {
@@ -37,7 +36,7 @@ ex () {
esac
else
echo "'$1' is not a file!"
- fi
+ fi
}
umask 0077
@@ -70,27 +69,24 @@ autoload -U colors && colors
case `hostname` in
2pac*)
HOSTCOLOR=green
- alias tmux='TERM=screen-256color tmux -f ~/.tmux.2pac.conf'
;;
CLuster)
HOSTCOLOR=cyan
- alias tmux='TERM=screen-256color tmux -f ~/.tmux.cluster.conf'
;;
coltrane*)
HOSTCOLOR=blue
- alias tmux='TERM=screen-256color tmux -f ~/.tmux.coltrane.conf'
;;
donna*)
HOSTCOLOR=red
- alias tmux='TERM=screen-256color tmux -f ~/.tmux.donna.conf'
;;
vicious*)
HOSTCOLOR=yellow
- alias tmux='TERM=screen-256color tmux -f ~/.tmux.vicious.conf'
;;
x)
HOSTCOLOR=magenta
- alias tmux='TERM=screen-256color tmux'
+ ;;
+ *)
+ HOSTCOLOR=white
;;
esac
@@ -100,7 +96,8 @@ case `hostname` in
export GEM_PATH=/toolbox/ruby
export PYTHONPATH=$PYTHONPATH:/toolbox/python/lib/python2.7/site-packages
export PATH=~/vim/bin:/toolbox/scripts:/opt/java/bin/:/toolbox/ruby/bin/:$PATH
- export JAVA_HOME=/usr/lib/jvm/java-6-sun/ # debian systems
+ export JAVA_HOME=/usr/lib/jvm/java-6-sun/ # debian systems w/ sun-java6
+ alias tmux="TERM=screen-256color tmux -f ~/.tmux.`hostname`.conf"
PROMPT="[%m:%~]%{$fg[$HOSTCOLOR]%}%B%%%b%{$reset_color%} "
;;
x)