vim: use youcompleteme again

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 137eab0e346bf6e4655c8e7206d8793d9fbeb099..0bbb3c12a4c39e22fcdf3d5aadcd824da9dcb776 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
@@ -812,7 +803,7 @@ nnoremap <silent> gs :<C-U>set operatorfunc=SortLinesOpFunc<CR>g@
 vnoremap <silent> gs :sort<cr>
 
 " edit configs  {{{2
-function! EditConfig(what)
+function! EditConfig(what, ext = '.vim')
     let l:dir = split(&runtimepath,',')[0]
     if a:what == 'vimrc'
         let l:file = expand($MYVIMRC)
@@ -821,7 +812,7 @@ function! EditConfig(what)
     elseif empty(&filetype)
         echoe 'filetype is empty!'
     else
-        let l:file = l:dir.'/'.a:what.'/'.&filetype.'.vim'
+        let l:file = l:dir.'/'.a:what.'/'.&filetype.a:ext
     endif
 
     execute ':vsplit '.file
@@ -831,7 +822,7 @@ nmap <leader>ev :call EditConfig('vimrc')<CR>
 nmap <leader>ef :call EditConfig('ftplugin')<CR>
 nmap <leader>es :call EditConfig('syntax')<CR>
 nmap <leader>ei :call EditConfig('indent')<CR>
-nmap <leader>eu :UltiSnipsEdit<CR>:lcd %:p:h<CR>
+nmap <leader>eu :call EditConfig('ultisnips', '.snippets')<CR>
 
 " spell check {{{2
 " http://tex.stackexchange.com/a/52932