Merge branch 'master' of tardis:dotfiles

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index fcc4ff9c8a819a870899d60e87e25870a5c57404..14ebec3c88ced741c33610555cc35bf75507eb83 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -14,18 +14,20 @@ call vundle#rc('$XDG_DATA_HOME/vim')
 
 Plugin 'gmarik/vundle'
 
 
 Plugin 'gmarik/vundle'
 

+Plugin 'airblade/vim-gitgutter'

 Plugin 'bling/vim-airline'
 Plugin 'elzr/vim-json'
 Plugin 'bling/vim-airline'
 Plugin 'elzr/vim-json'

-Plugin 'rking/ag.vim'

 Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex'
 Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex'

+Plugin 'junegunn/vim-easy-align'

 Plugin 'kien/ctrlp.vim'
 Plugin 'kshenoy/vim-signature'
 Plugin 'majutsushi/tagbar'
 Plugin 'kien/ctrlp.vim'
 Plugin 'kshenoy/vim-signature'
 Plugin 'majutsushi/tagbar'

+Plugin 'rking/ag.vim'

 Plugin 'scrooloose/nerdtree'
 Plugin 'scrooloose/syntastic'
 Plugin 'scrooloose/nerdtree'
 Plugin 'scrooloose/syntastic'

+Plugin 'sirver/ultisnips'

 Plugin 'sjl/gundo.vim'
 Plugin 'tomtom/tcomment_vim'
 Plugin 'sjl/gundo.vim'
 Plugin 'tomtom/tcomment_vim'

-Plugin 'tpope/vim-endwise'

 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-repeat'
 Plugin 'tpope/vim-surround'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-repeat'
 Plugin 'tpope/vim-surround'


@@ -41,12 +43,13 @@ Plugin 'derekwyatt/vim-fswitch'
 " Plugin 'jalcine/cmake.vim'
 " Plugin 'powerman/vim-plugin-viewdoc'
 
 " Plugin 'jalcine/cmake.vim'
 " Plugin 'powerman/vim-plugin-viewdoc'
 

-Plugin 'airblade/vim-gitgutter'
+" endwise needs to be after delimitmate

 Plugin 'raimondi/delimitmate'
 Plugin 'raimondi/delimitmate'

-Plugin 'sirver/ultisnips'
+Plugin 'tpope/vim-endwise'

 Plugin 'lokaltog/vim-easymotion'
 Plugin 'lokaltog/vim-easymotion'

-Plugin 'junegunn/vim-easy-align'

 Plugin 'chrisbra/checkattach'
 Plugin 'chrisbra/checkattach'

+Plugin 'klen/python-mode'
+Plugin 'nathanaelkane/vim-indent-guides'

 
 " remove entries first
 set runtimepath -=$HOME/.vim
 
 " remove entries first
 set runtimepath -=$HOME/.vim


@@ -391,8 +394,9 @@ let g:airline_powerline_fonts = 1
 " checkattach {{{2
 let g:checkattach_filebrowser = 'ranger'
 
 " checkattach {{{2
 let g:checkattach_filebrowser = 'ranger'
 

-" Gundo {{{2
-nnoremap <F7> :GundoToggle<CR>
+" delimitmate {{{2
+let delimitMate_expand_cr = 2
+let g:delimitMate_expand_space = 1

 
 " fswitch {{{2
 nnoremap <silent> <Leader>ff :FSHere<CR>
 
 " fswitch {{{2
 nnoremap <silent> <Leader>ff :FSHere<CR>


@@ -412,6 +416,16 @@ nnoremap <silent> <leader>gc :tab Gcommit -v<CR>
 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gb :Gblame<cr>
 
 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gb :Gblame<cr>
 

+" Gundo {{{2
+nnoremap <F7> :GundoToggle<CR>
+
+" indent-guides {{{2
+let g:indent_guides_default_mapping = 0
+let g:indent_guides_guide_size = 1
+nmap <silent> cog <Plug>IndentGuidesToggle
+nmap <silent> [og <Plug>IndentGuidesEnable
+nmap <silent> ]og <Plug>IndentGuidesDisable
+

 " NERDTree {{{2
 " open/close NERDTree with \e
 nmap <Leader>e :NERDTreeToggle<CR>
 " NERDTree {{{2
 " open/close NERDTree with \e
 nmap <Leader>e :NERDTreeToggle<CR>


@@ -421,6 +435,11 @@ let NERDTreeMapActivateNode='l'
 " close vim if only NERDTree is open
 autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
 
 " close vim if only NERDTree is open
 autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
 

+" python-mode {{{2
+
+let g:pymode_rope_completion = 0
+let g:pymode_folding = 1
+

 " synastic {{{2
 let g:syntastic_enable_highlighting = 0
 let g:syntastic_error_symbol='E'
 " synastic {{{2
 let g:syntastic_enable_highlighting = 0
 let g:syntastic_error_symbol='E'


@@ -512,19 +531,3 @@ nnoremap <silent> <Leader>s :call ToggleSpell()<CR>
 nnoremap <silent> <Leader>S :call SwitchSpell()<CR>
 " fix spelling with first choice
 nnoremap <Leader>f 1z=
 nnoremap <silent> <Leader>S :call SwitchSpell()<CR>
 " fix spelling with first choice
 nnoremap <Leader>f 1z=

-
-" Toggle line numbers {{{2
-function! g:ToggleNumber()
-    if !exists("b:relanum")
-        let b:relanum=1
-    endif
-    if &l:number
-        let b:relanum = &relativenumber
-        setlocal nonumber norelativenumber
-    else
-        let &l:relativenumber = b:relanum
-        setlocal number
-    endif
-endfunction
-nnoremap <silent><leader>n :call g:ToggleNumber()<cr>
-nnoremap <silent><leader>N :setlocal relativenumber!<cr>