@@ -1,99 +1,24 @@

 #:depends-on:nix

-cat <<'EOP'

-             :

-    `.       ;        .'

-      `.  .-'''-.   .'

-        ;'  __   _;'

-       /   '_    _`\

-      |  _( a (  a  |

- '''''| (_)    >    |``````

-       \    \    / /

-        `.   `--'.'

-       .' `-,,,-' `.

-     .'      :      `.  hjw

-             :

-EOP

+#:depends-on:autoloads

+#:depends-on:sh-opts

+#:depends-on:detect-gnu

+#:depends-on:key-bindings

+#:depends-on:editor-setup

 # echo "begin zshrc"

 echo "shell session started for $USER on $TTY at `date`" | tee /dev/stderr | logger

 source $HOME/.localzshrc.sh

-autoload -U colors && colors

-autoload zsh/parameter

-autoload -Uz vcs_info

-autoload -U add-zsh-hook

-autoload run-help

-autoload -U zfinit

-autoload -U tcp_proxy

-autoload -U tcp_open

-autoload -U tcp_point

-autoload -U tcp_shoot

-autoload -Uz compinit

-autoload edit-command-line

-

-setopt allexport

-setopt autocd

-setopt autolist

-setopt autopushd

-setopt nobeep

-setopt cdablevars

-setopt nochaselinks

-setopt completeinword

-setopt histexpiredupsfirst

-setopt histignorealldups

-setopt histverify

-setopt listpacked

-setopt markdirs

-setopt nobgnice

-setopt promptsubst

-setopt pushdignoredups

-setopt sharehistory

-

-export GNU_PREFIX=''

-platform="$(uname -s)"

-echo the platform is "$platform"

-if [[ $platform == 'Darwin' ]]; then

-	GNU_PREFIX='g'

-else

-   echo not osx

-fi

-

-export INFOPATH=/usr/local/share/info:/usr/local/texlive/2009/texmf/doc/info

-

 export VIMCLOJURE_SERVER_JAR="$HOME/bin/jars/server-2.3.6.jar"

-export SAVEHIST=10000000

-export HISTSIZE=10000000

-export HISTFILE=$HOME/.zshistory

-

-export PKG_CONFIG_PATH="$PKG_CONFIG_PATH"

-

-export MANPATH="/opt/local/share/man:/Applications/Xcode.app/Contents/Developer/usr/share/man:$MANPATH"

 export PAGER="less -SiemX"

 export RGBDEF='/opt/X11/share/X11/rgb.txt'

 export GREP_COLORS='ms=01;31:mc=01;31:sl=:cx=:fn=35:ln=32:bn=32:se=36'

-if command -v emacsclient 2>&1 >/dev/null; then

-    export VISUAL="emacsclient -c"

-elif [ -x /usr/local/bin/vim ]; then

-    export VISUAL="/usr/local/bin/vim"

-else

-    export VISUAL="/usr/bin/vim"

-fi

-export EDITOR=$VISUAL

-

 #------------------

-zfinit

-alias vi='vim'

-vim() {

-    stty -ixon

-    env vim $*

-    stty ixany

-}

-alias :e="$VISUAL"

 alias :w='cat >'

 alias "cd-"="cd -"

@@ -102,8 +27,6 @@ alias ret=popd

 alias grep="grep --color=auto -I"

 alias la="ls -AF"

 alias ,=pydit

-alias v=$VISUAL

-alias e=$EDITOR

 alias cvsdiff='cvs diff -wbB | colordiff'

 alias cp.="${GNU_PREFIX}cp --target-directory=."

 alias find='noglob find'

@@ -118,11 +41,6 @@ truncfile() {

     ${GNU_PREFIX}sed -i "${number}q" $2

 }

-gtde() { cd $HOME/Desktop/$1 }

-gtdo() { cd $HOME/Downloads/$1 }

-gtp() {cd $HOME/Programming/$1 }

-gt() { cd $HOME/$1 }

-if [[ ! -e $HHOME/.gtaliases ]]; then touch $HOME/.gtaliases; fi

 savedir() {

     cmd="export "`basename $PWD`"=$PWD"

@@ -131,20 +49,23 @@ savedir() {

     echo $cmd >> $HOME/.gtaliases

 }

-gtpa() {

-    gtp $1

-    cmd="alias \"gt_$1\"=\"gtp $1\""

-    eval $cmd

-    truncfile 50 $HOME/.gtaliases

-    echo $cmd >> $HOME/.gtaliases

-}

+hash -d "desktop=$HOME/Desktop"

+hash -d "downloads=$HOME/Downloads"

+hash -d "programming=$HOME/Programming"

+gtde() { cd ~desktop/"${(j</>)*}" }

+gtdo() { cd ~downloads/"${(j</>)*}" }

+gtp() {cd ~programming/"${(j</>)*}" }

+gt() { cd ~"${(j</>)*}" }

+[[ -e $HOME/.gtaliases ]] || touch $HOME/.gtaliases

+

 gta() {

-    gt $1

-    cmd="alias \"gt_$1\"=\"gt $1\""

+    cmd="hash -d \"$1\"=\"$PWD/${(j</>)*}\""

     eval $cmd

+    gt $1

     truncfile 50 $HOME/.gtaliases

     echo $cmd >> $HOME/.gtaliases

 }

+

 source $HOME/.gtaliases

 gthaskell() { gtp haskell }

 gtprolog() { gtp prolog }

@@ -254,42 +175,10 @@ dis() {

 alias dq=dmenu_queue_mpd

 alias dqp=dmenu_queueplay_mpd

-set -o vi

-bindkey -M vicmd '?' history-incremental-search-backward

-bindkey '^X^e' edit-command-line

-bindkey '^I' complete-word

-bindkey -M viins '^Oc' _correct_word

-bindkey -M viins '^O?' _complete_debug

-

-# detecting the terminal to get the keybindings right

-# TODO: check if obsoleted by other things

-if [[ -z $BINDKEYS ]]; then

-    # echo 'defining bindkeys in zshrc'

-    BINDKEYS=${TERM%-256color}

-    BINDKEYS=${BINDKEYS%-noit}

-fi

-

-bindkey -e

-if [[ $BINDKEYS == "screen" ]]; then

-    bindkey '' backward-word

-    bindkey '' forward-word

-    bindkey '[1~' beginning-of-line

-    bindkey '[4~' end-of-line

-else

-    bindkey -M viins '' backward-word

-    # bindkey '' backward-word

-    bindkey -M viins '' forward-word

-    # bindkey '' forward-word

-    bindkey -M viins 'OH' beginning-of-line

-    bindkey -M viins 'OF' end-of-line

-fi

-bindkey '[3~' delete-char

-

 export GOPATH=$HOME/go

 rvm use system &>/dev/null

-

 export CPATH=$CPATH:$HOME/include

 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/lib

 export VIMCLOJURE_SERVER_JAR="$HOME/lib/vimclojure/server-2.3.6.jar"

@@ -1,3 +1,6 @@

+export INFOPATH=/usr/local/share/info:/usr/local/texlive/2009/texmf/doc/info

+export MANPATH="/opt/local/share/man:/Applications/Xcode.app/Contents/Developer/usr/share/man:$MANPATH"

+

 export HELPDIR="$HOME/.zsh_help"

 unalias run-help

 bindkey -v '^_' run-help

@@ -1,4 +1,19 @@

 #:depends-on:todo

+cat <<'EOP'

+             :

+    `.       ;        .'

+      `.  .-'''-.   .'

+        ;'  __   _;'

+       /   '_    _`\

+      |  _( a (  a  |

+ '''''| (_)    >    |``````

+       \    \    / /

+        `.   `--'.'

+       .' `-,,,-' `.

+     .'      :      `.  hjw

+             :

+EOP

+

 if [[ -e /etc/sysconfig/zsh-prompt-$TERM ]]; then

   . /etc/sysconfig/zsh-prompt-$TERM

 elif [[ -e $HOME/.zsh-prompt-$TERM ]]; then

new file mode 100644

@@ -0,0 +1,12 @@

+autoload -U colors && colors

+autoload zsh/parameter

+autoload -Uz vcs_info

+autoload -U add-zsh-hook

+autoload run-help

+autoload -U zfinit

+autoload -U tcp_proxy

+autoload -U tcp_open

+autoload -U tcp_point

+autoload -U tcp_shoot

+autoload -Uz compinit

+autoload edit-command-line

new file mode 100644

@@ -0,0 +1,8 @@

+export GNU_PREFIX=''

+platform="$(uname -s)"

+echo the platform is "$platform"

+if [[ $platform == 'Darwin' ]] && command -v gls 2>&1 >/dev/null; then

+	GNU_PREFIX='g'

+else

+   echo gnu tools not found

+fi

new file mode 100644

@@ -0,0 +1,24 @@

+if command -v emacsclient 2>&1 >/dev/null; then

+  function newemacs() {

+    emacsclient -c "$@"

+  }

+  export VISUAL=newemacs

+elif command -v vim 2>&1 >/dev/null; then

+  export VISUAL=$(which vim)

+fi

+

+export EDITOR=vim

+

+vim() {

+    stty -ixon

+    env vim $*

+    stty ixany

+}

+

+function :e {

+  $VISUAL "$@"

+}

+alias vi='vim'

+

+alias v=$VISUAL

+alias e=$EDITOR

new file mode 100644

@@ -0,0 +1,31 @@

+set -o vi

+bindkey -M vicmd '?' history-incremental-search-backward

+bindkey '^X^e' edit-command-line

+bindkey '^I' complete-word

+bindkey -M viins '^Oc' _correct_word

+bindkey -M viins '^O?' _complete_debug

+

+# detecting the terminal to get the keybindings right

+# TODO: check if obsoleted by other things

+if [[ -z $BINDKEYS ]]; then

+    # echo 'defining bindkeys in zshrc'

+    BINDKEYS=${TERM%-256color}

+    BINDKEYS=${BINDKEYS%-noit}

+fi

+

+bindkey -e

+if [[ $BINDKEYS == "screen" ]]; then

+    bindkey '' backward-word

+    bindkey '' forward-word

+    bindkey '[1~' beginning-of-line

+    bindkey '[4~' end-of-line

+else

+    bindkey -M viins '' backward-word

+    # bindkey '' backward-word

+    bindkey -M viins '' forward-word

+    # bindkey '' forward-word

+    bindkey -M viins 'OH' beginning-of-line

+    bindkey -M viins 'OF' end-of-line

+fi

+bindkey '[3~' delete-char

+

new file mode 100644

@@ -0,0 +1,21 @@

+setopt allexport

+setopt autocd

+setopt autolist

+setopt autopushd

+setopt nobeep

+setopt cdablevars

+setopt nochaselinks

+setopt completeinword

+setopt histexpiredupsfirst

+setopt histignorealldups

+setopt histverify

+setopt listpacked

+setopt markdirs

+setopt nobgnice

+setopt promptsubst

+setopt pushdignoredups

+setopt sharehistory

+

+export SAVEHIST=10000000

+export HISTSIZE=10000000

+export HISTFILE=$HOME/.zshistory

new file mode 100644

@@ -0,0 +1,6 @@

+alias vi='vim'

+vim() {

+    stty -ixon

+    env vim $*

+    stty ixany

+}