summaryrefslogtreecommitdiffstats
path: root/vim/vimrc
diff options
context:
space:
mode:
Diffstat (limited to 'vim/vimrc')
-rw-r--r--vim/vimrc32
1 files changed, 25 insertions, 7 deletions
diff --git a/vim/vimrc b/vim/vimrc
index fda8fa4..959d790 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -65,13 +65,6 @@ if dein#tap('neosnippet.vim')
smap <C-k> <Plug>(neosnippet_expand_or_jump)
xmap <C-k> <Plug>(neosnippet_expand_or_jump)
endif
-if dein#tap('clang_complete')
- call s:hook_source()
-endif
-if dein#tap('vim-racer')
- let g:dein#plugin.hook_source =
- \ "let $RUST_SRC_PATH= $XDG_DATA_HOME . '/rustc_src_latest/src/'"
-endif
if dein#tap('vim-easy-align')
nmap ga <Plug>(EasyAlign)
endif
@@ -102,6 +95,31 @@ endif
if dein#tap('vim-addon-local-vimrc')
let g:local_vimrc = {'names':['.lvimrc'],'hash_fun':'LVRHashOfFile'}
endif
+if dein#tap('vim-lsp')
+ if executable('cquery')
+ au User lsp_setup call lsp#register_server({
+ \ 'name': 'cquery',
+ \ 'cmd': {server_info->['cquery']},
+ \ 'root_uri': {server_info->lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), 'compile_commands.json'))},
+ \ 'initialization_options': { 'cacheDirectory': '/tmp/cquery/cache' },
+ \ 'whitelist': ['c', 'cpp', 'objc', 'objcpp'],
+ \ })
+ endif
+ if executable('rls')
+ au User lsp_setup call lsp#register_server({
+ \ 'name': 'rls',
+ \ 'cmd': {server_info->['rustup', 'run', 'nightly', 'rls']},
+ \ 'whitelist': ['rust'],
+ \ })
+ endif
+ if executable('hie-wrapper')
+ au User lsp_setup call lsp#register_server({
+ \ 'name': 'hie',
+ \ 'cmd': {server_info->['hie-wrapper']},
+ \ 'whitelist': ['haskell'],
+ \ })
+ endif
+endif
if dein#tap('base16-vim')
set bg=dark
let base16colorspace=256