Merge branch 'master' of git.friedersdorff.com:max/saltfiles into master

[max/saltfiles.git] / states / vim / files / vimrc

diff --git a/states/vim/files/vimrc b/states/vim/files/vimrc
index c4f435a25d01e794315c4d14a66f2218b6c44e95..53d465716889c0fed5e7c96f137b123aa990b14e 100644 (file)
--- a/states/vim/files/vimrc
+++ b/states/vim/files/vimrc
@@ -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
 
@@ -158,3 +159,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"