From dc1f4e88a30fd294bc3bc5fbad87a8564e5cb57f Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Tue, 28 Apr 2020 19:51:52 -0700 Subject: [PATCH] cleanup --- .vim/ftplugin/c.vim | 1 + .vim/ftplugin/cpp.vim | 2 +- .vim/ftplugin/go.vim | 3 +++ .vim/ftplugin/python.vim | 1 + .vim/plugins.vim | 37 ++++++++++++++----------------------- 5 files changed, 20 insertions(+), 24 deletions(-) create mode 100644 .vim/ftplugin/c.vim create mode 100644 .vim/ftplugin/python.vim diff --git a/.vim/ftplugin/c.vim b/.vim/ftplugin/c.vim new file mode 100644 index 0000000..ce30b1f --- /dev/null +++ b/.vim/ftplugin/c.vim @@ -0,0 +1 @@ +let b:ale_linters = ['ccls'] diff --git a/.vim/ftplugin/cpp.vim b/.vim/ftplugin/cpp.vim index 5245bdc..ce30b1f 100644 --- a/.vim/ftplugin/cpp.vim +++ b/.vim/ftplugin/cpp.vim @@ -1 +1 @@ -setlocal expandtab +let b:ale_linters = ['ccls'] diff --git a/.vim/ftplugin/go.vim b/.vim/ftplugin/go.vim index bbd8967..59e9a22 100644 --- a/.vim/ftplugin/go.vim +++ b/.vim/ftplugin/go.vim @@ -1 +1,4 @@ setlocal noexpandtab + +let b:ale_linters = ['gopls'] +let b:argwrap_tail_comma = 1 diff --git a/.vim/ftplugin/python.vim b/.vim/ftplugin/python.vim new file mode 100644 index 0000000..b68f0fc --- /dev/null +++ b/.vim/ftplugin/python.vim @@ -0,0 +1 @@ +let b:ale_linters = ['pyls'] diff --git a/.vim/plugins.vim b/.vim/plugins.vim index 3241b21..52986b6 100644 --- a/.vim/plugins.vim +++ b/.vim/plugins.vim @@ -4,15 +4,9 @@ execute pathogen#infect('bundle/{}') " ale let g:ale_linters_explicit = 1 -let g:ale_linters = { - \ 'c': ['ccls'], - \ 'cpp': ['ccls'], - \ 'go': ['gopls'], - \ 'python': ['pyls'], - \ } let g:ale_cpp_ccls_init_options = { - \ 'cacheDirectory': '/tmp/ccls', - \ 'cacheFormat': 'binary', + \ 'cacheDirectory': '/tmp/ccls', + \ 'cacheFormat': 'binary', \ } " deoplete.nvim @@ -26,19 +20,19 @@ endif " fzf let $FZF_DEFAULT_COMMAND='ag --hidden --ignore .git -f -g "" 2> /dev/null' -let g:fzf_colors = { - \ 'bg': ['bg', 'Normal'], - \ 'bg+': ['bg', 'CursorLine', 'CursorColumn'], - \ 'border': ['fg', 'Ignore'], - \ 'fg': ['fg', 'Normal'], - \ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'], - \ 'header': ['fg', 'Comment'], - \ 'hl': ['fg', 'Comment'], - \ 'hl+': ['fg', 'Statement'], - \ 'info': ['fg', 'PreProc'], - \ 'marker': ['fg', 'Keyword'], +let g:fzf_colors = { + \ 'bg': ['bg', 'Normal'], + \ 'bg+': ['bg', 'CursorLine', 'CursorColumn'], + \ 'border': ['fg', 'Ignore'], + \ 'fg': ['fg', 'Normal'], + \ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'], + \ 'header': ['fg', 'Comment'], + \ 'hl': ['fg', 'Comment'], + \ 'hl+': ['fg', 'Statement'], + \ 'info': ['fg', 'PreProc'], + \ 'marker': ['fg', 'Keyword'], \ 'pointer': ['fg', 'Exception'], - \ 'prompt': ['fg', 'Conditional'], + \ 'prompt': ['fg', 'Conditional'], \ 'spinner': ['fg', 'Label'], \ } @@ -47,9 +41,6 @@ let g:airline#extensions#ale#enabled = 1 let g:airline#extensions#tabline#enabled = 1 let g:airline_symbols_ascii = 1 -" vim-argwrap -autocmd FileType go let b:argwrap_tail_comma = 1 - " vim-go let g:go_fmt_command = 'goimports' let g:go_null_module_warning = 0