merge

7 files changed, 181 insertions, 10 deletions

diff --git a/.config/htop/htoprc b/.config/htop/htoprc
index 0e7e488..6f48f2d 100644
--- a/.config/htop/htoprc
+++ b/.config/htop/htoprc
@@ -1,6 +1,6 @@
 # Beware! This file is rewritten by htop when settings are changed in the interface.
 # The parser is also very primitive, and not human-friendly.
-fields=0 48 17 18 38 39 40 2 46 47 49 1 
+fields=0 48 17 18 38 39 40 2 46 47 49 1
 sort_key=46
 sort_direction=1
 hide_threads=0
@@ -15,10 +15,9 @@ tree_view=0
 header_margin=1
 detailed_cpu_time=0
 cpu_count_from_zero=0
-update_process_names=0
 color_scheme=0
 delay=15
-left_meters=AllCPUs Memory Battery 
-left_meter_modes=1 1 1 
-right_meters=Tasks LoadAverage Uptime 
-right_meter_modes=2 2 2 
+left_meters=LeftCPUs2 Memory Swap Hostname
+left_meter_modes=1 1 1 2
+right_meters=RightCPUs2 Tasks LoadAverage Uptime
+right_meter_modes=1 2 2 2
diff --git a/.forward.off b/.forward.off
new file mode 100644
index 0000000..7d9d642
--- /dev/null
+++ b/.forward.off
@@ -0,0 +1 @@
+\simianer, "|/usr/bin/vacation simianer"
diff --git a/.tmux.coltrane.conf b/.tmux.coltrane.conf
new file mode 100644
index 0000000..0a88182
--- /dev/null
+++ b/.tmux.coltrane.conf
@@ -0,0 +1,36 @@
+# act like vim
+setw -g mode-keys vi
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+bind-key -r C-h select-window -t :-
+bind-key -r C-l select-window -t :+
+
+# act like GNU screen
+unbind C-b
+set -g prefix C-a
+
+# look good
+set -g default-terminal "screen-256color"
+
+# status
+set -g status-left-length 32
+set -g status-right-length 150
+set -g status-fg white
+set -g status-bg colour234
+set -g window-status-activity-attr bold
+set -g pane-border-fg colour245
+set -g pane-active-border-fg blue
+set -g message-fg colour16
+set -g message-bg colour221
+set -g message-attr bold
+set -g status-left ''
+set -g status-right '#[underline]#[fg=colour235,bg=blue,bold]  #H:#S'
+set-option -g set-titles on
+set -g set-titles-string '#T -- #W'
+set-window-option -g automatic-rename on
+set-option -g status-interval 1
+set-option -g status-utf8 on
+set-window-option -g utf8 on
+
diff --git a/.tmux.donna.conf b/.tmux.donna.conf
new file mode 100644
index 0000000..cce3a13
--- /dev/null
+++ b/.tmux.donna.conf
@@ -0,0 +1,36 @@
+# act like vim
+setw -g mode-keys vi
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+bind-key -r C-h select-window -t :-
+bind-key -r C-l select-window -t :+
+
+# act like GNU screen
+unbind C-b
+set -g prefix C-a
+
+# look good
+set -g default-terminal "screen-256color"
+
+# status
+set -g status-left-length 32
+set -g status-right-length 150
+set -g status-fg white
+set -g status-bg colour234
+set -g window-status-activity-attr bold
+set -g pane-border-fg colour245
+set -g pane-active-border-fg red
+set -g message-fg colour16
+set -g message-bg colour221
+set -g message-attr bold
+set -g status-left ''
+set -g status-right '#[underline]#[fg=colour235,bg=red,bold]  #H:#S'
+set-option -g set-titles on
+set -g set-titles-string '#T -- #W'
+set-window-option -g automatic-rename on
+set-option -g status-interval 1
+set-option -g status-utf8 on
+set-window-option -g utf8 on
+
diff --git a/.tmux.vicious.conf b/.tmux.vicious.conf
new file mode 100644
index 0000000..44e613a
--- /dev/null
+++ b/.tmux.vicious.conf
@@ -0,0 +1,36 @@
+# act like vim
+setw -g mode-keys vi
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+bind-key -r C-h select-window -t :-
+bind-key -r C-l select-window -t :+
+
+# act like GNU screen
+unbind C-b
+set -g prefix C-a
+
+# look good
+set -g default-terminal "screen-256color"
+
+# status
+set -g status-left-length 32
+set -g status-right-length 150
+set -g status-fg white
+set -g status-bg colour234
+set -g window-status-activity-attr bold
+set -g pane-border-fg colour245
+set -g pane-active-border-fg blue
+set -g message-fg colour16
+set -g message-bg colour221
+set -g message-attr bold
+set -g status-left ''
+set -g status-right '#[underline]#[fg=colour235,bg=yellow,bold]  #H:#S'
+set-option -g set-titles on
+set -g set-titles-string '#T -- #W'
+set-window-option -g automatic-rename on
+set-option -g status-interval 1
+set-option -g status-utf8 on
+set-window-option -g utf8 on
+
diff --git a/.vacation.msg b/.vacation.msg
new file mode 100644
index 0000000..a6dc7e0
--- /dev/null
+++ b/.vacation.msg
@@ -0,0 +1,12 @@
+From: simianer@cl.uni-heidelberg.de (Patrick Simianer)
+Subject: away from my mail
+Delivered-By-The-Graces-Of: The Vacation program
+Precedence: bulk
+
+I'm away from my mail until Jan 7.
+Your mail concerning
+$SUBJECT
+will be read when I return.
+
+In urgent cases try p@simianer.de .
+
diff --git a/.zshrc b/.zshrc
index 5c49683..778b84f 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,8 +1,13 @@
+if [[ ! "$TERM" == "screen-256color" ]]; then
+  TERM="xterm-256color" #hack
+fi
+
 zstyle ':completion:*' completer _complete _ignored
-zstyle :compinstall filename '/home/pks/.zshrc'
+zstyle :compinstall filename '~/.zshrc'
 autoload -Uz compinit promptinit
 compinit
 promptinit
+zstyle ':completion:*' completer _complete _ignored
 HISTFILE=~/.zshistory
 HISTSIZE=1000
 SAVEHIST=1000
@@ -10,7 +15,8 @@ zstyle ':completion:*' menu select
 setopt completealiases
 compdef mosh=ssh
 zstyle '*' hosts # do not use /etc/hosts
-setopt multios
+#setopt multios
+setopt no_multios
 
 ex () {
   if [ -f $1 ] ; then
@@ -46,6 +52,8 @@ export LANGUAGE=en_US.UTF-8
 export GEM_HOME=$HOME/lib/ruby/
 export TERM=rxvt-256color
 export PYTHONPATH=$PYTHONPATH:~/lib/python/
+export CFLAGS="-march=native -mtune=native -O2 -pipe -fomit-frame-pointer -Wall"
+export CXXFLAGS="$CFLAGS"
 
 case $TERM in
   *rxvt*|xterm*)
@@ -59,7 +67,49 @@ case $TERM in
 esac
 
 autoload -U colors && colors
-PROMPT="[%~]%{$fg[magenta]%}$B%%%b%{$reset_color%} "
+case `hostname` in
+  coltrane*)
+    HOSTCOLOR=blue
+    alias tmux='TERM=screen-256color tmux -f ~/.tmux.coltrane.conf'
+    export GEM_HOME=/toolbox/ruby/
+    export GEM_PATH=$HOME/lib/ruby
+  ;;
+  donna*)
+    HOSTCOLOR=red
+    alias tmux='TERM=screen-256color tmux -f ~/.tmux.donna.conf'
+    export GEM_HOME=/toolbox/ruby/
+    export GEM_PATH=$HOME/lib/ruby
+  ;;
+  vicious*)
+    HOSTCOLOR=yellow
+    alias tmux='TERM=screen-256color tmux -f ~/.tmux.vicious.conf'
+    export GEM_HOME=/toolbox/ruby/
+    export GEM_PATH=$HOME/lib/ruby
+  ;;
+  2pac*)
+    HOSTCOLOR=green
+    export GEM_HOME=$HOME/lib/ruby/
+    export GEM_PATH=/toolbox/ruby
+  ;;
+  x)
+    HOSTCOLOR=magenta
+  ;;
+  *)
+    alias tmux='TERM=screen-256color tmux'
+  ;;
+esac
+
+case `hostname` in
+  coltrane*|donna*|vicious*)
+    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
+    PROMPT="[%m:%~]%{$fg[$HOSTCOLOR]%}%B%%%b%{$reset_color%} "
+  ;;
+  *)
+    PROMPT="[%~]%{$fg[magenta]%}$B%%%b%{$reset_color%} "
+  ;;
+esac
 
 function youtube() { mplayer -xy 0.5 $(youtube-dl -g "$@") ;}
 
@@ -77,7 +127,7 @@ alias py='bpython'
 alias grep='grep --color=auto'
 alias equery='sudo equery -N'
 alias feh='feh -F'
-alias gitweb='git instaweb'
+alias gitweb='git instaweb --httpd webrick'
 alias gitwebstop='git instaweb stop'
 alias netcfg='sudo netcfg'
 alias mergepdf='texexec --pdfarrange --noduplex --result merged.pdf '
@@ -119,6 +169,7 @@ alias irb="irb20"
 alias gem="gem20"
 alias quotes='curl -s "http://download.finance.yahoo.com/d/quotes.csv?s=AAPL+AMD+GOOG&f=l1"'
 alias irb='pry'
+alias watch_d='while true; do clear; ps ax | grep -P "\sD\+?\s"; sleep 5; done'
 source ~/.zshrcp
 
 bindkey -v