Conflicts:
	.gitignore
	templates/zshrc.zsh-template
	tools/install.sh
This commit is contained in:
Gaetan Semet 2013-03-04 16:54:51 +01:00
commit baa421cbae
10 changed files with 124 additions and 16 deletions

View file

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