Configure for hybrid sleep

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

diff --git a/states/vim/files/vimrc b/states/vim/files/vimrc
index c39436f6209fe414277efa7b203018cb6688a149..e1375129a496c5567848a75cc8cc757524144361 100644 (file)
--- 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 'python-rope/ropevim'
+Plugin 'pangloss/vim-javascript'
+Plugin 'itspriddle/vim-shellcheck'
+Plugin 'vimwiki/vimwiki'
 
 " 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,9 @@ 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
+let ropevim_goto_def_newwin = 1
+let ropevim_guess_project = 1
 
-augroup unset_folding_in_insert_mode
-    autocmd!
-    autocmd InsertEnter *.py setlocal foldmethod=marker
-    autocmd InsertLeave *.py setlocal foldmethod=expr
-augroup END
+" Vimwiki
+let g:vimwiki_list = [{'path': '~/vimwiki/', 'syntax': 'markdown', 'ext': '.md'}]
+let g:vimwiki_global_ext = 0