Add vimdiff for mercurial.
author |
Steve Losh <steve@stevelosh.com> |
date |
Fri, 14 May 2010 19:36:29 -0400 |
parents |
3a5a19f5dd1f |
children |
e261bb2a24e2 |
export ZSH=$HOME/lib/oh-my-zsh
export ZSH_THEME="prose"
export DISABLE_AUTO_UPDATE="true"
source $ZSH/oh-my-zsh.sh
# Custom options -------------------------------------------------------------
unsetopt promptcr
# Useful aliases -------------------------------------------------------------
alias j='z'
alias fab='fab -i ~/.ssh/stevelosh'
alias tweets-stevelosh='~/src/grabtweets/grabtweets.py -p ~/Documents/tweets/stevelosh'
alias oldgcc='export CC=/usr/bin/gcc-4.0'
# Environment variables ------------------------------------------------------
export EDITOR='vim'
export PATH="/usr/local/bin:/usr/local/sbin:$HOME/lib/fmscripts:$HOME/bin:$PATH"
export PATH="$HOME/.gem/ruby/1.8/bin:${PATH}"
export PATH="/opt/subversion/bin:${PATH}"
export PATH="${PATH}:/usr/local/Cellar/PyPi/3.6/bin"
export PATH="${PATH}:/usr/local/Cellar/python/2.6.4/bin"
export WORKON_HOME="${HOME}/lib/virtualenvs"
export GREP_OPTIONS='--color=auto'
export HISTSIZE=1000
export HISTFILESIZE=1000
export HISTCONTROL=erasedups
export PYTHONSTARTUP="$HOME/.pythonrc.py"
export COMMAND_MODE=unix2003
export R_LIBS="$HOME/lib/r"
export BAT_CHARGE="$HOME/bin/batcharge.py"
export RUBYOPT=rubygems
# Mercurial variables --------------------------------------------------------
export PATH="$HOME/lib/hg/hg-stable:$PATH"
export PYTHONPATH="$HOME/lib/hg/hg-stable:/usr/local/lib/python2.6/site-packages:$PYTHONPATH"
# Extra shell extensions like z and tab completion for Mercurial -------------
source ~/lib/z/z.sh
source ~/lib/python/virtualenvwrapper/virtualenvwrapper.sh
# See ------------------------------------------------------------------------
export PYTHONPATH="$HOME/lib/python/see:$PYTHONPATH"
# Pre-Prompt Command ---------------------------------------------------------
function precmd () {
z --add "$(pwd -P)"
title zsh "$(pwd)"
}