weechat: update wee-slack

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 8b3ea4fdc2e1e1da0414975b74fd39c75523fb10..cc35b084001b02c47c32fd5fd129b477592babc9 100644 (file)
--- 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' }
 " 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'}
 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-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 '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 'vim-scripts/mediawiki.vim'
 Plug 'vim-scripts/replacewithregister'
 Plug 'vim-scripts/yankring.vim'

+Plug 'wincent/loupe'

 
 " colorschemes
 Plug 'morhetz/gruvbox'
 
 " colorschemes
 Plug 'morhetz/gruvbox'


@@ -68,16 +70,31 @@ Plug 'sgur/vim-textobj-parameter'
 Plug 'kana/vim-operator-user'
 
 " staging
 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
 " 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 'jceb/vim-orgmode'
+let g:org_agenda_files = ['~/org/*.org']

 
 call plug#end()
 
 
 call plug#end()
 

+call deoplete#custom#option('sources', {
+      \ '_': ['ale'],
+      \})
+call deoplete#custom#source('ale', 'matchers', ['matchers_full_fuzzy'])
+

 filetype plugin indent on
 
 " colorscheme {{{1
 filetype plugin indent on
 
 " colorscheme {{{1


@@ -749,11 +766,6 @@ nnoremap <Leader>tu :GTestRunUnderCursor<CR>
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0
 
 " 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
 " vim-sneak {{{2
 let g:sneak#streak = 1
 let g:sneak#target_labels = "aoeuisnthdpylrcgfqjkxzmwvz" " dvorak


@@ -800,7 +812,7 @@ nnoremap <silent> gs :<C-U>set operatorfunc=SortLinesOpFunc<CR>g@
 vnoremap <silent> gs :sort<cr>
 
 " edit configs  {{{2
 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)
     let l:dir = split(&runtimepath,',')[0]
     if a:what == 'vimrc'
         let l:file = expand($MYVIMRC)


@@ -809,7 +821,7 @@ function! EditConfig(what)
     elseif empty(&filetype)
         echoe 'filetype is empty!'
     else
     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
     endif
 
     execute ':vsplit '.file


@@ -819,7 +831,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>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
 
 " spell check {{{2
 " http://tex.stackexchange.com/a/52932