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

diff --git a/vim/vimrc b/vim/vimrc
index 231ebad..e1e5a29 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