X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/ac682bb9c7af9480974498953f8b3bc3586a8089..e0dd798cdd5f8ae3b77d0d1d7206bf11d043a88d:/vim/vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 8b35883..3f78e52 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -34,7 +34,7 @@ Plug 'ram-z/vim-clang-format', { 'branch': 'fix-undo' }
 " fix some issue with vim-clang-format not finding .clang-format
 let g:clang_format#detect_style_file = 1
 Plug 'vimwiki/vimwiki', { 'branch': 'dev' }
-Plug 'scrooloose/syntastic'
+" Plug 'scrooloose/syntastic'
 Plug 'sgeb/vim-diff-fold'
 Plug 'shougo/unite.vim'
 Plug 'shougo/vimproc.vim', {'do': 'make'}
@@ -46,13 +46,15 @@ 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 --clang-completer' }
 Plug 'vim-scripts/mediawiki.vim'
 Plug 'vim-scripts/replacewithregister'
 Plug 'vim-scripts/yankring.vim'
+Plug 'wincent/loupe'
 
 " colorschemes
 Plug 'morhetz/gruvbox'
@@ -68,16 +70,33 @@ Plug 'sgur/vim-textobj-parameter'
 Plug 'kana/vim-operator-user'
 
 " staging
-" find an alternative (latex-box? Automatic Latex Plugin?)
-Plug 'vim-latex/vim-latex'
-Plug 'alx741/vinfo'
-" needs editing colorscheme
-" Plug 'jeaye/color_coded'
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
-Plug 'wincent/loupe'
+Plug 'dense-analysis/ale' " {{{2
+let g:ale_c_build_dir_names = [ 'build-Linux-x86_64' ]
+let g:ale_echo_msg_format = '[%linter%] %code: %%s'
+let g:ale_c_parse_compile_commands = 1
+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'
+
+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
@@ -342,8 +361,21 @@ augroup END
 map <space> <leader>
 
 " make
-nnoremap <leader>r :make!<cr>
-nnoremap <leader><cr> :make!<cr>
+function! Make()
+  let l:make_dir = ""
+  if exists("b:make_dir")
+    let l:make_dir = "-C ".b:make_dir
+  elseif exists("g:make_dir")
+    let l:make_dir = "-C ".g:make_dir
+  endif
+
+  let l:make_targets = ""
+  if exists("g:make_targets")
+    let l:make_targets = g:make_targets
+  endif
+  execute "make! ".l:make_dir." ".l:make_targets
+endf
+nnoremap <leader>r :call Make()<cr>
 
 " unhighlight search
 nnoremap <silent> <Leader>/ :silent nohl<CR>
@@ -736,11 +768,6 @@ nnoremap <Leader>tu :GTestRunUnderCursor<CR>
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0
 
-" vim-latex {{{2
-let g:tex_flavor='latex'
-let g:Tex_DefaultTargetFormat='pdf'
-let g:Tex_MultipleCompileFormats='pdf'
-
 " vim-sneak {{{2
 let g:sneak#streak = 1
 let g:sneak#target_labels = "aoeuisnthdpylrcgfqjkxzmwvz" " dvorak
@@ -787,7 +814,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)
@@ -796,7 +823,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
@@ -806,7 +833,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