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

+#:depends-on:utils

 #:depends-on:nix

 #:depends-on:autoloads

 #:depends-on:sh-opts

 #:depends-on:detect-gnu

-#:depends-on:key-bindings

 #:depends-on:editor-setup

 # echo "begin zshrc"

@@ -35,45 +35,6 @@ showspaces() {

     python -c'import sys;print sys.stdin.read().replace(" ","_").replace("\t", "----")'

 }

-truncfile() {

-    echo $1

-    (( number = $1 - 1 ))

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

-}

-

-

-savedir() {

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

-    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() {

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

-    eval $cmd

-    gt $1

-    truncfile 50 $HOME/.gtaliases

-    echo $cmd >> $HOME/.gtaliases

-}

-

-gtmpdir() {

-  cd "$(mktemp -d "$@")"

-}

-

-source $HOME/.gtaliases

-gthaskell() { gtp haskell }

-gtprolog() { gtp prolog }

-gtpython() { gtp python }

 despace() { echo ${1// /} }

 escape() { echo ${(j<\\ >)*} }

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

-#:depends-on:

+#:depends-on:detect-gnu

 ###

 if [[ $TERM != 'dumb' ]]; then

   # Solarized dircolors:

@@ -1,4 +1,6 @@

 #:depends-on:todo

+#:depends-on:key-bindings

+#:depends-on:named-directories

 cat <<'EOP'

              :

     `.       ;        .'

@@ -51,16 +53,8 @@ function zle-line-init zle-keymap-select {

   RPS2=$RPS1

   zle reset-prompt

 }

-zle -N zle-line-init

-zle -N zle-keymap-select

-

 export PYTHONSTARTUP=$HOME/Library/Python/2.7/site-packages/sitecustomize.py

-PROMPT='---

-(%?) %m:%n--%l ${PWD/$HOME/~} `vcs_info_wrapper` `battery_charge` 

-%!:%# '

-export PROMPT

-

 HOSTNAME=`hostname -f`

 PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"'

@@ -1,11 +0,0 @@

-# We want the up + down arrows to do completion

-autoload -U up-line-or-beginning-search

-autoload -U down-line-or-beginning-search

-zle -N up-line-or-beginning-search

-zle -N down-line-or-beginning-search

-bindkey -M viins "^[[A" up-line-or-beginning-search # Up

-bindkey -M vicmd "^[[A" up-line-or-beginning-search # Up

-bindkey -M viins "^[[B" down-line-or-beginning-search # Down

-bindkey -M vicmd "^[[B" down-line-or-beginning-search # Down

-bindkey -M vicmd "k" up-line-or-beginning-search # Up

-bindkey -M vicmd "j" down-line-or-beginning-search # Down

@@ -1,7 +1,24 @@

 set -o vi

+bindkey -v

+

+zle -N zle-line-init

+zle -N zle-keymap-select

+

+# We want the up + down arrows to do completion

+autoload -U up-line-or-beginning-search

+autoload -U down-line-or-beginning-search

+zle -N up-line-or-beginning-search

+zle -N down-line-or-beginning-search

+bindkey -M viins "^[[A" up-line-or-beginning-search # Up

+bindkey -M vicmd "^[[A" up-line-or-beginning-search # Up

+bindkey -M viins "^[[B" down-line-or-beginning-search # Down

+bindkey -M vicmd "^[[B" down-line-or-beginning-search # Down

+bindkey -M vicmd "k" up-line-or-beginning-search # Up

+bindkey -M vicmd "j" down-line-or-beginning-search # Down

+

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

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

-bindkey '^I' complete-word

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

+bindkey -M viins '^I' complete-word

 bindkey -M viins '^Oc' _correct_word

 bindkey -M viins '^O?' _complete_debug

@@ -13,7 +30,6 @@ if [[ -z $BINDKEYS ]]; then

     BINDKEYS=${BINDKEYS%-noit}

 fi

-bindkey -e

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

     bindkey '' backward-word

     bindkey '' forward-word

new file mode 100644

@@ -0,0 +1,32 @@

+savedir() {

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

+    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() {

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

+    eval $cmd

+    gt $1

+    truncfile 50 $HOME/.gtaliases

+    echo $cmd >> $HOME/.gtaliases

+}

+

+gtmpdir() {

+  cd "$(mktemp -d "$@")"

+}

+

+source $HOME/.gtaliases

+gthaskell() { gtp haskell }

+gtprolog() { gtp prolog }

+gtpython() { gtp python }

@@ -55,3 +55,9 @@ expand-alias () {

     fi

   fi

 }

+

+truncfile() {

+    echo $1

+    (( number = $1 - 1 ))

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

+}