diff --git a/vim/.config/vim/coc-settings.json b/vim-fancy/.config/vim/coc-settings.json similarity index 100% rename from vim/.config/vim/coc-settings.json rename to vim-fancy/.config/vim/coc-settings.json diff --git a/vim/.config/vim/plug.d/autocomplete.vim b/vim-fancy/.config/vim/plug.d/autocomplete.vim similarity index 100% rename from vim/.config/vim/plug.d/autocomplete.vim rename to vim-fancy/.config/vim/plug.d/autocomplete.vim diff --git a/vim/.config/vim/plug.d/lint.vim b/vim-fancy/.config/vim/plug.d/lint.vim similarity index 84% rename from vim/.config/vim/plug.d/lint.vim rename to vim-fancy/.config/vim/plug.d/lint.vim index e05f552..ad35286 100644 --- a/vim/.config/vim/plug.d/lint.vim +++ b/vim-fancy/.config/vim/plug.d/lint.vim @@ -29,12 +29,6 @@ Plug 'dense-analysis/ale', { \ ] \ } -let g:ale_sign_error = '→' -let g:ale_sign_warning = '‽' -let g:ale_echo_msg_format = '%s [%severity%] [%linter%]' -let g:ale_set_loclist = 0 -let g:ale_set_quickfix = 1 - Plug 'prettier/vim-prettier', { \ 'branch': 'release/1.x', \ 'do': 'npm install', diff --git a/vim/.config/vim/plug.d/pgsql.vim b/vim-fancy/.config/vim/plug.d/pgsql.vim similarity index 100% rename from vim/.config/vim/plug.d/pgsql.vim rename to vim-fancy/.config/vim/plug.d/pgsql.vim diff --git a/vim-fancy/.config/vim/plugin/lint.vim b/vim-fancy/.config/vim/plugin/lint.vim new file mode 100644 index 0000000..1bdc696 --- /dev/null +++ b/vim-fancy/.config/vim/plugin/lint.vim @@ -0,0 +1,10 @@ +let g:ale_sign_error = '→' +let g:ale_sign_warning = '‽' +let g:ale_echo_msg_format = '%s [%severity%] [%linter%]' +let g:ale_set_loclist = 0 +let g:ale_set_quickfix = 1 + +augroup jslint + autocmd! + autocmd FileType javascript let g:ale_linters['javascript'] = ['eslint'] +augroup END diff --git a/vim/.config/vim/ftplugin/javascript.vim b/vim/.config/vim/ftplugin/javascript.vim index 0b5b638..ac3f1b0 100644 --- a/vim/.config/vim/ftplugin/javascript.vim +++ b/vim/.config/vim/ftplugin/javascript.vim @@ -2,5 +2,3 @@ setlocal expandtab setlocal shiftwidth=2 setlocal softtabstop=2 setlocal tabstop=2 - -let g:ale_linters['javascript'] = ['eslint'] diff --git a/vim/.config/vim/plug.d/core.vim b/vim/.config/vim/plug.d/core.vim index c9c3417..f862483 100644 --- a/vim/.config/vim/plug.d/core.vim +++ b/vim/.config/vim/plug.d/core.vim @@ -1,5 +1,7 @@ +Plug 'SirVer/ultisnips', { 'tag': '3.2' } +Plug 'cespare/vim-toml', { 'for': 'toml' } Plug 'editorconfig/editorconfig-vim', { 'tag': 'v1.1.1' } +Plug 'hashivim/vim-hashicorp-tools' Plug 'tpope/vim-surround' -Plug 'SirVer/ultisnips', { 'tag': '3.2' } let g:UltiSnipsSnippetDirectories = [ 'UltiSnips', 'snips' ] diff --git a/vim/.config/vim/plug.d/lang.vim b/vim/.config/vim/plug.d/lang.vim deleted file mode 100644 index 7c63e1b..0000000 --- a/vim/.config/vim/plug.d/lang.vim +++ /dev/null @@ -1,2 +0,0 @@ -Plug 'cespare/vim-toml', { 'for': 'toml' } -Plug 'hashivim/vim-hashicorp-tools' diff --git a/vim/.config/vim/plugin/theme.vim b/vim/.config/vim/plugin/theme.vim index a4849a4..4ee708e 100644 --- a/vim/.config/vim/plugin/theme.vim +++ b/vim/.config/vim/plugin/theme.vim @@ -15,6 +15,5 @@ if (has("termguicolors")) set termguicolors endif - colorscheme gruvbox set background=dark