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 5980b6453bacbca1feaadffd4c8ce7a862da015e..53d465716889c0fed5e7c96f137b123aa990b14e 100644 (file)
--- a/states/vim/files/vimrc
+++ b/states/vim/files/vimrc
@@ -14,7 +14,6 @@ Plugin 'jelera/vim-javascript-syntax'
 Plugin 'noahfrederick/vim-noctu'
 Plugin 'pangloss/vim-javascript'
 Plugin 'Yggdroot/indentLine'
-Plugin 'Raimondi/delimitMate'
 Plugin 'scrooloose/syntastic'
 Plugin 'ternjs/tern_for_vim'
 Plugin 'docunext/closetag.vim'
@@ -22,10 +21,10 @@ Plugin 'vim-airline/vim-airline'
 Plugin 'vim-airline/vim-airline-themes'
 Plugin 'airblade/vim-gitgutter'
 Plugin 'tpope/vim-fugitive'
+Plugin 'liskin/vim-fubitive'
 Plugin 'kien/ctrlp.vim'
 Plugin 'editorconfig/editorconfig-vim'
 Plugin 'LaTeX-Box-Team/LaTeX-Box'
-Plugin 'ajh17/VimCompletesMe'
 Plugin 'hynek/vim-python-pep8-indent'
 Plugin 'vim-scripts/octave.vim--'
 Plugin 'vim-scripts/MatlabFilesEdition'
@@ -35,10 +34,12 @@ Plugin 'tmhedberg/SimpylFold'
 Plugin 'saltstack/salt-vim'
 Plugin 'fatih/vim-go'
 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'
+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,10 +52,11 @@ 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
 
 let g:html_indent_inctags = "html,body,head,tbody"
 let g:indentLine_color_term = 200
@@ -70,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']
+let g:syntastic_python_checkers = ['flake8', 'pylint']
 let g:syntastic_aggregate_errors = 1
 
 " Syntastic C++11
@@ -103,7 +105,7 @@ let g:clang_user_options='|| exit0'
 
 " Color 80th column
 highlight ColorColumn ctermbg=0
-set colorcolumn=80
+let &colorcolumn="80,".join(range(100,999),",")
 
 " Octave Syntax
 " augroup filetypedetect
@@ -118,6 +120,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 +134,31 @@ 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
+
+" 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>
+
+" Set path to doq
+let g:pydocstring_doq_path= "/home/max/.local/bin/doq"