merge master branch.

zsh/color-man-pages.zsh

@@ -0,0 +1,10 @@
+# Less Colors for Man Pages
+# http://linuxtidbits.wordpress.com/2009/03/23/less-colors-for-man-pages/
+export LESS_TERMCAP_mb=$'\E[01;31m'       # begin blinking
+export LESS_TERMCAP_md=$'\E[01;38;5;74m'  # begin bold
+export LESS_TERMCAP_me=$'\E[0m'           # end mode
+export LESS_TERMCAP_se=$'\E[0m'           # end standout-mode
+export LESS_TERMCAP_so=$'\E[38;33;246m'   # begin standout-mode - info box
+export LESS_TERMCAP_ue=$'\E[0m'           # end underline
+export LESS_TERMCAP_us=$'\E[04;38;5;146m' # begin underline
+

zsh/fasd.zsh

@@ -0,0 +1,13 @@
+# Initialize fasd (https://github.com/clvv/fasd)
+eval "$(fasd --init posix-alias zsh-hook)"
+
+# aliases
+
+# jump to recently used items
+alias a='fasd -a' # any
+alias s='fasd -s' # show / search / select
+alias d='fasd -d' # directory
+alias f='fasd -f' # file
+alias z='fasd_cd -d' # cd, same functionality as j in autojump
+alias v='f -e vim' # quick opening files with vim
+

zsh/git.zsh

@@ -0,0 +1,6 @@
+# Speed up git completion
+# http://talkings.org/post/5236392664/zsh-and-slow-git-completion
+__git_files () {
+  _wanted files expl 'local files' _files
+}
+

zsh/path.zsh

@@ -0,0 +1,3 @@
+# path
+export PATH=/usr/local/bin:$PATH
+

zsh/zsh-aliases.zsh

@@ -15,3 +15,4 @@ alias -g G='| grep' # now you can do: ls foo G something
 # usage: fn foo 
 # to find all files containing 'foo' in the name
 function fn() { ls **/*$1* }
+

zsh/zshrc

@@ -17,8 +17,9 @@ if [[ -d $HOME/.oh-my-zsh ]]; then
   # Set name of the theme to load.
   ZSH_THEME="robbyrussell"
 
-  # Default plugins.
-  plugins=(git ruby)
+  # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+  # Example format: plugins=(rails git textmate ruby lighthouse)
+  plugins=(vi-mode git rvm ruby rails autojump bundler gem gnu-utils heroku rake redis-cli zsh-syntax-highlighting history-substring-search)
 
   # source every zsh file in user's custom/zsh/before. This is useful for setting theme and plugins.
   if [[ -d $yadr/custom/zsh/ ]]; then
@@ -63,10 +64,3 @@ if [[ -a ~/.secrets ]] then
   source ~/.secrets
 fi
 
-# Speed up git completion
-# http://talkings.org/post/5236392664/zsh-and-slow-git-completion
-__git_files () {
-  _wanted files expl 'local files' _files
-}
-
-export PATH=/usr/local/bin:$PATH

zsh/zvm.zsh

@@ -0,0 +1,4 @@
+# Use zmv, which is amazing
+autoload -U zmv
+alias zmv="noglob zmv -W"
+