X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fvim%2Ffiles%2Fvimrc;h=b1090de1dc8bf584df64b377efcdf692e0e7e1b4;hb=HEAD;hp=cfebe674808d9df3d4e453630d93f74d891ff634;hpb=53f110abfda46d0251e5ca61e072be4f9eb390b9;p=max%2Fsaltfiles.git

diff --git a/states/vim/files/vimrc b/states/vim/files/vimrc
index cfebe67..b1090de 100644
--- a/states/vim/files/vimrc
+++ b/states/vim/files/vimrc
@@ -11,7 +11,6 @@ call vundle#begin()
 " call vundle#begin('~/some/path/here')
 Plugin 'gmarik/Vundle.vim'
 Plugin 'Yggdroot/indentLine'
-Plugin 'scrooloose/syntastic'
 Plugin 'docunext/closetag.vim'
 Plugin 'vim-airline/vim-airline'
 Plugin 'vim-airline/vim-airline-themes'
@@ -32,6 +31,11 @@ Plugin 'majutsushi/tagbar'
 Plugin 'altercation/vim-colors-solarized'
 Plugin 'ctrlpvim/ctrlp.vim'
 Plugin 'Chiel92/vim-autoformat'
+Plugin 'pangloss/vim-javascript'
+Plugin 'itspriddle/vim-shellcheck'
+Plugin 'vimwiki/vimwiki'
+Plugin 'dense-analysis/ale'
+Plugin 'Shougo/deoplete.nvim'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -53,28 +57,15 @@ set tabstop=4
 set relativenumber
 set number
 
+call deoplete#custom#option('sources', {'_': ['ale',],})
+let g:ale_completion_enabled = 1
+set omnifunc=ale#completion#OmniFunc
+let g:ale_linters = {'python': ['flake8', 'jedils']}
+let g:ale_python_flake8_options = '--max-line-length=88'
+
 let g:html_indent_inctags = "html,body,head,tbody"
 let g:indentLine_color_term = 5
 
-" syntastic
-set statusline+=%#warningmsg#
-set statusline+=%{SyntasticStatuslineFlag()}
-set statusline+=%*
-
-let g:syntastic_always_populate_loc_list = 1
-let g:syntastic_auto_loc_list = 2
-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 = ['python', 'flake8']
-let g:syntastic_python_flake8_args='--config=/home/max/.config/flake8'
-let g:syntastic_aggregate_errors = 1
-
-" Syntastic C++11
-let g:syntastic_cpp_compiler = 'g++'
-let g:syntastic_cpp_compiler_options = '-std=c++14'
-
 set laststatus=2
 " Set this to 1 if powerline fonts are installed.
 let g:airline_powerline_fonts = 1
@@ -140,9 +131,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
 
@@ -164,6 +152,12 @@ if executable('ag')
 endif
 
 " Auto formatters
-let g:formatdef_autopep8 = "'autopep8 -a - --range '.a:firstline.' '.a:lastline"
+let g:formatdef_autopep8 = "'autopep8 --aggressive --aggressive - --range '.a:firstline.' '.a:lastline"
 let g:formatters_python = ['autopep8']
 noremap <F3> :Autoformat<CR>
+
+" Vimwiki
+let g:vimwiki_list = [{'path': '~/vimwiki/', 'syntax': 'markdown', 'ext': '.md'}]
+let g:vimwiki_global_ext = 0
+
+let g:indentLine_fileTypeExclude = ['tex', 'json', 'markdown']