vim: do not Plug youcompleteme in nvim

It comes with nvim-cmp instead. This still needs to be configured, but I
think those two are interfering at the moment.

diff --git a/vim/vimrc b/vim/vimrc
index f40b08fb64ea4c974c136bb963b1171a611723ee..d94c7c23a259dbd0d8263cc109dc76976ff27b9b 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -70,7 +70,28 @@ Plug 'tpope/vim-speeddating'
 Plug 'tpope/vim-surround'  "investigate vim-sandwich
 Plug 'tpope/vim-unimpaired'
 Plug 'tweekmonster/spellrotate.vim'
 Plug 'tpope/vim-surround'  "investigate vim-sandwich
 Plug 'tpope/vim-unimpaired'
 Plug 'tweekmonster/spellrotate.vim'

-Plug 'valloric/youcompleteme', { 'do': './install.py --clangd-completer --clang-completer' }
+if !has("nvim")
+  " Plug 'valloric/youcompleteme' {{{2
+  Plug 'valloric/youcompleteme',
+        \{ 'do': './install.py --clangd-completer --clang-completer' }
+  let g:ycm_clangd_binary_path = 'clangd'   " use clangd in path
+  let g:ycm_clangd_args = ['--clang-tidy']
+  let g:ycm_extra_conf_vim_data = ['getcwd()']
+  let g:ycm_add_preview_to_completeopt = 1
+  let g:ycm_complete_in_comments = 1
+  let g:ycm_complete_in_strings  = 1
+  let g:ycm_autoclose_preview_window_after_insertion = 0
+
+  let g:ycm_language_server =
+        \ [
+        \   {
+        \     'name': 'haskell',
+        \     'cmdline': [ 'haskell-language-server-wrapper', '--lsp' ],
+        \     'filetypes': [ 'haskell', 'lhaskell'  ]
+        \   },
+        \ ]
+  " }}}
+endif

 Plug 'vim-scripts/mediawiki.vim'
 Plug 'vim-scripts/replacewithregister'
 Plug 'vim-scripts/yankring.vim'
 Plug 'vim-scripts/mediawiki.vim'
 Plug 'vim-scripts/replacewithregister'
 Plug 'vim-scripts/yankring.vim'


@@ -846,24 +867,6 @@ function! YRRunAfterMaps()
     nnoremap Y   :<C-U>YRYankCount 'y$'<CR>
 endfunction
 
     nnoremap Y   :<C-U>YRYankCount 'y$'<CR>
 endfunction
 

-" youcompleteme {{{2
-let g:ycm_clangd_binary_path = 'clangd'   " use clangd in path
-let g:ycm_clangd_args = ['--clang-tidy']
-let g:ycm_extra_conf_vim_data = ['getcwd()']
-let g:ycm_add_preview_to_completeopt = 1
-let g:ycm_complete_in_comments = 1
-let g:ycm_complete_in_strings  = 1
-let g:ycm_autoclose_preview_window_after_insertion = 0
-
-let g:ycm_language_server =
-    \ [
-    \   {
-    \     'name': 'haskell',
-    \     'cmdline': [ 'haskell-language-server-wrapper', '--lsp' ],
-    \     'filetypes': [ 'haskell', 'lhaskell'  ]
-    \   },
-    \ ]
-

 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
 vmap <Enter>   <Esc>:echohl WarningMsg \| echo "EasyAlign mapped to \16<leader>a now" \| echohl None<CR>
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
 vmap <Enter>   <Esc>:echohl WarningMsg \| echo "EasyAlign mapped to \16<leader>a now" \| echohl None<CR>