Merge branch 'master' of https://github.com/cadusk/oh-my-zsh

Conflicts:
	.gitignore
	templates/zshrc.zsh-template
	tools/install.sh

.gitignore

@@ -2,4 +2,5 @@ locals.zsh
 log/.zsh_history
 projects.zsh
 *.swp
+*.un~
 cache/

README.textile

@@ -13,18 +13,18 @@ You can install this via the command line with either `curl` or `wget`.
 
 h4. via `curl`
 
-@curl -L https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh@
+@curl -L https://github.com/stibbons/oh-my-zsh/raw/master/tools/install.sh | sh@
 
 h4. via `wget`
 
-@wget --no-check-certificate https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
+@wget --no-check-certificate https://github.com/stibbons/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
 
 h3. The manual way
 
 
 1. Clone the repository
 
-  @git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@
+  @git clone git://github.com/stibbons/oh-my-zsh.git ~/.oh-my-zsh@
 
 2. *OPTIONAL* Backup your existing ~/.zshrc file
 
@@ -50,7 +50,7 @@ h2. Usage
 * enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)
 ** example: @plugins=(git osx ruby)@
 * Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@.
-** Take a look at the "current themes":https://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with _Oh My Zsh_.
+** Take a look at the "current themes":https://wiki.github.com/stibbons/oh-my-zsh/themes that come bundled with _Oh My Zsh_.
 * much much more...  take a look at @lib/@ what _Oh My Zsh_ offers...
 
 h2. Useful
@@ -84,6 +84,6 @@ h2. Contributors
 
 This project wouldn't exist without all of our awesome users and contributors.
 
-* "View our growing list of contributors":https://github.com/robbyrussell/oh-my-zsh/contributors
+* "View our growing list of contributors":https://github.com/stibbons/oh-my-zsh/contributors
 
 Thank you so much!

lib/aliases.zsh

@@ -23,6 +23,14 @@ alias please='sudo'
 # Show history
 alias history='fc -l 1'
 
+# Enable ls colors
+LS_OPTIONS='-hF'
+if [ "$DISABLE_LS_COLORS" != "true" ]
+then
+  # Find the option for using colors in ls, depending on the version: Linux or BSD
+  ls --color -d . &>/dev/null 2>&1 && alias ls="ls --color=tty $LS_OPTIONS" || alias ls="ls -G $LS_OPTIONS"
+fi
+
 # List direcory contents
 alias lsa='ls -lah'
 alias l='ls -lA1'
@@ -31,4 +39,3 @@ alias la='ls -lA'
 alias sl=ls # often screw this up
 
 alias afind='ack-grep -il'
-

lib/theme-and-appearance.zsh

@@ -3,13 +3,6 @@ autoload colors; colors;
 export LSCOLORS="Gxfxcxdxbxegedabagacad"
 #export LS_COLORS
 
-# Enable ls colors
-if [ "$DISABLE_LS_COLORS" != "true" ]
-then
-  # Find the option for using colors in ls, depending on the version: Linux or BSD
-  ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G'
-fi
-
 #setopt no_beep
 setopt auto_cd
 setopt multios

plugins/pythonbrew/pythonbrew.plugin.zsh

@@ -0,0 +1,2 @@
+# Initialize pythonbrew if installed
+[[ -s $HOME/.pythonbrew/etc/bashrc ]] && source $HOME/.pythonbrew/etc/bashrc

plugins/tmux/tmux.plugin.zsh

@@ -0,0 +1 @@
+alias tmux="tmux -u2"

plugins/vim-override/vim-override.plugin.zsh

@@ -0,0 +1,7 @@
+# try to replace OSX's default vim by MacVim's version
+RECENTVIM=`test -e /usr/local/Cellar/macvim && find /usr/local/Cellar/macvim -name Vim`
+
+# if mode indicator wasn't setup by theme, define default
+if [[ "$OSTYPE" == darwin* && -e $RECENTVIM ]]; then
+  alias vim="$RECENTVIM"
+fi

templates/zshrc-linux.zsh

@@ -0,0 +1,43 @@
+# Path to your oh-my-zsh configuration.
+ZSH=$HOME/.oh-my-zsh
+
+# Set name of the theme to load.
+# Look in ~/.oh-my-zsh/themes/
+# Optionally, if you set this to "random", it'll load a random theme each
+# time that oh-my-zsh is loaded.
+ZSH_THEME="stibbons"
+
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+# Set to this to use case-sensitive completion
+# CASE_SENSITIVE="true"
+
+# Comment this out to disable weekly auto-update checks
+DISABLE_AUTO_UPDATE="false"
+
+# Uncomment following line if you want to disable colors in ls
+# DISABLE_LS_COLORS="true"
+
+# Uncomment following line if you want to disable autosetting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment following line if you want red dots to be displayed while waiting for completion
+COMPLETION_WAITING_DOTS="true"
+
+# Virtualenvwrapper plugin - Disable directory name discovery
+DISABLE_VENV_CD="true"
+
+# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+plugins=(git python pythonbrew repo cp buildbot rsync git-remote-branch command-not-found debian dircycle encode64 lol extract launch_trial common-aliases)
+
+source $ZSH/oh-my-zsh.sh
+# source `which virtualenvwrapper.sh`
+
+# Customize to your needs...
+
+if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
+unsetopt correctall

templates/zshrc-mac.zsh

@@ -0,0 +1,45 @@
+# Path to your oh-my-zsh configuration.
+ZSH=$HOME/.oh-my-zsh
+
+# Set name of the theme to load.
+# Look in ~/.oh-my-zsh/themes/
+# Optionally, if you set this to "random", it'll load a random theme each
+# time that oh-my-zsh is loaded.
+ZSH_THEME="stibbons"
+
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+# Set to this to use case-sensitive completion
+# CASE_SENSITIVE="true"
+
+# Comment this out to disable weekly auto-update checks
+DISABLE_AUTO_UPDATE="true"
+
+# Uncomment following line if you want to disable colors in ls
+# DISABLE_LS_COLORS="true"
+
+# Uncomment following line if you want to disable autosetting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment following line if you want red dots to be displayed while waiting for completion
+COMPLETION_WAITING_DOTS="true"
+
+# Virtualenvwrapper plugin - Disable directory name discovery
+DISABLE_VENV_CD="true"
+
+# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+plugins=(git tmux python pythonbrew vim-override virtualenvwrapper)
+
+source $ZSH/oh-my-zsh.sh
+# source `which virtualenvwrapper.sh`
+
+# Customize to your needs...
+if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
+if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
+
+if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
+unsetopt correctall

templates/zshrc.zsh-template

@@ -5,7 +5,7 @@ ZSH=$HOME/.oh-my-zsh
 # Look in ~/.oh-my-zsh/themes/
 # Optionally, if you set this to "random", it'll load a random theme each
 # time that oh-my-zsh is loaded.
-ZSH_THEME="robbyrussell"
+ZSH_THEME="stibbons"
 
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
@@ -15,7 +15,7 @@ ZSH_THEME="robbyrussell"
 # CASE_SENSITIVE="true"
 
 # Comment this out to disable bi-weekly auto-update checks
-# DISABLE_AUTO_UPDATE="true"
+DISABLE_AUTO_UPDATE="true"
 
 # Uncomment to change how many often would you like to wait before auto-updates occur? (in days)
 # export UPDATE_ZSH_DAYS=13
@@ -32,10 +32,19 @@ ZSH_THEME="robbyrussell"
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git)
+plugins=(git python pythonbrew vim-override)
 
 source $ZSH/oh-my-zsh.sh
+source `which virtualenvwrapper.sh`
 
 zstyle ':completion:*:descriptions' format '%B%d%b'
 
 # Customize to your needs...
+if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
+if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
+
+if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
+unsetopt correctall
+
+# Themes override ls alias from aliases.zsh
+alias tmux='tmux -u2'