Merged official branch changes.

This commit is contained in:
Carlos Cardoso 2013-06-03 22:12:29 -03:00
commit ee3267f30d
163 changed files with 8009 additions and 553 deletions

View file

@ -35,10 +35,12 @@ DISABLE_VENV_CD="1"
plugins=(git tmux debian 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
[ "$TERM" = "xterm" ] && TERM="xterm-256color"

View file

@ -17,22 +17,32 @@ ZSH_THEME="mh"
# Comment this out to disable weekly auto-update checks
DISABLE_AUTO_UPDATE="true"
# Uncomment to change how often before auto-updates occur? (in days)
# export UPDATE_ZSH_DAYS=13
# 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 to disable command autocorrection
DISABLE_CORRECTION="true"
# Uncomment following line if you want red dots to be displayed while waiting for completion
# COMPLETION_WAITING_DOTS="true"
# Uncomment following line if you want to disable marking untracked files under
# VCS as dirty. This makes repository status check for large repositories much,
# much faster.
# DISABLE_UNTRACKED_FILES_DIRTY="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 vim-override)
plugins=(git)
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
@ -40,6 +50,3 @@ 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'