@@ -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:

@@ -12,7 +12,7 @@ for config_file ($ZSH/custom/*.zsh) source $config_file

 # Load all of the plugins that were defined in ~/.zshrc

 plugin=${plugin:=()}

-for plugin ($plugins) source $ZSH/plugins/$plugin.plugin.zsh

+for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh

 # Check for updates on initial load...

 if [ "$DISABLE_AUTO_UPDATE" = "true" ]

@@ -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

deleted file mode 100644

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

-# add brew completion function to path

-fpath=($ZSH/functions/brew $fpath)

-autoload -U compinit

-compinit -i

new file mode 100644

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

+# add brew completion function to path

+fpath=($ZSH/functions/brew $fpath)

+autoload -U compinit

+compinit -i

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"

deleted file mode 100644

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

-# Aliases

-alias g='git'

-alias gst='git status'

-alias gl='git pull'

-alias gup='git fetch && git rebase'

-alias gp='git push'

-alias gd='git diff | mate'

-alias gdv='git diff -w "$@" | vim -R -'

-alias gc='git commit -v'

-alias gca='git commit -v -a'

-alias gb='git branch'

-alias gba='git branch -a'

-alias gcount='git shortlog -sn'

-alias gcp='git cherry-pick'

-

-

-# Git and svn mix

-alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'

-

-#

-# Will return the current branch name

-# Usage example: git pull origin $(current_branch)

-#

-function current_branch() {

-  ref=$(git symbolic-ref HEAD 2> /dev/null) || return

-  echo ${ref#refs/heads/}

-}

-

-# these aliases take advangate of the previous function

-alias ggpull='git pull origin $(current_branch)'

-alias ggpush='git push origin $(current_branch)'

-alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'

\ No newline at end of file

new file mode 100644

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

+# Aliases

+alias g='git'

+alias gst='git status'

+alias gl='git pull'

+alias gup='git fetch && git rebase'

+alias gp='git push'

+alias gd='git diff | mate'

+alias gdv='git diff -w "$@" | vim -R -'

+alias gc='git commit -v'

+alias gca='git commit -v -a'

+alias gb='git branch'

+alias gba='git branch -a'

+alias gcount='git shortlog -sn'

+alias gcp='git cherry-pick'

+

+

+# Git and svn mix

+alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'

+

+#

+# Will return the current branch name

+# Usage example: git pull origin $(current_branch)

+#

+function current_branch() {

+  ref=$(git symbolic-ref HEAD 2> /dev/null) || return

+  echo ${ref#refs/heads/}

+}

+

+# these aliases take advangate of the previous function

+alias ggpull='git pull origin $(current_branch)'

+alias ggpush='git push origin $(current_branch)'

+alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'

\ No newline at end of file

deleted file mode 100644

@@ -1,16 +0,0 @@

-# To use: add a .lighthouse file into your directory with the URL to the

-# individual project. For example:

-# https://rails.lighthouseapp.com/projects/8994

-# Example usage: http://screencast.com/t/ZDgwNDUwNT

-open_lighthouse_ticket () {

-  if [ ! -f .lighthouse-url ]; then

-    echo "There is no .lighthouse file in the current directory..."

-    return 0;

-  else

-    lighthouse_url=$(cat .lighthouse-url);

-    echo "Opening ticket #$1";

-    `open $lighthouse_url/tickets/$1`;

-  fi

-}

-

-alias lho='open_lighthouse_ticket'

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,16 @@

+# To use: add a .lighthouse file into your directory with the URL to the

+# individual project. For example:

+# https://rails.lighthouseapp.com/projects/8994

+# Example usage: http://screencast.com/t/ZDgwNDUwNT

+open_lighthouse_ticket () {

+  if [ ! -f .lighthouse-url ]; then

+    echo "There is no .lighthouse file in the current directory..."

+    return 0;

+  else

+    lighthouse_url=$(cat .lighthouse-url);

+    echo "Opening ticket #$1";

+    `open $lighthouse_url/tickets/$1`;

+  fi

+}

+

+alias lho='open_lighthouse_ticket'

\ No newline at end of file

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"

deleted file mode 100644

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

-# commands to control local mysql-server installation

-# paths are for osx installtion via macports

-

-alias mysqlstart='sudo /opt/local/bin/mysqld_safe5'

-alias mysqlstop='/opt/local/bin/mysqladmin5 -u root -p shutdown'

-alias mysqlstatus='mysqladmin5 -u root -p ping'

\ No newline at end of file

new file mode 100644

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

+# commands to control local mysql-server installation

+# paths are for osx installtion via macports

+

+alias mysqlstart='sudo /opt/local/bin/mysqld_safe5'

+alias mysqlstop='/opt/local/bin/mysqladmin5 -u root -p shutdown'

+alias mysqlstatus='mysqladmin5 -u root -p ping'

\ No newline at end of file

deleted file mode 100644

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

-function tab() {

-  osascript 2>/dev/null <<EOF

-    tell application "System Events"

-      tell process "Terminal" to keystroke "t" using command down

-    end

-    tell application "Terminal"

-      activate

-      do script with command "cd \"$PWD\"; $*" in window 1

-    end tell

-EOF

-}

\ No newline at end of file

new file mode 100644

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

+function tab() {

+  osascript 2>/dev/null <<EOF

+    tell application "System Events"

+      tell process "Terminal" to keystroke "t" using command down

+    end

+    tell application "Terminal"

+      activate

+      do script with command "cd \"$PWD\"; $*" in window 1

+    end tell

+EOF

+}

\ No newline at end of file

deleted file mode 100644

@@ -1,36 +0,0 @@

-

-alias ss='thin --stats "/thin/stats" start'

-alias sg='ruby script/generate'

-alias sd='ruby script/destroy'

-alias sp='ruby script/plugin'

-alias ssp='ruby script/spec'

-alias rdbm='rake db:migrate'

-alias sc='ruby script/console'

-alias sd='ruby script/server --debugger'

-alias devlog='tail -f log/development.log'

-

-function _cap_does_task_list_need_generating () {

-  if [ ! -f .cap_tasks~ ]; then return 0;

-  else

-    accurate=$(stat -f%m .cap_tasks~)

-    changed=$(stat -f%m config/deploy.rb)

-    return $(expr $accurate '>=' $changed)

-  fi

-}

-

-function _cap () {

-  if [ -f config/deploy.rb ]; then

-    if _cap_does_task_list_need_generating; then

-      echo "\nGenerating .cap_tasks~..." > /dev/stderr

-      cap show_tasks -q | cut -d " " -f 1 | sed -e '/^ *$/D' -e '1,2D'

-> .cap_tasks~

-    fi

-    compadd `cat .cap_tasks~`

-  fi

-}

-

-compctl -K _cap cap

-

-function remote_console() {

-  /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )"

-}

new file mode 100644

@@ -0,0 +1,36 @@

+

+alias ss='thin --stats "/thin/stats" start'

+alias sg='ruby script/generate'

+alias sd='ruby script/destroy'

+alias sp='ruby script/plugin'

+alias ssp='ruby script/spec'

+alias rdbm='rake db:migrate'

+alias sc='ruby script/console'

+alias sd='ruby script/server --debugger'

+alias devlog='tail -f log/development.log'

+

+function _cap_does_task_list_need_generating () {

+  if [ ! -f .cap_tasks~ ]; then return 0;

+  else

+    accurate=$(stat -f%m .cap_tasks~)

+    changed=$(stat -f%m config/deploy.rb)

+    return $(expr $accurate '>=' $changed)

+  fi

+}

+

+function _cap () {

+  if [ -f config/deploy.rb ]; then

+    if _cap_does_task_list_need_generating; then

+      echo "\nGenerating .cap_tasks~..." > /dev/stderr

+      cap show_tasks -q | cut -d " " -f 1 | sed -e '/^ *$/D' -e '1,2D'

+> .cap_tasks~

+    fi

+    compadd `cat .cap_tasks~`

+  fi

+}

+

+compctl -K _cap cap

+

+function remote_console() {

+  /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )"

+}

deleted file mode 100644

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

-alias sgem='sudo gem'

-

-# Find ruby file

-alias rfind='find . -name *.rb | xargs grep -n'

\ No newline at end of file

new file mode 100644

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

+alias sgem='sudo gem'

+

+# Find ruby file

+alias rfind='find . -name *.rb | xargs grep -n'

\ No newline at end of file

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

+

deleted file mode 100644

@@ -1,14 +0,0 @@

-

-# TextMate

-alias et='mate . &'

-alias ett='mate app config lib db public spec test Rakefile Capfile Todo &'

-alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'

-alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'

-

-# Editor Ruby file in TextMate

-alias mr='mate CHANGELOG app config db lib public script spec test'

-

-function tm() {

-  cd $1

-  mate $1

-}

new file mode 100644

@@ -0,0 +1,14 @@

+

+# TextMate

+alias et='mate . &'

+alias ett='mate app config lib db public spec test Rakefile Capfile Todo &'

+alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'

+alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'

+

+# Editor Ruby file in TextMate

+alias mr='mate CHANGELOG app config db lib public script spec test'

+

+function tm() {

+  cd $1

+  mate $1

+}

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,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,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