From 20498b47b75f33a0d8c9cdac00cb021ce97f9caa Mon Sep 17 00:00:00 2001
From: Matt Cordial <matt.cordial@gmail.com>
Date: Thu, 28 Jun 2012 10:53:28 -0700
Subject: [PATCH] Added vim-powerline and associated settings.

---
 .gitmodules               | 3 +++
 .tmux.conf                | 1 +
 .vim/bundle/vim-powerline | 1 +
 .vimrc                    | 9 ++++++++-
 .zshrc                    | 5 +++--
 5 files changed, 16 insertions(+), 3 deletions(-)
 create mode 160000 .vim/bundle/vim-powerline

diff --git a/.gitmodules b/.gitmodules
index 064c341..ccefdc4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,3 +40,6 @@
 [submodule ".vim/bundle/tagbar"]
 	path = .vim/bundle/tagbar
 	url = git://github.com/majutsushi/tagbar.git
+[submodule ".vim/bundle/vim-powerline"]
+	path = .vim/bundle/vim-powerline
+	url = git://github.com/Lokaltog/vim-powerline.git
diff --git a/.tmux.conf b/.tmux.conf
index 00813d2..87ac551 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,2 +1,3 @@
 setw -g mode-keys vi
 set -g status-keys vi
+set -g default-terminal "xterm-256color"
diff --git a/.vim/bundle/vim-powerline b/.vim/bundle/vim-powerline
new file mode 160000
index 0000000..7f53b5c
--- /dev/null
+++ b/.vim/bundle/vim-powerline
@@ -0,0 +1 @@
+Subproject commit 7f53b5c3919bde9a4259d0c725d453ef2337a4ed
diff --git a/.vimrc b/.vimrc
index a1a76b3..80f24ef 100644
--- a/.vimrc
+++ b/.vimrc
@@ -7,9 +7,10 @@ let mapleader = ","
 
 syntax on
 colorscheme jellybeans
+set t_Co=256 " Explicitly tell vim that the terminal supports 256 colors
 
 highlight clear SpellBad
-highlight SpellBad cterm=underline ctermfg=green 
+highlight SpellBad cterm=underline ctermfg=green
 
 set nocompatible
 set autoindent
@@ -29,6 +30,8 @@ set backupdir=~/.vim/sessions//
 set directory=~/.vim/sessions//
 set pastetoggle=<F2>
 set backspace=indent,eol,start
+set encoding=utf-8
+set laststatus=2   " Always show the statusline
 
 nmap <silent> <c-h> :noh<CR>
 nmap <silent> <c-j> :bn<CR>
@@ -40,8 +43,12 @@ nmap <leader>s :Gstatus<CR>
 nmap <leader>b :LustyJuggler<CR>
 
 autocmd FileType html set ft=htmldjango.html " For SnipMate
+autocmd FileType rst set tw=80
+autocmd BufWritePre * :%s/\s\+$//e " strip trailing whitespace
 au BufNewFile,BufReadPost *.coffee,Cakefile,*.eco setl shiftwidth=2 expandtab softtabstop=2
 
+let g:Powerline_symbols = 'fancy'
+
 " Add the virtualenv's site-packages to vim path
 py << EOF
 import os.path
diff --git a/.zshrc b/.zshrc
index 583cac6..4f74c77 100644
--- a/.zshrc
+++ b/.zshrc
@@ -29,7 +29,7 @@ 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 python pip django compleat node npm redis-cli)
+plugins=(git python pip django compleat node npm redis-cli virtualenvwrapper)
 
 source $ZSH/oh-my-zsh.sh
 
@@ -37,6 +37,7 @@ source $ZSH/oh-my-zsh.sh
 bindkey -e
 export PAGER='less'
 export EDITOR='vim'
+export TERM="xterm-256color"
 
 export M2_HOME=/usr/local/maven
 export M2=$M2_HOME/bin
@@ -52,4 +53,4 @@ export PIP_RESPECT_VIRTUALENV=true
 # source virtualenvwrapper config so it is available at startup
 . virtualenvwrapper.sh
 
-alias static="cd /home/mcordial/repo/asurepo/repo/static/src"
+alias cdstatic="cd /home/mcordial/repo/asurepo/repo/static/src"