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

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

diff --git a/states/vim/files/vimrc b/states/vim/files/vimrc
index b8cf54dede84fbca44d8208a6d2df8d22074df5a..9a7f92bff1861c88600cf6b8cc2794b0652508ef 100644 (file)
--- a/states/vim/files/vimrc
+++ b/states/vim/files/vimrc
@@ -38,6 +38,8 @@ Plugin 'gu-fan/riv.vim'
 Plugin 'nvie/vim-rst-tables'
 Plugin 'lepture/vim-jinja'
 Plugin 'aklt/plantuml-syntax'
+Plugin 'psf/black'
+Plugin 'vim-python/python-syntax'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -117,6 +119,8 @@ let g:netrw_silent = 1
 
 " Set folding
 set foldmethod=syntax
+nnoremap <space> za
+vnoremap <space> zf
 
 " Better saving behaviour for go
 let g:go_fmt_experimental = 1
@@ -126,3 +130,22 @@ set list listchars=trail:•,extends:>,precedes:<,nbsp:␣,eol:↲,tab:→\,
 
 " Force python3 for rst tables plugin
 let g:rst_prefer_python_version = 2
+
+" Set linelength for python
+let g:black_linelength = 80
+
+" Python syntax highlighting
+let g:python_highlight_builtins = 1
+let g:python_highlight_builtin_objs = 1
+let g:python_highlight_builtin_types = 1
+let g:python_highlight_builtin_funcs = 1
+let g:python_highlight_builtin_kwarg = 1
+let g:python_highlight_exceptions = 1
+let g:python_highlight_string_formatting = 1
+let g:python_highlight_string_format = 1
+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