X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fvim%2Ffiles%2Fvimrc;h=c39436f6209fe414277efa7b203018cb6688a149;hb=62a4997c0138796041aa257d18ee2dc6d3fd151f;hp=fb17f15426b5a813b655610d5baa544387b98cc8;hpb=1b455238e3808ec74d209b4c2b52952f39dab0a9;p=max%2Fsaltfiles.git

diff --git a/states/vim/files/vimrc b/states/vim/files/vimrc
index fb17f15..c39436f 100644
--- a/states/vim/files/vimrc
+++ b/states/vim/files/vimrc
@@ -16,8 +16,6 @@ Plugin 'docunext/closetag.vim'
 Plugin 'vim-airline/vim-airline'
 Plugin 'vim-airline/vim-airline-themes'
 Plugin 'airblade/vim-gitgutter'
-Plugin 'tpope/vim-fugitive'
-Plugin 'liskin/vim-fubitive'
 Plugin 'editorconfig/editorconfig-vim'
 Plugin 'LaTeX-Box-Team/LaTeX-Box'
 Plugin 'hynek/vim-python-pep8-indent'
@@ -31,9 +29,10 @@ Plugin 'lepture/vim-jinja'
 Plugin 'aklt/plantuml-syntax'
 Plugin 'vim-python/python-syntax'
 Plugin 'majutsushi/tagbar'
-Plugin 'heavenshell/vim-pydocstring'
 Plugin 'altercation/vim-colors-solarized'
 Plugin 'ctrlpvim/ctrlp.vim'
+Plugin 'Chiel92/vim-autoformat'
+Plugin 'python-mode/python-mode'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -164,3 +163,19 @@ let g:ctrlp_cache_dir = $HOME . '/.cache/ctrlp'
 if executable('ag')
     let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""'
 endif
+
+" Auto formatters
+let g:formatdef_autopep8 = "'autopep8 --aggressive --aggressive - --range '.a:firstline.' '.a:lastline"
+let g:formatters_python = ['autopep8']
+noremap <F3> :Autoformat<CR>
+
+let g:pymode_lint = 0
+let g:pymode_folding = 1
+let g:pymode_rope = 1
+let g:pymode_rope_completion = 1
+
+augroup unset_folding_in_insert_mode
+    autocmd!
+    autocmd InsertEnter *.py setlocal foldmethod=marker
+    autocmd InsertLeave *.py setlocal foldmethod=expr
+augroup END