@@ -1,3 +1,5 @@

 locals.zsh

 log/.zsh_history

 projects.zsh

+custom/*.zsh

+!custom/example.zsh

\ No newline at end of file

@@ -43,8 +43,13 @@ TODO: Update this..

 * much much more..

 h2. Useful

+

 the "refcard":http://www.bash2zsh.com/zsh_refcard/refcard.pdf is pretty tasty for tips.

+h3. Customization

+

+If you want to override any of the default behavior, just add a new file (ending in @.zsh@) into the @custom/@ directory.

+

 h3. Uninstalling

 If you want to uninstall it, just run @uninstall_oh_my_zsh@ from the command line and it'll remove itself and revert you to bash (or your previous zsh config).

deleted file mode 100644

@@ -1,47 +0,0 @@

-alias pu='pushd'

-alias po='popd'

-

-alias sc='ruby script/console'

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

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

-

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

-alias .='pwd'

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

-

-alias _='sudo'

-alias ss='sudo su -'

-

-#alias g='grep -in'

-

-alias g='git'

-alias gst='git status'

-alias gl='git pull'

-alias gp='git push'

-alias gd='git diff | mate'

-alias gc='git commit -v'

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

-alias gb='git branch'

-alias gba='git branch -a'

-

-alias history='fc -l 1'

-

-alias ls='ls -F'

-alias ll='ls -alr'

-alias l='ls'

-alias ll='ls -l'

-alias sl=ls # often screw this up

-

-alias sgem='sudo gem'

-

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

-

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

-

-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 &'

-

-

-

deleted file mode 100644

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

-autoload colors; colors;

-

-unset LSCOLORS

-export LS_COLORS='di=34:ln=35:so=32:pi=33:ex=31:bd=46;34:cd=43;34:su=41;30:sg=46;30:tw=42;30:ow=43;30'

deleted file mode 100644

@@ -1,40 +0,0 @@

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

-

-setopt noautomenu

-setopt complete_in_word

-setopt always_to_end

-

-unsetopt flowcontrol

-

-WORDCHARS=''

-

-autoload -U compinit

-compinit

-

-zmodload -i zsh/complist

-

-## case-insensitive (all),partial-word and then substring completion

-zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'

-

-zstyle ':completion:*' list-colors ''

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

-

-unsetopt MENU_COMPLETE

-#setopt AUTO_MENU

-

-# should this be in keybindings?

-bindkey -M menuselect '^o' accept-and-infer-next-history

-

-zstyle ':completion:*:*:*:*:*' menu yes select

-# zstyle ':completion:*:*:*:*:processes' force-list always

-

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

-zstyle ':completion:*:*:(ssh|scp):*:*' hosts `sed 's/^\([^ ,]*\).*$/\1/' ~/.ssh/known_hosts`

-

-

-#complete on history

-# zstyle ':completion:*:history-words' stop yes

-# zstyle ':completion:*:history-words' remove-all-dups yes

-# zstyle ':completion:*:history-words' list false

-# zstyle ':completion:*:history-words' menu yes

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,5 @@

+# Add yourself some shortcuts to projects you often work on

+# Example:

+#

+# brainstormr=/Users/robbyrussell/Projects/development/planetargon/brainstormr

+#

\ No newline at end of file

deleted file mode 100644

@@ -1,60 +0,0 @@

-## fixme, i duplicated this in xterms - oops

-function title {

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

-    # Use these two for GNU Screen:

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

-

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

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

-    # Use this one instead for XTerms:

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

-  fi

-}

-

-function precmd {

-  title zsh "$PWD"

-}

-

-function preexec {

-  emulate -L zsh

-  local -a cmd; cmd=(${(z)1})

-  title $cmd[1]:t "$cmd[2,-1]"

-}

-

-function remote_console() {

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

-}

-

-function zsh_stats() {

-  history | awk '{print $2}' | sort | uniq -c | sort -rn | head

-}

-

-function uninstall_oh_my_zsh() {

-  /bin/sh $ZSH/tools/uninstall.sh

-}

-

-function upgrade_oh_my_zsh() {

-  /bin/sh $ZSH/tools/upgrade.sh

-}

-

-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

-}

-

-function take() {

-  mkdir -p $1

-  cd $1

-}

-

-function tm() {

-  cd $1

-  mate $1

-}

deleted file mode 100644

@@ -1,25 +0,0 @@

-# Varables for themeing the git info prompt:

-# ZSH_THEME_GIT_PROMPT_PREFIX - Prefix at the very beginning of the prompt, before the branch name

-# ZSH_THEME_GIT_PROMPT_SUFFIX - At the very end of the prompt

-# ZSH_THEME_GIT_PROMPT_DIRTY  - Text to display if the branch is dirty

-# ZSH_THEME_GIT_PROMPT_CLEAN  - Text to display if the branch is clean

-

-ZSH_THEME_GIT_PROMPT_PREFIX="git:("

-ZSH_THEME_GIT_PROMPT_SUFFIX=")"

-ZSH_THEME_GIT_PROMPT_DIRTY="*"

-ZSH_THEME_GIT_PROMPT_CLEAN=""

-

-# get the name of the branch we are on

-function git_prompt_info() {

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

-  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"

-}

-

-parse_git_dirty () {

-  if [[ $(git status  | tail -n1) != "nothing to commit (working directory clean)" ]]; then

-    echo "$ZSH_THEME_GIT_PROMPT_DIRTY"

-  else

-    echo "$ZSH_THEME_GIT_PROMPT_CLEAN"

-  fi

-}

-

deleted file mode 100644

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

-#

-# Color grep results

-# Examples: http://rubyurl.com/ZXv

-#

-export GREP_OPTIONS='--color=auto'

-export GREP_COLOR='1;32'

\ No newline at end of file

deleted file mode 100644

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

-## Command history configuration

-#

-HISTFILE=$HOME/.zsh_history

-HISTSIZE=5000

-SAVEHIST=5000

-setopt hist_ignore_dups # ignore duplication command history list

-setopt share_history # share command history data

-

-setopt hist_verify

-setopt inc_append_history

-setopt extended_history

-setopt hist_expire_dups_first

deleted file mode 100644

@@ -1,41 +0,0 @@

-# TODO: Explain what some of this does..

-autoload -U compinit

-compinit

-

-bindkey -e

-bindkey '\ew' kill-region

-bindkey -s '\el' "ls\n"

-bindkey -s '\e.' "..\n"

-bindkey '^r' history-incremental-search-backward

-bindkey "^[[5~" up-line-or-history

-bindkey "^[[6~" down-line-or-history

-

-# make search up and down work, so partially type and hit up/down to find relevant stuff

-bindkey '^[[A' up-line-or-search

-bindkey '^[[B' down-line-or-search

-

-bindkey "^[[H" beginning-of-line

-bindkey "^[[1~" beginning-of-line

-bindkey "^[[F"  end-of-line

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

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

-

-

-# consider emacs keybindings:

-

-#bindkey -e  ## emacs key bindings

-#

-#bindkey '^[[A' up-line-or-search

-#bindkey '^[[B' down-line-or-search

-#bindkey '^[^[[C' emacs-forward-word

-#bindkey '^[^[[D' emacs-backward-word

-#

-#bindkey -s '^X^Z' '%-^M'

-#bindkey '^[e' expand-cmd-path

-#bindkey '^[^I' reverse-menu-complete

-#bindkey '^X^N' accept-and-infer-next-history

-#bindkey '^W' kill-region

-#bindkey '^I' complete-word

-## Fix weird sequence that rxvt produces

-#bindkey -s '^[[Z' '\t'

-#

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,47 @@

+alias pu='pushd'

+alias po='popd'

+

+alias sc='ruby script/console'

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

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

+

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

+alias .='pwd'

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

+

+alias _='sudo'

+alias ss='sudo su -'

+

+#alias g='grep -in'

+

+alias g='git'

+alias gst='git status'

+alias gl='git pull'

+alias gp='git push'

+alias gd='git diff | mate'

+alias gc='git commit -v'

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

+alias gb='git branch'

+alias gba='git branch -a'

+

+alias history='fc -l 1'

+

+alias ls='ls -F'

+alias ll='ls -alr'

+alias l='ls'

+alias ll='ls -l'

+alias sl=ls # often screw this up

+

+alias sgem='sudo gem'

+

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

+

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

+

+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 &'

+

+

+

new file mode 100644

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

+autoload colors; colors;

+

+unset LSCOLORS

+export LS_COLORS='di=34:ln=35:so=32:pi=33:ex=31:bd=46;34:cd=43;34:su=41;30:sg=46;30:tw=42;30:ow=43;30'

new file mode 100644

@@ -0,0 +1,40 @@

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

+

+setopt noautomenu

+setopt complete_in_word

+setopt always_to_end

+

+unsetopt flowcontrol

+

+WORDCHARS=''

+

+autoload -U compinit

+compinit

+

+zmodload -i zsh/complist

+

+## case-insensitive (all),partial-word and then substring completion

+zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'

+

+zstyle ':completion:*' list-colors ''

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

+

+unsetopt MENU_COMPLETE

+#setopt AUTO_MENU

+

+# should this be in keybindings?

+bindkey -M menuselect '^o' accept-and-infer-next-history

+

+zstyle ':completion:*:*:*:*:*' menu yes select

+# zstyle ':completion:*:*:*:*:processes' force-list always

+

+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"

+zstyle ':completion:*:*:(ssh|scp):*:*' hosts `sed 's/^\([^ ,]*\).*$/\1/' ~/.ssh/known_hosts`

+

+

+#complete on history

+# zstyle ':completion:*:history-words' stop yes

+# zstyle ':completion:*:history-words' remove-all-dups yes

+# zstyle ':completion:*:history-words' list false

+# zstyle ':completion:*:history-words' menu yes

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,60 @@

+## fixme, i duplicated this in xterms - oops

+function title {

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

+    # Use these two for GNU Screen:

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

+

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

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

+    # Use this one instead for XTerms:

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

+  fi

+}

+

+function precmd {

+  title zsh "$PWD"

+}

+

+function preexec {

+  emulate -L zsh

+  local -a cmd; cmd=(${(z)1})

+  title $cmd[1]:t "$cmd[2,-1]"

+}

+

+function remote_console() {

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

+}

+

+function zsh_stats() {

+  history | awk '{print $2}' | sort | uniq -c | sort -rn | head

+}

+

+function uninstall_oh_my_zsh() {

+  /bin/sh $ZSH/tools/uninstall.sh

+}

+

+function upgrade_oh_my_zsh() {

+  /bin/sh $ZSH/tools/upgrade.sh

+}

+

+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

+}

+

+function take() {

+  mkdir -p $1

+  cd $1

+}

+

+function tm() {

+  cd $1

+  mate $1

+}

new file mode 100644

@@ -0,0 +1,25 @@

+# Varables for themeing the git info prompt:

+# ZSH_THEME_GIT_PROMPT_PREFIX - Prefix at the very beginning of the prompt, before the branch name

+# ZSH_THEME_GIT_PROMPT_SUFFIX - At the very end of the prompt

+# ZSH_THEME_GIT_PROMPT_DIRTY  - Text to display if the branch is dirty

+# ZSH_THEME_GIT_PROMPT_CLEAN  - Text to display if the branch is clean

+

+ZSH_THEME_GIT_PROMPT_PREFIX="git:("

+ZSH_THEME_GIT_PROMPT_SUFFIX=")"

+ZSH_THEME_GIT_PROMPT_DIRTY="*"

+ZSH_THEME_GIT_PROMPT_CLEAN=""

+

+# get the name of the branch we are on

+function git_prompt_info() {

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

+  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"

+}

+

+parse_git_dirty () {

+  if [[ $(git status  | tail -n1) != "nothing to commit (working directory clean)" ]]; then

+    echo "$ZSH_THEME_GIT_PROMPT_DIRTY"

+  else

+    echo "$ZSH_THEME_GIT_PROMPT_CLEAN"

+  fi

+}

+

new file mode 100644

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

+#

+# Color grep results

+# Examples: http://rubyurl.com/ZXv

+#

+export GREP_OPTIONS='--color=auto'

+export GREP_COLOR='1;32'

\ No newline at end of file

new file mode 100644

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

+## Command history configuration

+HISTFILE=$HOME/.zsh_history

+HISTSIZE=10000

+SAVEHIST=10000

+

+setopt hist_ignore_dups # ignore duplication command history list

+setopt share_history # share command history data

+

+setopt hist_verify

+setopt inc_append_history

+setopt extended_history

+setopt hist_expire_dups_first

new file mode 100644

@@ -0,0 +1,41 @@

+# TODO: Explain what some of this does..

+autoload -U compinit

+compinit

+

+bindkey -e

+bindkey '\ew' kill-region

+bindkey -s '\el' "ls\n"

+bindkey -s '\e.' "..\n"

+bindkey '^r' history-incremental-search-backward

+bindkey "^[[5~" up-line-or-history

+bindkey "^[[6~" down-line-or-history

+

+# make search up and down work, so partially type and hit up/down to find relevant stuff

+bindkey '^[[A' up-line-or-search

+bindkey '^[[B' down-line-or-search

+

+bindkey "^[[H" beginning-of-line

+bindkey "^[[1~" beginning-of-line

+bindkey "^[[F"  end-of-line

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

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

+

+

+# consider emacs keybindings:

+

+#bindkey -e  ## emacs key bindings

+#

+#bindkey '^[[A' up-line-or-search

+#bindkey '^[[B' down-line-or-search

+#bindkey '^[^[[C' emacs-forward-word

+#bindkey '^[^[[D' emacs-backward-word

+#

+#bindkey -s '^X^Z' '%-^M'

+#bindkey '^[e' expand-cmd-path

+#bindkey '^[^I' reverse-menu-complete

+#bindkey '^X^N' accept-and-infer-next-history

+#bindkey '^W' kill-region

+#bindkey '^I' complete-word

+## Fix weird sequence that rxvt produces

+#bindkey -s '^[[Z' '\t'

+#

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,25 @@

+export PAGER=less

+export LC_CTYPE=en_US.UTF-8

+

+# speed stuff.

+

+#setopt no_beep

+setopt auto_cd

+setopt multios

+setopt cdablevarS

+

+if [[ x$WINDOW != x ]]

+then

+    SCREEN_NO="%B$WINDOW%b "

+else

+    SCREEN_NO=""

+fi

+

+PS1="%n@%m:%~%# "

+

+# Setup the prompt with pretty colors

+setopt prompt_subst

+

+export LSCOLORS="Gxfxcxdxbxegedabagacad"

+

+source "$ZSH/themes/$ZSH_THEME.zsh-theme"

new file mode 100644

@@ -0,0 +1,42 @@

+_rake_does_task_list_need_generating () {

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

+  else

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

+    changed=$(stat -f%m Rakefile)

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

+  fi

+}

+

+_rake () {

+  if [ -f Rakefile ]; then

+    if _rake_does_task_list_need_generating; then

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

+      rake --silent --tasks | cut -d " " -f 2 > .rake_tasks~

+    fi

+    compadd `cat .rake_tasks~`

+  fi

+}

+

+compctl -K _rake rake

+

+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

@@ -2,4 +2,7 @@

 # Load all of the config files in ~/oh-my-zsh that end in .zsh

 # TIP: Add files you don't want in git to .gitignore

-for config_file ($ZSH/*.zsh) source $config_file

+for config_file ($ZSH/lib/*.zsh) source $config_file

+

+# Load all of your custom configurations from custom/

+for config_file ($ZSH/custom/*.zsh) source $config_file

deleted file mode 100644

@@ -1,5 +0,0 @@

-# Add yourself some shortcuts to projects you often work on

-# Example:

-#

-# brainstormr=/Users/robbyrussell/Projects/development/planetargon/brainstormr

-#

\ No newline at end of file

deleted file mode 100644

@@ -1,25 +0,0 @@

-export PAGER=less

-export LC_CTYPE=en_US.UTF-8

-

-# speed stuff.

-

-#setopt no_beep

-setopt auto_cd

-setopt multios

-setopt cdablevarS

-

-if [[ x$WINDOW != x ]]

-then

-    SCREEN_NO="%B$WINDOW%b "

-else

-    SCREEN_NO=""

-fi

-

-PS1="%n@%m:%~%# "

-

-# Setup the prompt with pretty colors

-setopt prompt_subst

-

-export LSCOLORS="Gxfxcxdxbxegedabagacad"

-

-source "$ZSH/themes/$ZSH_THEME.zsh-theme"

deleted file mode 100644

@@ -1,42 +0,0 @@

-_rake_does_task_list_need_generating () {

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

-  else

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

-    changed=$(stat -f%m Rakefile)

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

-  fi

-}

-

-_rake () {

-  if [ -f Rakefile ]; then

-    if _rake_does_task_list_need_generating; then

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

-      rake --silent --tasks | cut -d " " -f 2 > .rake_tasks~

-    fi

-    compadd `cat .rake_tasks~`

-  fi

-}

-

-compdef _rake rake

-

-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

-}

-

-compdef _cap cap