vim: use system clangd and local compile db

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index cc35b084001b02c47c32fd5fd129b477592babc9..c50157245114a04833086fa7d5fb54e65782d134 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -50,7 +50,7 @@ Plug 'tpope/vim-speeddating'
 Plug 'tpope/vim-surround'  "investigate vim-sandwich
 Plug 'tpope/vim-unimpaired'
 Plug 'tweekmonster/spellrotate.vim'
-" Plug 'valloric/youcompleteme', { 'do': './install.py --clang-completer' }
+Plug 'valloric/youcompleteme', { 'do': './install.py --clangd-completer --clang-completer' }
 Plug 'vim-scripts/mediawiki.vim'
 Plug 'vim-scripts/replacewithregister'
 Plug 'vim-scripts/yankring.vim'
@@ -79,22 +79,13 @@ let g:ale_cpp_parse_compile_commands = 1
 let g:ale_cpp_gcc_options = ''
 let g:ale_cpp_clang_options = ''
 
-Plug 'shougo/deoplete.nvim' " {{{2
-Plug 'roxma/nvim-yarp'
-Plug 'roxma/vim-hug-neovim-rpc'
-let g:deoplete#enable_at_startup = 1
-"}}}2
+Plug 'git@github.com:/ram-z/vim-orgmode', { 'branch': 'dev' } " {{{2
+Plug 'vim-scripts/syntaxrange'
 
-Plug 'jceb/vim-orgmode'
 let g:org_agenda_files = ['~/org/*.org']
 
 call plug#end()
 
-call deoplete#custom#option('sources', {
-      \ '_': ['ale'],
-      \})
-call deoplete#custom#source('ale', 'matchers', ['matchers_full_fuzzy'])
-
 filetype plugin indent on
 
 " colorscheme {{{1
@@ -744,7 +735,9 @@ endfunction
 
 " youcompleteme {{{2
 let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*']
-let g:ycm_global_ycm_extra_conf = expand('$XDG_CONFIG_HOME/vim/ycm_extra_conf.py')
+" ycm-clangd requires you to symlink the compile_db to the root of the project
+" let g:ycm_global_ycm_extra_conf = expand('$XDG_CONFIG_HOME/vim/ycm_extra_conf.py')
+let g:ycm_clangd_binary_path = 'clangd'   " use clangd in path
 let g:ycm_extra_conf_vim_data = ['getcwd()']
 let g:ycm_add_preview_to_completeopt = 1
 let g:ycm_complete_in_comments = 1