Merged upstream configuration.

This commit is contained in:
Carlos Cardoso 2013-12-17 01:26:27 -02:00
commit 0fb7e54b90
90 changed files with 2485 additions and 327 deletions

View file

@ -33,14 +33,21 @@ DISABLE_VENV_CD="1"
# 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 postgres tmux python pythonbrew vim-override virtualenvwrapper)
plugins=(git postgres python pythonbrew vim-override virtualenvwrapper)
# User configuration
export PATH=$HOME/bin:/usr/local/bin:$PATH
export EDITOR='vim'
# tmux configuration
export ZSH_TMUX_AUTOCONNECT=false
export ZSH_TMUX_ITERM2=true
alias ta='tmux attach -t'
alias tl='tmux list-session'
alias ts='tmux new-session'
# Compilation flags
# export ARCHFLAGS="-arch x86_64"
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

View file

@ -37,6 +37,11 @@ DISABLE_CORRECTION="true"
# much faster.
# DISABLE_UNTRACKED_FILES_DIRTY="true"
# Uncomment following line if you want to shown in the command execution time stamp
# in the history command output. The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|
# yyyy-mm-dd
# HIST_STAMPS="mm/dd/yyyy"
# 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)
@ -44,9 +49,20 @@ plugins=(git)
source $ZSH/oh-my-zsh.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
# User configuration
if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
unsetopt correctall
export PATH=$HOME/bin:/usr/local/bin:$PATH
# export MANPATH="/usr/local/man:$MANPATH"
# # Preferred editor for local and remote sessions
# if [[ -n $SSH_CONNECTION ]]; then
# export EDITOR='vim'
# else
# export EDITOR='mvim'
# fi
# Compilation flags
# export ARCHFLAGS="-arch x86_64"
# ssh
# export SSH_KEY_PATH="~/.ssh/dsa_id"