From 5398424925aa57f657547e35660c3b6d75458e6e Mon Sep 17 00:00:00 2001
From: Haak Saxberg <haak.erling@gmail.com>
Date: Fri, 2 Aug 2013 03:37:04 -0700
Subject: [PATCH] disable powerline for shell and vim (for now), have a pretty
 good alternative statusline

---
 vim-files/.vimrc | 79 ++++++++++++++++++++++++++++++++++++++++--------
 zsh-files/.zshrc |  6 ++--
 2 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/vim-files/.vimrc b/vim-files/.vimrc
index 36bb965..97c39fb 100644
--- a/vim-files/.vimrc
+++ b/vim-files/.vimrc
@@ -16,8 +16,17 @@ let g:Powerline_symbols = 'fancy'
 set nocompatible
 set laststatus=2
 
-map <silent> <leader>V :source ~/.vimrc<CR>:filetype detect<CR>:exe ":echo 'vimrc reloaded'"<CR>
+if v:version >= 703
+	    "undo settings
+	set undodir=~/.vim/undofiles
+	set undofile
 
+	set colorcolumn=+1 "mark the ideal max text width
+endif
+
+
+set backspace=indent,eol,start
+set showmode
 set number
 set numberwidth=1
 set background=dark
@@ -29,7 +38,6 @@ set matchpairs+=<:>
 
 set listchars=tab:>-,eol:$,trail:-,precedes:<,extends:>
 set list
-set wrap
 
 
 """ Searching and Patterns
@@ -38,26 +46,71 @@ set smartcase
 set smarttab
 set hlsearch
 
+""" Folding
+set nofoldenable
+
+
+""" Statusline
+set statusline=   " clear the statusline for when vimrc is reloaded
+set statusline =%#identifier#
+set statusline+=%{fugitive#statusline()}
+set statusline+=[%f]    "tail of the filename
+set statusline+=%*
+
+"display a warning if fileformat isnt unix
+set statusline+=%#warningmsg#
+set statusline+=%{&ff!='unix'?'['.&ff.']':''}
+set statusline+=%*
+
+"display a warning if file encoding isnt utf-8
+set statusline+=%#warningmsg#
+set statusline+=%{(&fenc!='utf-8'&&&fenc!='')?'['.&fenc.']':''}
+set statusline+=%*
+
+set statusline+=%h      "help file flag
+set statusline+=%y      "filetype
+
+"read only flag
+set statusline+=%#identifier#
+set statusline+=%r
+set statusline+=%*
+
+"modified flag
+set statusline+=%#identifier#
+set statusline+=%m
+set statusline+=%*
+set statusline+=%{StatuslineTrailingSpaceWarning()}
+"recalculate the trailing whitespace warning when idle, and after saving
+autocmd cursorhold,bufwritepost * unlet! b:statusline_trailing_space_warning
+
+"return '[\s]' if trailing white space is detected return '' otherwise
+function! StatuslineTrailingSpaceWarning()
+	if !exists("b:statusline_trailing_space_warning")
+
+		if !&modifiable
+			let b:statusline_trailing_space_warning = ''
+			return b:statusline_trailing_space_warning
+		endif
+
+		if search('\s\+$', 'nw') != 0
+			let b:statusline_trailing_space_warning = '[\s]'
+		else
+			let b:statusline_trailing_space_warning = ''
+		endif
+	endif
+	return b:statusline_trailing_space_warning
+endfunction
 
 """ Powerline
-set rtp+=~/.vim/bundle/powerline/powerline/bindings/vim
+""" set rtp+=~/.vim/bundle/powerline/powerline/bindings/vim
 
 
 """ Handy remaps
 :noremap ; :
 :inoremap jj <Esc>
 nnoremap <silent> <F8> :TlistToggle<CR>
+map <silent> <leader>V :source ~/.vimrc<CR>:filetype detect<CR>:exe ":echo 'vimrc reloaded'"<CR>
 
 """ Use the mouse
 set mouse=a
 
-""" Whitspace woes?
-function! TrimWhiteSpace()
-	%s/\s*$//
-	''
-endfunction
-
-autocmd FileWritePre * :call TrimWhiteSpace()
-autocmd FileAppendPre * :call TrimWhiteSpace()
-autocmd FilterWritePre * :call TrimWhiteSpace()
-autocmd BufWritePre * :call TrimWhiteSpace()
diff --git a/zsh-files/.zshrc b/zsh-files/.zshrc
index 81d85a1..e6a7315 100644
--- a/zsh-files/.zshrc
+++ b/zsh-files/.zshrc
@@ -47,6 +47,6 @@ source $ZSH/oh-my-zsh.sh
 # Customize to your needs...
 
 # enable powerline
-source ~/.vim/bundle/powerline/powerline/bindings/zsh/powerline.zsh
-export PATH=~/.vim/bundle/powerline/scripts:$PATH
-export PYTHONPATH=~/.vim/bundle/powerline:$PYTHONPATH
+# source ~/.vim/bundle/powerline/powerline/bindings/zsh/powerline.zsh
+# export PATH=~/.vim/bundle/powerline/scripts:$PATH
+# export PYTHONPATH=~/.vim/bundle/powerline:$PYTHONPATH