X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/16d05be62a402d08757b54cdb10345b86d00135d..b481aa7998437d006b2c3e663f7086f923f7e40c:/vim/vimrc?ds=sidebyside

diff --git a/vim/vimrc b/vim/vimrc
index 7c12179..c501572 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -46,10 +46,11 @@ Plug 'tpope/vim-endwise'
 Plug 'tpope/vim-eunuch'
 Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-repeat'
+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'
@@ -78,18 +79,12 @@ 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
+Plug 'git@github.com:/ram-z/vim-orgmode', { 'branch': 'dev' } " {{{2
+Plug 'vim-scripts/syntaxrange'
 
-"}}}2
-call plug#end()
+let g:org_agenda_files = ['~/org/*.org']
 
-call deoplete#custom#option('sources', {
-      \ '_': ['ale'],
-      \})
-call deoplete#custom#source('ale', 'matchers', ['matchers_full_fuzzy'])
+call plug#end()
 
 filetype plugin indent on
 
@@ -740,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
@@ -808,7 +805,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)
@@ -817,7 +814,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
@@ -827,7 +824,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