diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2021-05-27 21:43:11 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2021-05-27 21:43:11 +0200 |
| commit | 04b62fa77bfcd6d12ab0349770b7d3baeee0e2c7 (patch) | |
| tree | ce3164ce5652689c2047c138fae830c40e6b8fec /dotvimrc | |
| parent | 3837596e546ec321565628ce2fb5a4cddc529ecd (diff) | |
| download | vimrc-04b62fa77bfcd6d12ab0349770b7d3baeee0e2c7.tar.gz vimrc-04b62fa77bfcd6d12ab0349770b7d3baeee0e2c7.tar.bz2 vimrc-04b62fa77bfcd6d12ab0349770b7d3baeee0e2c7.zip | |
Update ACK and make
Diffstat (limited to 'dotvimrc')
| -rw-r--r-- | dotvimrc | 53 |
1 files changed, 22 insertions, 31 deletions
@@ -48,14 +48,21 @@ set tabpagemax=50 let mapleader="\<Space>" -"if has("autocmd") && exists("+omnifunc") - "autocmd Filetype * - "\ if &omnifunc == "" | - "\ setlocal omnifunc=syntaxcomplete#Complete | - "\ endif -"endif - -"'CoatiSoftware/vim-sourcetrail' +call plug#begin('~/.vim/plugged') +Plug 'mileszs/ack.vim' +Plug 'airblade/vim-gitgutter' +Plug 'vim-scripts/git-time-lapse' +Plug 'vim-scripts/ifdef-highlighting' +Plug 'jparise/vim-graphql' +Plug 'ctrlpvim/ctrlp.vim' +Plug 'rust-lang/rust.vim' +Plug 'scrooloose/nerdtree' +Plug 'majutsushi/tagbar' +Plug 'vim-scripts/taglist.vim' +Plug 'tpope/vim-fugitive' +call plug#end() + +"Plug 'CoatiSoftware/vim-sourcetrail' "nnoremap <leader>sr :SourcetrailRefresh<CR> "nnoremap <leader>sa :SourcetrailActivateToken<CR> @@ -78,22 +85,18 @@ nnoremap <silent> <F2> :call LanguageClient#textDocument_rename()<CR> set completefunc=LanguageClient#complete if executable('rg') - let g:ackprg = "rg -i --vimgrep" - let g:ack_default_options = " -i --vimgrep" + let g:ackprg = "rg -ui --vimgrep" + let g:ack_default_options = " -ui --vimgrep" elseif executable('ag') - let g:ackprg = 'ag --vimgrep' + let g:ackprg = 'ag -u --vimgrep' endif -noremap <Leader>a :Ack! -t rust -t cpp -t c -t py <cword><CR> -noremap <Leader>A :Ack! <cword><CR> +noremap <Leader>a :LAck! -t rust -t cpp -t c -t py <cword><CR> +noremap <Leader>A :LAck! <cword><CR> "Show + - ~ in the margin for vim modification let g:gitgutter_eager = 0 " only update on read/write -" The C matcher is supposedly faster -"'JazzCore/ctrlp-cmatcher' -"let g:ctrlp_match_func = {'match' : 'matcher#cmatch' } - " Also search tags let g:ctrlp_extensions = ['tag'] noremap <Leader>p :CtrlP<CR> @@ -104,25 +107,12 @@ noremap <Leader>b :CtrlPBuffer<CR> " Ignore some folders and files for CtrlP indexing let g:ctrlp_custom_ignore = { 'dir': '\.git$\|\CODENAME_Data' } -"Valloric/YouCompleteMe.git -let g:ycm_extra_conf_globlist = ['~/dab/*', '~/*'] -let g:ycm_always_populate_location_list = 1 -let g:ycm_rust_src_path = '/home/bram/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/src' -noremap <Leader>y :YcmDiags<CR> -noremap <Leader>Y :YcmRestartServer<CR> -noremap <Leader>F :YcmCompleter FixIt<CR>:ccl<CR> - "rust-lang/rust.vim let g:rust_recommended_style = 0 au FileType rust nmap <Leader>m :make build<CR> au FileType rust nmap <Leader>c :Cargo check<CR> -"tpope/vim-surround.git -"taglist.vim -"majutsushi/tagbar noremap <Leader>t :TagbarToggle<CR> -"ifdef-highlighting -"scrooloose/nerdtree colorscheme bramwombat @@ -265,7 +255,8 @@ endpython endfun noremap <F3> :call MPB_Prepend_Time()<CR> -noremap <Leader>m :make -j4<CR> +noremap <Leader>m :lmake -j4<CR> +noremap <Leader>M :lmake -C build -j4<CR> "Show trailing whitespace highlight ExtraWhitespace ctermbg=darkgreen guibg=#344011 |