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 5980b6453bacbca1feaadffd4c8ce7a862da015e..9a7f92bff1861c88600cf6b8cc2794b0652508ef 100644 (file)
--- a/states/vim/files/vimrc
+++ b/states/vim/files/vimrc
@@ -39,6 +39,7 @@ 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
@@ -118,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
@@ -130,3 +133,19 @@ 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