qutebrowser: update defaults

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 137eab0e346bf6e4655c8e7206d8793d9fbeb099..7d88d12063344bfa977aad220d73af971abffd0e 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -46,11 +46,12 @@ 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-scriptease'

 Plug 'tpope/vim-speeddating'
 Plug 'tpope/vim-surround'  "investigate vim-sandwich
 Plug 'tpope/vim-unimpaired'
 Plug 'tweekmonster/spellrotate.vim'
 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'
 Plug 'vim-scripts/mediawiki.vim'
 Plug 'vim-scripts/replacewithregister'
 Plug 'vim-scripts/yankring.vim'


@@ -72,29 +73,22 @@ Plug 'kana/vim-operator-user'
 " staging
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
 Plug 'dense-analysis/ale' " {{{2
 " staging
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
 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_echo_msg_format = '[%linter%] %code: %%s'
 let g:ale_c_parse_compile_commands = 1
 let g:ale_cpp_parse_compile_commands = 1

+" don't use loclist as it's being populated by ycm
+" (might want to enable for other filetypes)
+let g:ale_set_loclist = 0

 let g:ale_cpp_gcc_options = ''
 let g:ale_cpp_gcc_options = ''

-let g:ale_cpp_clang_options = ''
+let g:ale_linters_ignore = { 'cpp': ['clangd', 'clangtidy', 'clang'] }

 
 

-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()
 
 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
 filetype plugin indent on
 
 " colorscheme {{{1


@@ -744,7 +738,9 @@ endfunction
 
 " youcompleteme {{{2
 let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*']
 
 " 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
 let g:ycm_extra_conf_vim_data = ['getcwd()']
 let g:ycm_add_preview_to_completeopt = 1
 let g:ycm_complete_in_comments = 1


@@ -812,7 +808,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)


@@ -821,7 +817,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


@@ -831,7 +827,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