Stealing a bunch of stuff from nvie.
| author |
Steve Losh <steve@stevelosh.com> |
| date |
Mon, 15 Aug 2011 17:12:09 -0400 |
| parents |
cd71b178d289
|
| children |
a03035324ee5
|
| branches/tags |
(none) |
| files |
vim/.vimrc |
Changes
--- a/vim/.vimrc Mon Aug 15 16:56:51 2011 -0400
+++ b/vim/.vimrc Mon Aug 15 17:12:09 2011 -0400
@@ -101,6 +101,9 @@
set background=dark
colorscheme molokai
+" Highlight VCS conflict markers
+match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'
+
" }}}
" }}}
@@ -492,7 +495,7 @@
nnoremap <silent> <F6> :YRShow<cr>
" Formatting, TextMate-style
-nnoremap <leader>q gqip
+nnoremap Q gqip
" Easier linewise reselection
nnoremap <leader>v V`]
@@ -615,6 +618,7 @@
au Filetype nerdtree setlocal nolist
+let NERDTreeHighlightCursorline=1
let NERDTreeIgnore=['.vim$', '\~$', '.*\.pyc$', 'pip-log\.txt$', 'whoosh_index', 'xapian_index', '.*.pid', 'monitor.py', '.*-fixtures-.*.json', '.*\.o$', 'db.db']
" }}}