X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/35f23db4c8817cc8482fa0db9720703739bcbaa1..f25da6e7e7c09d7c5407a3fe6d2d3a7cdb0c695c:/vim/vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 231ebad..810f2f5 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -28,7 +28,6 @@ Plugin 'scrooloose/syntastic'
 Plugin 'sirver/ultisnips'
 Plugin 'sjl/gundo.vim'
 Plugin 'tomtom/tcomment_vim'
-Plugin 'tpope/vim-endwise'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-repeat'
 Plugin 'tpope/vim-surround'
@@ -44,7 +43,9 @@ Plugin 'derekwyatt/vim-fswitch'
 " Plugin 'jalcine/cmake.vim'
 " Plugin 'powerman/vim-plugin-viewdoc'
 
+" endwise needs to be after delimitmate
 Plugin 'raimondi/delimitmate'
+Plugin 'tpope/vim-endwise'
 Plugin 'lokaltog/vim-easymotion'
 Plugin 'chrisbra/checkattach'
 Plugin 'klen/python-mode'
@@ -393,6 +394,10 @@ let g:airline_powerline_fonts = 1
 " checkattach {{{2
 let g:checkattach_filebrowser = 'ranger'
 
+" delimitmate {{{2
+let delimitMate_expand_cr = 2
+let g:delimitMate_expand_space = 1
+
 " fswitch {{{2
 nnoremap <silent> <Leader>ff :FSHere<CR>
 nnoremap <silent> <Leader>fl :FSRight<CR>
@@ -433,6 +438,7 @@ autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTree
 " python-mode {{{2
 
 let g:pymode_rope_completion = 0
+let g:pymode_rope = 0
 let g:pymode_folding = 1
 
 " synastic {{{2
@@ -526,19 +532,3 @@ nnoremap <silent> <Leader>s :call ToggleSpell()<CR>
 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>