diff --git a/.gitmodules b/.gitmodules index 94d28e0..fc6b77e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -76,12 +76,12 @@ [submodule ".vim/bundle/vim-angry"] path = pack/plugins/start/vim-angry url = https://github.com/b4winckler/vim-angry.git -[submodule ".vim/bundle/ale"] - path = pack/plugins/start/ale - url = https://github.com/dense-analysis/ale.git [submodule ".vim/bundle/vim-solarized8"] path = pack/plugins/start/vim-solarized8 url = https://github.com/lifepillar/vim-solarized8.git [submodule ".vim/pack/plugins/start/vim-fugitive"] path = pack/plugins/start/vim-fugitive url = https://github.com/tpope/vim-fugitive.git +[submodule "pack/plugins/start/coc.nvim"] + path = pack/plugins/start/coc.nvim + url = https://github.com/neoclide/coc.nvim diff --git a/coc-settings.json b/coc-settings.json new file mode 100644 index 0000000..48d591e --- /dev/null +++ b/coc-settings.json @@ -0,0 +1,17 @@ +{ + "languageserver": { + "go": { + "command": "gopls", + "filetypes": ["go"], + "rootPatterns": ["go.mod"], + "trace.server": "verbose" + }, + "python": { + "command": "pyls", + "filetypes": ["python"], + "rootPatterns": [], + "trace.server": "verbose" + } + }, + "suggest.noselect": false +} diff --git a/ftplugin/c.vim b/ftplugin/c.vim index 7555292..ee37997 100644 --- a/ftplugin/c.vim +++ b/ftplugin/c.vim @@ -1,6 +1,2 @@ -" ale -let b:ale_linters = ['ccls'] -let b:ale_set_highlights = 0 - " vim-fswitch noremap gfs :FSHere diff --git a/ftplugin/cpp.vim b/ftplugin/cpp.vim index 7555292..ee37997 100644 --- a/ftplugin/cpp.vim +++ b/ftplugin/cpp.vim @@ -1,6 +1,2 @@ -" ale -let b:ale_linters = ['ccls'] -let b:ale_set_highlights = 0 - " vim-fswitch noremap gfs :FSHere diff --git a/ftplugin/go.vim b/ftplugin/go.vim index 004b157..aa445a9 100644 --- a/ftplugin/go.vim +++ b/ftplugin/go.vim @@ -1,8 +1,5 @@ setlocal noexpandtab -" ale -let b:ale_linters = ['gopls'] - " vim-argwrap let b:argwrap_tail_comma = 1 diff --git a/ftplugin/python.vim b/ftplugin/python.vim deleted file mode 100644 index e3831f5..0000000 --- a/ftplugin/python.vim +++ /dev/null @@ -1,2 +0,0 @@ -" ale -let b:ale_linters = ['pyls'] diff --git a/keymaps.vim b/keymaps.vim index 5a2fa9a..0aa628f 100644 --- a/keymaps.vim +++ b/keymaps.vim @@ -41,14 +41,27 @@ nnoremap k gk " util nnoremap ig :Guid + +" coc.vim +nmap [g (coc-diagnostic-prev) +nmap ]g (coc-diagnostic-next) +nmap gd (coc-definition) +nmap gy (coc-type-definition) +nmap gi (coc-implementation) +nmap gr (coc-references) + +if has('nvim-0.4.0') || has('patch-8.2.0750') + nnoremap coc#float#has_scroll() ? coc#float#scroll(1) : "\" + nnoremap coc#float#has_scroll() ? coc#float#scroll(0) : "\" + inoremap coc#float#has_scroll() ? "\=coc#float#scroll(1)\" : "\" + inoremap coc#float#has_scroll() ? "\=coc#float#scroll(0)\" : "\" + vnoremap coc#float#has_scroll() ? coc#float#scroll(1) : "\" + vnoremap coc#float#has_scroll() ? coc#float#scroll(0) : "\" +endif + inoremap pumvisible() ? '' : '' inoremap pumvisible() ? '' : '' -" ale -nnoremap gd :ALEGoToDefinition -nnoremap gD :ALEGoToTypeDefinition -nnoremap gr :ALEFindReferences - " fzf nnoremap fg :GFiles nnoremap ff :Files ~ diff --git a/options.vim b/options.vim index dbe879c..503faac 100644 --- a/options.vim +++ b/options.vim @@ -52,9 +52,16 @@ set tabstop=4 set ttimeout set ttimeoutlen=50 set ttyfast +set updatetime=300 set wildignore+=*/tmp/* set wildmenu +if has("nvim-0.5.0") || has("patch-8.1.1564") + set signcolumn=number +else + set signcolumn=yes +endif + if &shell =~ 'bin/fish' set shell=/bin/sh endif diff --git a/pack/plugins/start/ale b/pack/plugins/start/ale deleted file mode 160000 index bee8ecc..0000000 --- a/pack/plugins/start/ale +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bee8eccb421968d1f2628c15e9f2bfcc3d0418aa diff --git a/pack/plugins/start/coc.nvim b/pack/plugins/start/coc.nvim new file mode 160000 index 0000000..1749499 --- /dev/null +++ b/pack/plugins/start/coc.nvim @@ -0,0 +1 @@ +Subproject commit 17494990ab110b70aec3d7c97707448c6d3e72c9 diff --git a/plugins.vim b/plugins.vim index 8619b1d..1bb066d 100644 --- a/plugins.vim +++ b/plugins.vim @@ -1,11 +1,3 @@ -" ale -let g:ale_completion_enabled = 1 -let g:ale_linters_explicit = 1 -let g:ale_cpp_ccls_init_options = { - \ 'cacheDirectory': '/tmp/ccls', - \ 'cacheFormat': 'binary', - \ } - " fzf let $FZF_DEFAULT_COMMAND='ag --hidden --ignore .git -f -g "" 2> /dev/null' if has('windows')