diff --git a/vim/after/ftplugin/vim.vim b/vim/after/ftplugin/vim.vim new file mode 100644 index 0000000..03361bb --- /dev/null +++ b/vim/after/ftplugin/vim.vim @@ -0,0 +1,2 @@ + set foldmethod=marker + diff --git a/vim/coc-settings.json b/vim/coc-settings.json index 3e3810d..8c4bcdd 100644 --- a/vim/coc-settings.json +++ b/vim/coc-settings.json @@ -2,13 +2,15 @@ "coc.preferences.triggerAfterInsertEnter": false, "coc.preferences.autoTrigger": "none", "coc.preferences.triggerSignatureHelp": true, - "coc.preferences.diagnostic.enable": false, + "coc.preferences.diagnostic.enable": true, "coc.preferences.diagnostic.warningSign": "λ", "coc.preferences.diagnostic.errorSign": "Λ", "coc.preferences.diagnostic.infoSign": "λ", "coc.preferences.diagnostic.hintSign": "λ", - "coc.preferences.timeout": 200, + "coc.preferences.timeout": 1000, - "coc.source.buffer.ignoreGitignore": true + "coc.source.buffer.ignoreGitignore": true, + + "javascript.suggestionActions.enabled": false } diff --git a/vimrc b/vimrc index 1632a7f..3974079 100644 --- a/vimrc +++ b/vimrc @@ -1,8 +1,6 @@ " ● -if filereadable(expand('vimrc-config'))"{{{ - source vimrc-config -endif +runtime vimrc-config let g:vimrc_load_dev_plugins = exists('g:vimrc_load_dev_plugins') \ ? g:vimrc_load_dev_plugins : 0 @@ -144,7 +142,7 @@ if g:vimrc_load_dev_plugins let g:ale_sign_column_always = 1 let g:ale_open_list = 0 - " let g:ale_linters = {'scss': ['stylelint'], 'javascript': [], 'php':['php'], 'html':['htmlhint'], 'python': [], 'vue': []} + let g:ale_linters = {'scss': ['stylelint'], 'javascript': [], 'php':['php'], 'html':['htmlhint'], 'python': [], 'vue': []} let g:ale_html_htmlhint_options = '-c ~/.htmlhintrc --format=unix' let g:ale_fixers = {'javascript': ['eslint']} let g:ale_sign_error = 'Α' @@ -1619,9 +1617,7 @@ if exists('+showtabline') && g:vimrc_enable_tabline endif "----------------------------------------------------------------------------}}} -if filereadable(expand('vimrc-overrides'))"{{{ - source vimrc-overrides -endif +runtime vimrc-overrides "}}}