X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fvim%2Ffiles%2Fvimrc;h=c7b1e418d9507fa042ab308235e65f924757318f;hb=b488bd7dbbf1732237c6e696521f7ae8a50b9e8f;hp=c4f435a25d01e794315c4d14a66f2218b6c44e95;hpb=ffd9e3cb25cbd5966b4deaa706ad233c36a88af4;p=max%2Fsaltfiles.git

diff --git a/states/vim/files/vimrc b/states/vim/files/vimrc
index c4f435a..c7b1e41 100644
--- a/states/vim/files/vimrc
+++ b/states/vim/files/vimrc
@@ -22,7 +22,7 @@ Plugin 'vim-airline/vim-airline-themes'
 Plugin 'airblade/vim-gitgutter'
 Plugin 'tpope/vim-fugitive'
 Plugin 'liskin/vim-fubitive'
-Plugin 'kien/ctrlp.vim'
+Plugin 'ctrlpvim/ctrlp.vim'
 Plugin 'editorconfig/editorconfig-vim'
 Plugin 'LaTeX-Box-Team/LaTeX-Box'
 Plugin 'hynek/vim-python-pep8-indent'
@@ -39,6 +39,7 @@ Plugin 'aklt/plantuml-syntax'
 Plugin 'vim-python/python-syntax'
 Plugin 'luochen1990/rainbow'
 Plugin 'majutsushi/tagbar'
+Plugin 'heavenshell/vim-pydocstring'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -51,9 +52,9 @@ set backupdir=$HOME/.vim/backup//
 syntax on
 set background=dark
 colorscheme molokai
-" set expandtab
-" set shiftwidth=2
-" set softtabstop=2
+set expandtab
+set shiftwidth=4
+set softtabstop=4
 set relativenumber
 set number
 
@@ -71,7 +72,7 @@ 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 = ['flake8', 'pylint']
+let g:syntastic_python_checkers = ['flake8', 'python3 -m pylint']
 let g:syntastic_aggregate_errors = 1
 
 " Syntastic C++11
@@ -91,6 +92,9 @@ set wildignore+=.git,.hg.svn
 
 " CtrlP
 let g:ctrlp_working_path_mode = 'r'
+" Ignore git ignored files
+let g:ctrlp_user_command = 'git ls-files -co --exclude-standard $(git rev-parse --show-toplevel 2> /dev/null) 2> /dev/null || find . -type f'
+
 
 " Editorconfig
 let g:EditorConfig_exclude_patterns = ['fugitive://.*']
@@ -158,3 +162,6 @@ let g:rainbow_active = 1
 
 " Activate tagbar with F8
 nmap <F8> :TagbarToggle<CR>
+
+" Set path to doq
+let g:pydocstring_doq_path= "/home/max/.local/bin/doq"