X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/3c22fe5c28e8f2e06bc608be2d78b580ffd2fefb..b76f00cb193eaba72d7515efda5098a724c05620:/vim/vimrc diff --git a/vim/vimrc b/vim/vimrc index 5b6fa65..534116d 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -7,6 +7,9 @@ set runtimepath ^=$XDG_CONFIG_HOME/vim set runtimepath +=$XDG_CONFIG_HOME/vim/after +" force python3 +if has('python3') | endif + " plugins {{{1 " remove all autocommands autocmd! @@ -17,6 +20,7 @@ Plug 'junegunn/vim-plug' Plug 'airblade/vim-gitgutter' Plug 'alepez/vim-gtest' +Plug 'alx741/vinfo' Plug 'andrewradev/switch.vim' Plug 'bling/vim-airline' Plug 'chrisbra/checkattach' @@ -30,11 +34,6 @@ Plug 'kshenoy/vim-signature' Plug 'majutsushi/tagbar' Plug 'octol/vim-cpp-enhanced-highlight' Plug 'raimondi/delimitmate' -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 'sgeb/vim-diff-fold' Plug 'shougo/unite.vim' Plug 'shougo/vimproc.vim', {'do': 'make'} @@ -46,10 +45,12 @@ Plug 'tpope/vim-endwise' 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 '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' @@ -70,6 +71,32 @@ Plug 'kana/vim-operator-user' " staging " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp +Plug 'dense-analysis/ale' " {{{2 +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_linters_ignore = { 'cpp': ['clangd', 'clangtidy', 'clang'] } + +Plug 'git@github.com:/ram-z/vim-orgmode', { 'branch': 'dev' } " {{{2 +Plug 'vim-scripts/syntaxrange' + +let g:org_agenda_files = ['~/org/*.org'] + +Plug 'neovimhaskell/haskell-vim' " {{{2 +let g:haskell_enable_quantification = 1 " to enable highlighting of `forall` +let g:haskell_enable_recursivedo = 1 " to enable highlighting of `mdo` and `rec` +let g:haskell_enable_arrowsyntax = 1 " to enable highlighting of `proc` +let g:haskell_enable_pattern_synonyms = 1 " to enable highlighting of `pattern` +let g:haskell_enable_typeroles = 1 " to enable highlighting of type roles +let g:haskell_enable_static_pointers = 1 " to enable highlighting of `static` +let g:haskell_backpack = 1 " to enable highlighting of backpack keywords +" }}} + +Plug 'aklt/plantuml-syntax' call plug#end() @@ -540,11 +567,11 @@ nmap dd :tab split \| Gdiff \| wincmd h " delete fugitive buffers when closed autocmd BufReadPost fugitive://* set bufhidden=delete -nnoremap gs :Gstatus -nnoremap gd :Gdiff -nnoremap gc :Gcommit -v +nnoremap gs :Git +nnoremap gd :Gdiffsplit +nnoremap gc :tab G commit -v nnoremap ga :Gwrite -nnoremap gb :Gblame +nnoremap gb :G blame augroup fugitive_gstatus au! @@ -627,7 +654,7 @@ let g:tcomment#filetype#guess = 0 " ultisnips {{{2 let g:UltiSnipsEditSplit = 'vertical' -let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips") +let g:UltiSnipsSnippetDirectories = [ expand("$XDG_CONFIG_HOME/vim/ultisnips") ] if has('fname_case') let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"] endif @@ -695,6 +722,9 @@ call unite#custom#source('file_rec/async', 'sorters', 'sorter_selecta') call unite#custom#default_action('buffer', 'open') nnoremap [unite]b :Unite buffer:- +" unite-jumplist {{{3 +nnoremap [unite]j :Unite output:jumps: + " unite-menu {{{3 let g:unite_source_menu_menus = {} let g:unite_source_menu_menus.fugitive = { 'description' : 'fugitive menu'} @@ -721,8 +751,8 @@ function! YRRunAfterMaps() 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') +let g:ycm_clangd_binary_path = 'clangd' " use clangd in path +let g:ycm_clangd_args = ['--clang-tidy'] let g:ycm_extra_conf_vim_data = ['getcwd()'] let g:ycm_add_preview_to_completeopt = 1 let g:ycm_complete_in_comments = 1 @@ -763,15 +793,6 @@ xmap T Sneak_T omap t Sneak_t omap T Sneak_T -" vimviki {{{2 -let g:vimwiki_list = [{'path': '$XDG_DATA_HOME/vimwiki'}] -let g:vimwiki_auto_chdir = 1 -augroup myvimwiki - au! BufRead $XDG_DATA_HOME/vimwiki/index.wiki !git -C "%:p:h" pull -q - au! BufRead,BufNewFile $XDG_DATA_HOME/vimwiki/diary/*.wiki !git -C "%:p:h" pull -q - au! BufWritePost $XDG_DATA_HOME/vimwiki/*.wiki exe '!git add "";git commit -qm"' . strftime("%FT%R") . '";git push -q' -augroup END - " functions {{{1 " Convenient command to see the difference between the current buffer and the @@ -790,7 +811,7 @@ nnoremap gs :set operatorfunc=SortLinesOpFuncg@ vnoremap gs :sort " 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) @@ -799,7 +820,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 @@ -809,7 +830,7 @@ nmap ev :call EditConfig('vimrc') nmap ef :call EditConfig('ftplugin') nmap es :call EditConfig('syntax') nmap ei :call EditConfig('indent') -nmap eu :UltiSnipsEdit:lcd %:p:h +nmap eu :call EditConfig('ultisnips', '.snippets') " spell check {{{2 " http://tex.stackexchange.com/a/52932