X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fvim%2Ffiles%2Fvimrc;h=d6c42d377ac5b83e43ac71e14678e4ad1d502b80;hb=aa1b1a97945069983b1b0891b804f4fa5c2c89d5;hp=be2b5d2fd6db6a31ecd8693289ceb30792790fa4;hpb=6403f092c29888073fe347e4a1a6cf1ad765d9a9;p=max%2Fsaltfiles.git

diff --git a/states/vim/files/vimrc b/states/vim/files/vimrc
index be2b5d2..d6c42d3 100644
--- a/states/vim/files/vimrc
+++ b/states/vim/files/vimrc
@@ -32,7 +32,10 @@ Plugin 'majutsushi/tagbar'
 Plugin 'altercation/vim-colors-solarized'
 Plugin 'ctrlpvim/ctrlp.vim'
 Plugin 'Chiel92/vim-autoformat'
-Plugin 'python-mode/python-mode'
+Plugin 'pangloss/vim-javascript'
+Plugin 'itspriddle/vim-shellcheck'
+Plugin 'vimwiki/vimwiki'
+Plugin 'psf/black'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -70,6 +73,7 @@ let g:syntastic_javascript_checkers = ['eslint']
 let g:syntastic_python_python_exec = '/usr/bin/python3'
 let g:syntastic_python_checkers = ['python', 'flake8']
 let g:syntastic_python_flake8_args='--config=/home/max/.config/flake8'
+let g:syntastic_sh_checkers = ['shellcheck']
 let g:syntastic_aggregate_errors = 1
 
 " Syntastic C++11
@@ -141,9 +145,6 @@ 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
 
@@ -169,13 +170,10 @@ let g:formatdef_autopep8 = "'autopep8 --aggressive --aggressive - --range '.a:fi
 let g:formatters_python = ['autopep8']
 noremap <F3> :Autoformat<CR>
 
-let g:pymode_lint = 0
-let g:pymode_folding = 1
-let g:pymode_rope = 1
-let g:pymode_rope_completion = 1
+" Vimwiki
+let g:vimwiki_list = [{'path': '~/vimwiki/', 'syntax': 'markdown', 'ext': '.md'}]
+let g:vimwiki_global_ext = 0
+
+let g:indentLine_fileTypeExclude = ['tex', 'json', 'markdown']
 
-augroup unset_folding_in_insert_mode
-    autocmd!
-    autocmd InsertEnter *.py setlocal foldmethod=manual
-    autocmd InsertLeave *.py setlocal foldmethod=expr
-augroup END
+let g:black_use_virtualenv = 0