X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/74653f28d2bf2ed1ccc5a8b68654cd882cbeea62..b76f00cb193eaba72d7515efda5098a724c05620:/vim/vimrc diff --git a/vim/vimrc b/vim/vimrc index 6fe4aec..534116d 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -3,92 +3,113 @@ " Author: Samir Benmendil " +" runtimepath {{{1 +set runtimepath ^=$XDG_CONFIG_HOME/vim +set runtimepath +=$XDG_CONFIG_HOME/vim/after + +" force python3 +if has('python3') | endif + " plugins {{{1 -filetype off -set runtimepath& " reset rtp " remove all autocommands autocmd! -set runtimepath+=$XDG_DATA_HOME/vim/vundle -call vundle#begin('$XDG_DATA_HOME/vim') - -Plugin 'gmarik/vundle' - -Plugin 'AndrewRadev/switch.vim' -Plugin 'airblade/vim-gitgutter' -Plugin 'alepez/vim-gtest' -Plugin 'bling/vim-airline' -Plugin 'chrisbra/checkattach' -Plugin 'derekwyatt/vim-fswitch' -Plugin 'elzr/vim-json' -Plugin 'firef0x/pkgbuild.vim' -Plugin 'junegunn/vim-easy-align' -Plugin 'justinmk/vim-sneak' -Plugin 'klen/python-mode' -Plugin 'kshenoy/vim-signature' -Plugin 'majutsushi/tagbar' -Plugin 'octol/vim-cpp-enhanced-highlight' -Plugin 'raimondi/delimitmate' -Plugin 'ram-z/vim-clang-format' -Plugin 'ram-z/vimwiki' -Plugin 'scrooloose/syntastic' -Plugin 'sgeb/vim-diff-fold' -Plugin 'shougo/unite.vim' -Plugin 'shougo/vimproc.vim' -Plugin 'sjl/gundo.vim' -Plugin 'thinca/vim-qfreplace' -Plugin 'tomtom/tcomment_vim' -Plugin 'tpope/vim-abolish' -Plugin 'tpope/vim-endwise' -Plugin 'tpope/vim-eunuch' -Plugin 'tpope/vim-fugitive' -Plugin 'tpope/vim-repeat' -Plugin 'tpope/vim-surround' "investigate vim-sandwich -Plugin 'tpope/vim-unimpaired' -Plugin 'tweekmonster/spellrotate.vim' -Plugin 'valloric/youcompleteme' -Plugin 'vim-scripts/mediawiki.vim' -Plugin 'vim-scripts/replacewithregister' -Plugin 'vim-scripts/yankring.vim' +call plug#begin('$XDG_DATA_HOME/vim') +" This does not update vim-plug, use PlugUpgrade instead +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' +Plug 'derekwyatt/vim-fswitch' +Plug 'elzr/vim-json' +Plug 'firef0x/pkgbuild.vim' +Plug 'junegunn/vim-easy-align' +Plug 'justinmk/vim-sneak' +Plug 'klen/python-mode' +Plug 'kshenoy/vim-signature' +Plug 'majutsushi/tagbar' +Plug 'octol/vim-cpp-enhanced-highlight' +Plug 'raimondi/delimitmate' +Plug 'sgeb/vim-diff-fold' +Plug 'shougo/unite.vim' +Plug 'shougo/vimproc.vim', {'do': 'make'} +Plug 'sjl/gundo.vim' +Plug 'thinca/vim-qfreplace' +Plug 'tomtom/tcomment_vim' +Plug 'tpope/vim-abolish' +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 --clangd-completer --clang-completer' } +Plug 'vim-scripts/mediawiki.vim' +Plug 'vim-scripts/replacewithregister' +Plug 'vim-scripts/yankring.vim' +Plug 'wincent/loupe' " colorschemes -Plugin 'flazz/vim-colorschemes' +Plug 'morhetz/gruvbox' " snippets -Plugin 'sirver/ultisnips' -Plugin 'honza/vim-snippets' +Plug 'sirver/ultisnips' +Plug 'honza/vim-snippets' " text objects -Plugin 'kana/vim-textobj-user' -Plugin 'julian/vim-textobj-variable-segment' -Plugin 'sgur/vim-textobj-parameter' -Plugin 'kana/vim-operator-user' +Plug 'kana/vim-textobj-user' +Plug 'julian/vim-textobj-variable-segment' +Plug 'sgur/vim-textobj-parameter' +Plug 'kana/vim-operator-user' " staging -" find an alternative (latex-box? Automatic Latex Plugin?) -Plugin 'vim-latex/vim-latex' -Plugin 'alx741/vinfo' -" needs editing colorscheme -" Plugin 'jeaye/color_coded' " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp -Plugin 'wincent/loupe' - -call vundle#end() - -" remove entries first -set runtimepath -=$HOME/.vim -set runtimepath -=$HOME/.vim/after -set runtimepath -=$XDG_CONFIG_HOME/vim -set runtimepath -=$XDG_CONFIG_HOME/vim/after -" then prepend and append them -set runtimepath ^=$XDG_CONFIG_HOME/vim -set runtimepath +=$XDG_CONFIG_HOME/vim/after +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() filetype plugin indent on " colorscheme {{{1 syntax on -colorscheme badfox +set background=dark +let g:gruvbox_contrast_dark = 'hard' +let g:gruvbox_contrast_light = 'soft' +colorscheme gruvbox +" override the background to be black +highligh Normal ctermbg=None " options {{{1 " moving around, searching and patterns {{{2 @@ -115,7 +136,7 @@ set list " show chars defined in 'listchars' set listchars=tab:❭\ " list of strings used for list mode set listchars+=extends:❯,precedes:❮ " Only shown when not in insert mode -au InsertLeave * :set listchars+=trail:· +set listchars+=trail:· augroup trailing au! au InsertEnter * :set listchars-=trail:· @@ -343,8 +364,21 @@ augroup END map " make -nnoremap r :make! -nnoremap :make! +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 r :call Make() " unhighlight search nnoremap / :silent nohl @@ -422,8 +456,8 @@ cnoremap cnoremap " proper movement when lines are wrapped -noremap j (v:count == 0 ? 'gj' : 'j') -noremap k (v:count == 0 ? 'gk' : 'k') +noremap j (v:count == 0 ? 'gj' : 'j') +noremap k (v:count == 0 ? 'gk' : 'k') " disable arrows noremap @@ -449,8 +483,10 @@ nnoremap zx zMzxzt map :ls:b " move between windows (skip previewwindow) -nnoremap w:if &previewwindow \| wincmd w \| endif -nnoremap W:if &previewwindow \| wincmd W \| endif +nnoremap w:if &previewwindow \| wincmd w \| endif +nnoremap W:if &previewwindow \| wincmd W \| endif +tnoremap w:if &previewwindow \| wincmd w \| endif +tnoremap W:if &previewwindow \| wincmd W \| endif "xterm mouse with middleclick paste nnoremap i @@ -531,11 +567,16 @@ 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! + autocmd BufWinEnter */.git/index resize 16 +augroup end " Gundo {{{2 nnoremap :GundoToggle @@ -593,6 +634,8 @@ let g:syntastic_style_warning_symbol='S' let g:syntastic_always_populate_loc_list=1 nmap y :SyntasticCheck +let g:syntastic_cpp_clang_tidy_post_args = "-p build*" + if ! &diff let g:syntastic_check_on_open=1 endif @@ -611,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 @@ -679,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'} @@ -705,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 @@ -728,11 +774,6 @@ nnoremap tu :GTestRunUnderCursor " 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 @@ -752,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 @@ -779,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) @@ -788,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 @@ -798,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