From 9e4a4a3c22c922aa22b3cf2c3795778fb3cf67d8 Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Sun, 27 Jul 2014 14:30:39 -0400
Subject: [PATCH] fix vimrc

---
 .vim/filetype.vim | 17 +++++++++--------
 .vimrc            | 15 ++++++++++-----
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.vim/filetype.vim b/.vim/filetype.vim
index 5269fb1..28530e1 100644
--- a/.vim/filetype.vim
+++ b/.vim/filetype.vim
@@ -29,14 +29,15 @@ augroup END
 
 au! BufNewFile,BufRead *.pde setf arduino
 
-"augroup org
-  "" leave these as is:
-  "au! BufRead,BufWrite,BufWritePost,BufNewFile *.org 
-  "au BufRead,BufNewFile *.org            call org#SetOrgFileType()
-  "au BufRead *.org :PreLoadTags
-  "au BufWrite *.org :PreWriteTags
-  "au BufWritePost *.org :PostWriteTags
-"augroup END
+augroup org
+  " leave these as is:
+  au! BufRead,BufWrite,BufWritePost,BufNewFile *.org 
+  au BufRead,BufNewFile *.org            call org#SetOrgFileType()
+  au BufRead,BufNewFile *.org            :GitGutterDisable
+  au BufRead *.org :PreLoadTags
+  au BufWrite *.org :PreWriteTags
+  au BufWritePost *.org :PostWriteTags
+augroup END
 
 au BufNewFile,BufRead motd.public,/tmp/motd.public.r.* setf motd
 
diff --git a/.vimrc b/.vimrc
index bce6364..486dc05 100644
--- a/.vimrc
+++ b/.vimrc
@@ -24,6 +24,7 @@ set expandtab
 " I like comma instead of slash, but that probably comes from playing
 " Nethack and Angband
 let mapleader = ","
+let maplocalleader = "\\"
 
 " Set 'smart' things in Vim
 " Search case insensitive, unless it contains Uppercase letters
@@ -78,10 +79,14 @@ autocmd InsertLeave * if pumvisible() == 0|pclose|endif
 set rtp+=~/.vim/bundle/Vundle.vim
 call vundle#begin()
 
+Plugin 'gmarik/Vundle.vim'
+Plugin 'conque_2.3'
+Plugin 'eclim'
 Plugin 'vim-scripts/DrawIt'
+Plugin 'tpope/vim-speeddating'
 Plugin 'vim-scripts/EasyGrep'
 Plugin 'chrisbra/NrrwRgn'
-Plugin 'jceb/vim-orgmode'
+Plugin 'hsitz/VimOrganizer'
 Plugin 'mileszs/ack.vim'
 Plugin 'mattn/calendar-vim'
 Plugin 'vim-scripts/fish-syntax'
@@ -129,13 +134,13 @@ autocmd FileType python set tags+=$HOME/.vim/tags/python.ctags
 "autocmd FileType python call SuperTabSetCompletionType("<C-X><C-O>")
 
 " Set filetype for VimOrganizer
-"au! BufRead,BufWrite,BufWritePost,BufNewFile *.org 
-"au BufEnter *.org            call org#SetOrgFileType()
+au! BufRead,BufWrite,BufWritePost,BufNewFile *.org 
+au BufEnter *.org            call org#SetOrgFileType()
 
 "au! BufRead,BufWrite,BufWritePost,BufNewFile *.org
 "au BufEnter *.org call org#SetOrgFileType()
-"command! OrgCapture :call org#CaptureBuffer()
-"command! OrgCaptureFile :call org#OpenCaptureFile()
+command! OrgCapture :call org#CaptureBuffer()
+command! OrgCaptureFile :call org#OpenCaptureFile()
 
 " Cull trailing whitespace for all files.
 autocmd BufWritePre * :call AutoTrimWhitespace()