X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fvim%2Ffiles%2Fvimrc;h=145fd4f95a829f49154311eba5a53b08cbe68561;hb=cc380a1eeb2fd611cfb96574b44dd00e2e168b92;hp=c1c8ab51fa0e5acc0705f27808ca88aae78d9fd4;hpb=6070fd475cfecbf1d0f2864c7be06298e034a9c9;p=max%2Fsaltfiles.git

diff --git a/states/vim/files/vimrc b/states/vim/files/vimrc
index c1c8ab5..145fd4f 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'
@@ -30,10 +28,11 @@ Plugin 'gu-fan/riv.vim'
 Plugin 'lepture/vim-jinja'
 Plugin 'aklt/plantuml-syntax'
 Plugin 'vim-python/python-syntax'
-Plugin 'luochen1990/rainbow'
 Plugin 'majutsushi/tagbar'
-Plugin 'heavenshell/vim-pydocstring'
 Plugin 'altercation/vim-colors-solarized'
+Plugin 'ctrlpvim/ctrlp.vim'
+Plugin 'Chiel92/vim-autoformat'
+Plugin 'python-rope/ropevim'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -69,7 +68,8 @@ let g:syntastic_check_on_open = 1
 let g:syntastic_check_on_wq = 1
 let g:syntastic_javascript_checkers = ['eslint']
 let g:syntastic_python_python_exec = '/usr/bin/python3'
-let g:syntastic_python_checkers = ['python3 -m pylint --error-only']
+let g:syntastic_python_checkers = ['python', 'flake8']
+let g:syntastic_python_flake8_args='--config=/home/max/.config/flake8'
 let g:syntastic_aggregate_errors = 1
 
 " Syntastic C++11
@@ -100,7 +100,7 @@ let g:clang_user_options='|| exit0'
 
 " Color 80th column
 highlight ColorColumn ctermbg=7
-let &colorcolumn="80,".join(range(100,999),",")
+let &colorcolumn="80,100".join(range(120,999),",")
 
 " Octave Syntax
 " augroup filetypedetect
@@ -141,15 +141,9 @@ let g:python_highlight_string_templates = 1
 let g:python_highlight_class_vars = 1
 let g:python_highlight_operators = 1
 
-" Python indent
-autocmd FileType python setlocal foldmethod=indent foldnestmax=2
-
 " Paren highlighting
 hi MatchParen cterm=underline ctermbg=none ctermfg=none
 
-" Rainbow parens
-let g:rainbow_active = 1
-
 " Activate tagbar with F8
 nmap <F8> :TagbarToggle<CR>
 
@@ -161,3 +155,16 @@ let g:pydocstring_doq_path= "/home/max/.local/bin/doq"
 " Clipboard
 noremap <Leader>y "+y
 noremap <Leader>p "+p
+
+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 ropevim_goto_def_newwin = 1
+let ropevim_guess_project = 1