@@ -3,7 +3,6 @@ alias pu='pushd'

 alias po='popd'

 # Basic directory operations

-alias .='pwd'

 alias ...='cd ../..'

 alias -- -='cd -'

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

-## fixme - the load process here seems a bit bizarre

+# fixme - the load process here seems a bit bizarre

 unsetopt menu_complete   # do not autoselect the first completion entry

 unsetopt flowcontrol

@@ -30,6 +30,11 @@ zstyle ':completion:*:*:*:*:*' menu select

 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'

 zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"

+# disable named-directories autocompletion

+zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories

+cdpath=(.)

+

+

 # Load known hosts file for auto-completion with ssh and scp commands

 if [ -f ~/.ssh/known_hosts ]; then

   zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )

@@ -5,7 +5,7 @@ function title {

     print -nR $'\033k'$1$'\033'\\\

     print -nR $'\033]0;'$2$'\a'

-  elif [[ $TERM == "xterm" || $TERM == "rxvt" ]]; then

+  elif [[ $TERM =~ "^xterm" || $TERM == "rxvt" ]]; then

     # Use this one instead for XTerms:

     print -nR $'\033]0;'$*$'\a'

   fi

@@ -20,6 +20,7 @@ bindkey "^[[F"  end-of-line

 bindkey "^[[4~" end-of-line

 bindkey ' ' magic-space    # also do history expansion on space

+bindkey '^[[Z' reverse-menu-complete

 # consider emacs keybindings:

@@ -21,5 +21,3 @@ then

 else

   /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh

 fi

-

-unset config_file

\ No newline at end of file

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

 #compdef brew

-# copied from _fink

+# imported from the latest homebrew contributions

 _brew_all_formulae() {

   formulae=(`brew search`)

@@ -12,19 +12,25 @@ _brew_installed_formulae() {

 local -a _1st_arguments

 _1st_arguments=(

+  'cat:display formula file for a formula'

+  'cleanup:uninstall unused and old versions of packages'

+  'create:create a new formula'

+  'deps:list dependencies and dependants of a formula'

+  'doctor:audits your installation for common issues'

+  'edit:edit a formula'

+  'home:visit the homepage of a formula or the brew project'

+  'info:information about a formula'

   'install:install a formula'

+  'link:link a formula'

+  'list:list files in a formula or not-installed formulae'

+  'log:git commit log for a formula'

+  'outdated:list formulas for which a newer version is available'

+  'prune:remove dead links'

   'remove:remove a formula'

   'search:search for a formula (/regex/ or string)'

-  'list:list files in a formula or not-installed formulae'

-  'link:link a formula'

   'unlink:unlink a formula'

-  'home:visit the homepage of a formula or the brew project'

-  'info:information about a formula'

-  'prune:remove dead links'

   'update:freshen up links'

-  'log:git commit log for a formula'

-  'create:create a new formula'

-  'edit:edit a formula'

+  'uses:show formulas which depend on a formula'

 )

 local expl

@@ -47,12 +53,12 @@ case "$words[1]" in

     _arguments \

       '(--unbrewed)--unbrewed[files in brew --prefix not controlled by brew]' \

       '1: :->forms' &&  return 0

-      

+

       if [[ "$state" == forms ]]; then

         _brew_installed_formulae

         _requested installed_formulae expl 'installed formulae' compadd -a installed_formulae

       fi ;;

-  install|home|log|info)

+  install|home|log|info|uses|cat|deps)

     _brew_all_formulae

     _wanted formulae expl 'all formulae' compadd -a formulae ;;

   remove|edit|xo)

new file mode 100644

@@ -0,0 +1,39 @@

+#!/bin/zsh

+# 

+# Make the dirstack more persistant

+# 

+# Add dirpersist to $plugins in ~/.zshrc to load

+# 

+

+# $zdirstore is the file used to persist the stack

+zdirstore=~/.zdirstore

+

+dirpersistinstall () {

+    if grep 'dirpersiststore' ~/.zlogout > /dev/null; then

+    else

+        if read -q \?"Would you like to set up your .zlogout file for use with dirspersist? (y/n) "; then

+            echo "# Store dirs stack\n# See ~/.oh-my-zsh/plugins/dirspersist.plugin.zsh\ndirpersiststore" >> ~/.zlogout

+        else

+            echo "If you don't want this message to appear, remove dirspersist from \$plugins"

+        fi

+    fi

+}

+

+dirpersiststore () {

+    dirs -p | perl -e 'foreach (reverse <STDIN>) {chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"}' > $zdirstore

+}

+

+dirpersistrestore () {

+    if [ -f $zdirstore ]; then

+        source $zdirstore

+    fi

+}

+

+DIRSTACKSIZE=10

+setopt autopushd pushdminus pushdsilent pushdtohome pushdignoredups

+

+dirpersistinstall

+dirpersistrestore

+

+# Make popd changes permanent without having to wait for logout

+alias popd="popd;dirpersiststore"

new file mode 100644

@@ -0,0 +1,7 @@

+#Aliases

+alias pc="sudo port clean --all installed"

+alias pi="sudo port install $1"

+alias psu="sudo port selfupdate"

+alias puni="sudo port uninstall inactive"

+alias puo="sudo port upgrade outdated"

+alias pup="psu && puo"

new file mode 100644

@@ -0,0 +1,23 @@

+# Based on code from Joseph M. Reagle

+# http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html

+

+local SSH_ENV=$HOME/.ssh/environment

+

+function start_agent {

+  /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}

+  chmod 600 ${SSH_ENV}

+  . ${SSH_ENV} > /dev/null

+  /usr/bin/ssh-add;

+}

+

+# Source SSH settings, if applicable

+

+if [ -f "${SSH_ENV}" ]; then

+  . ${SSH_ENV} > /dev/null

+  ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {

+    start_agent;

+  }

+else

+  start_agent;

+fi

+

new file mode 100644

@@ -0,0 +1,22 @@

+function zle-line-init zle-keymap-select {

+  zle reset-prompt

+}

+

+zle -N zle-line-init

+zle -N zle-keymap-select

+

+bindkey -v

+

+# if mode indicator wasn't setup by theme, define default

+if [[ "$MODE_INDICATOR" == "" ]]; then

+  MODE_INDICATOR="%{$fg_bold[red]%}<%{$fg[red]%}<<%{$reset_color%}"

+fi

+

+function vi_mode_prompt_info() {

+  echo "${${KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/}"

+}

+

+# define right prompt, if it wasn't defined by a theme

+if [[ "$RPS1" == "" && "$RPROMPT" == "" ]]; then

+  RPS1='$(vi_mode_prompt_info)'

+fi

new file mode 100644

@@ -0,0 +1,7 @@

+PROMPT=$'%{$fg_bold[green]%}%n@%m %{$fg[blue]%}%D{[%I:%M:%S]} %{$reset_color%}%{$fg[white]%}[%~]%{$reset_color%} $(git_prompt_info)\

+%{$fg[blue]%}->%{$fg_bold[blue]%} %#%{$reset_color%} '

+

+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}["

+ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"

+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}"

+ZSH_THEME_GIT_PROMPT_CLEAN=""

new file mode 100644

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

+# Copied from old version of tonotdo's theme. LSCOLORS modified.

+PROMPT='%{$fg_no_bold[cyan]%}%n%{$fg_no_bold[magenta]%}•%{$fg_no_bold[green]%}%3~$(git_prompt_info)%{$reset_color%}» '

+RPROMPT='[%*]'

+

+# git theming

+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg_no_bold[red]%}"

+ZSH_THEME_GIT_PROMPT_SUFFIX=""

+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[blue]%})"

+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[yellow]%}⚡%{$fg_bold[blue]%})"

+

+export LSCOLORS="exfxcxdxbxegedabagacad"

+export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:'

new file mode 100644

@@ -0,0 +1,43 @@

+grey='\e[0;90m'

+

+ZSH_THEME_GIT_PROMPT_PREFIX="%{$grey%}("

+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

+ZSH_THEME_GIT_PROMPT_DIRTY="%{$grey%}) %{$fg[yellow]%}✗%{$reset_color%}"

+ZSH_THEME_GIT_PROMPT_CLEAN="%{$grey%})"

+

+function josh_prompt {

+  (( spare_width = ${COLUMNS} ))

+  prompt=" "

+

+  branch=$(current_branch)

+  ruby_version=$(rvm_prompt_info)

+  path_size=${#PWD}

+  branch_size=${#branch}

+  ruby_size=${#ruby_version}

+  user_machine_size=${#${(%):-%n@%m-}}

+  

+  if [[ ${#branch} -eq 0 ]]

+    then (( ruby_size = ruby_size + 1 ))

+  else

+    (( branch_size = branch_size + 4 ))

+    if [[ -n $(git status -s 2> /dev/null) ]]; then

+      (( branch_size = branch_size + 2 ))

+    fi

+  fi

+  

+  (( spare_width = ${spare_width} - (${user_machine_size} + ${path_size} + ${branch_size} + ${ruby_size}) ))

+

+  while [ ${#prompt} -lt $spare_width ]; do

+    prompt=" $prompt"

+  done

+  

+  prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info)%{$reset_color%} $(git_prompt_info)"

+  

+  echo $prompt

+}

+

+setopt prompt_subst

+

+PROMPT='

+%n@%m $(josh_prompt)

+%(?,%{%F{green}%},%{%F{red}%})⚡%{$reset_color%} '

new file mode 100644

@@ -0,0 +1,13 @@

+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"

+

+PROMPT='%{$fg[green]%}%c \

+$(git_prompt_info)\

+%{$fg[red]%}%(!.#.»)%{$reset_color%} '

+PROMPT2='%{$fg[red]%}\ %{$reset_color%}'

+RPS1='%{$fg[blue]%}%~%{$reset_color%} ${return_code} '

+

+ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}:: %{$fg[yellow]%}("

+ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%} "

+ZSH_THEME_GIT_PROMPT_CLEAN=""

+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$fg[yellow]%}"

+

new file mode 100644

@@ -0,0 +1,7 @@

+PROMPT='%{$fg_bold[red]%}%m%{$reset_color%}:%{$fg[cyan]%}%c%{$reset_color%}:%# '

+RPROMPT='%{$fg_bold[green]%}$(git_prompt_info)%{$reset_color%}% '

+

+ZSH_THEME_GIT_PROMPT_PREFIX="<%{$fg[red]%}"

+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%} %{$fg[yellow]%}✗%{$fg[green]%}>%{$reset_color%}"

+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}>"

new file mode 100644

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

+# Comment 

+

+ZSH_THEME_GIT_PROMPT_PREFIX=' (git:'

+ZSH_THEME_GIT_PROMPT_SUFFIX=')'

+

+PROMPT='%{$fg[magenta]%}[%c]$(git_prompt_info) $ %{$reset_color%}'

\ No newline at end of file

@@ -22,7 +22,7 @@ echo "Copying your current PATH and adding it to the end of ~/.zshrc for you."

 echo "export PATH=$PATH" >> ~/.zshrc

 echo "Time to change your default shell to zsh!"

-chsh -s /bin/zsh

+chsh -s "/usr/bin/env zsh"

 echo '         __                                     __  '

 echo '  ____  / /_     ____ ___  __  __   ____  _____/ /_ '

@@ -32,5 +32,5 @@ echo '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '

 echo '                        /____/'

 echo "\n\n ....is now installed."

-/bin/zsh

+/usr/bin/env zsh

 source ~/.zshrc