From f7bab906e2915c74a07aa293ddd7e93e7cfb6dab Mon Sep 17 00:00:00 2001 From: taco_diabolo Date: Wed, 7 Sep 2022 14:22:28 +0200 Subject: [PATCH] Update vim & config --- .bashrc | 6 +- .config/paru/paru.conf | 2 +- .vim/pack/ale | 2 +- .vim/pack/coc.nvim | 2 +- .vim/pack/ctrlp.vim | 2 +- .vim/pack/nerdtree | 2 +- .vim/pack/vim-airline | 2 +- .vim/pack/vim-airline-themes | 2 +- .vim/pack/vim-fugitive | 2 +- .vim/pack/vim-gitgutter | 2 +- .vim/pack/vim-ingo-library | 2 +- .vim/pack/vim-plug | 2 +- .vim/pluginconfig/vim-coc.vim | 140 +++------------------------------- 13 files changed, 26 insertions(+), 142 deletions(-) diff --git a/.bashrc b/.bashrc index 576ae444..2f15f674 100644 --- a/.bashrc +++ b/.bashrc @@ -11,13 +11,13 @@ export EDITOR=vim export VISUAL=vim alias dotfile='/usr/bin/git --git-dir=/home/vmware/dotfiles/ --work-tree=/home/vmware' export TERM=alacritty -alias cat="$(which bat) --wrap auto --color always --decorations auto --paging always --pager 'less -RF'" +alias cat="$(which bat) --plain --color always --decorations auto --paging always --pager 'less -RF'" alias ls="$(which exa) -l -F --color=auto --color-scale --all --group-directories-first --binary --group --header --links --modified --git --extended" alias find="$(which fd) -H --no-ignore --ignore-case --regex --follow --color auto" alias ps="$(which procs)" alias htop="$(which btm) --basic --celsius --color default --current_usage --group" alias top="$(which btm) --basic --celsius --color default --current_usage --group" -alias grep="$(which rg) --ignore-case --color auto --crlf --follow --hidden --multiline --no-config --no-ignore" -alias sxiv="$(which sxiv) -p -r" +alias grep="$(which rg) --ignore-case --color auto --crlf --follow --hidden --no-config --no-ignore" +alias nsxiv="$(which nsxiv) -a -p -r" export PATH="$HOME/.local/bin:$PATH" \ No newline at end of file diff --git a/.config/paru/paru.conf b/.config/paru/paru.conf index 139f7d08..ea6d8f7f 100644 --- a/.config/paru/paru.conf +++ b/.config/paru/paru.conf @@ -19,7 +19,7 @@ SudoLoop UseAsk CombinedUpgrade CleanAfter -UpgradeMenu +#UpgradeMenu SkipReview #NewsOnUpgrade Devel diff --git a/.vim/pack/ale b/.vim/pack/ale index 9bdc9236..9feba114 160000 --- a/.vim/pack/ale +++ b/.vim/pack/ale @@ -1 +1 @@ -Subproject commit 9bdc923624a489aa4c0a44cb1c77b984ad90e8ba +Subproject commit 9feba1148c7949523108a38ab45297d5ed0d5b1a diff --git a/.vim/pack/coc.nvim b/.vim/pack/coc.nvim index b4d732a2..f6382371 160000 --- a/.vim/pack/coc.nvim +++ b/.vim/pack/coc.nvim @@ -1 +1 @@ -Subproject commit b4d732a29b66c75e6d130cab296cc604a2d73bc4 +Subproject commit f63823713515d872e19f79c0b92258625738008a diff --git a/.vim/pack/ctrlp.vim b/.vim/pack/ctrlp.vim index 3ce448c9..8b4a9523 160000 --- a/.vim/pack/ctrlp.vim +++ b/.vim/pack/ctrlp.vim @@ -1 +1 @@ -Subproject commit 3ce448c9687ae96dea0caf4da388ecd8d9072f72 +Subproject commit 8b4a9523632049b3b373de1233bef346073b8982 diff --git a/.vim/pack/nerdtree b/.vim/pack/nerdtree index eed488b1..fc85a6f0 160000 --- a/.vim/pack/nerdtree +++ b/.vim/pack/nerdtree @@ -1 +1 @@ -Subproject commit eed488b1cd1867bd25f19f90e10440c5cc7d6424 +Subproject commit fc85a6f07c2cd694be93496ffad75be126240068 diff --git a/.vim/pack/vim-airline b/.vim/pack/vim-airline index 5d7e6560..2cea8346 160000 --- a/.vim/pack/vim-airline +++ b/.vim/pack/vim-airline @@ -1 +1 @@ -Subproject commit 5d7e6560817138110abec3e5c9903b408bc21f51 +Subproject commit 2cea8346cfaf0d92da079c27708bec7c092cef84 diff --git a/.vim/pack/vim-airline-themes b/.vim/pack/vim-airline-themes index 97cf3e6e..55bad92d 160000 --- a/.vim/pack/vim-airline-themes +++ b/.vim/pack/vim-airline-themes @@ -1 +1 @@ -Subproject commit 97cf3e6e638f936187d5f6e9b5eb1bdf0a4df256 +Subproject commit 55bad92d246a31e3425dfaf16b7eec657eab1fad diff --git a/.vim/pack/vim-fugitive b/.vim/pack/vim-fugitive index 5920f807..dd8107ca 160000 --- a/.vim/pack/vim-fugitive +++ b/.vim/pack/vim-fugitive @@ -1 +1 @@ -Subproject commit 5920f807f5a52957a6a09dd36aab1c00bfd85455 +Subproject commit dd8107cabf5fe85df94d5eedcae52415e543f208 diff --git a/.vim/pack/vim-gitgutter b/.vim/pack/vim-gitgutter index ded11946..f19b6203 160000 --- a/.vim/pack/vim-gitgutter +++ b/.vim/pack/vim-gitgutter @@ -1 +1 @@ -Subproject commit ded11946c04aeab5526f869174044019ae9e3c32 +Subproject commit f19b6203191d69de955d91467a5707959572119b diff --git a/.vim/pack/vim-ingo-library b/.vim/pack/vim-ingo-library index 8ed1eea4..733339b6 160000 --- a/.vim/pack/vim-ingo-library +++ b/.vim/pack/vim-ingo-library @@ -1 +1 @@ -Subproject commit 8ed1eea47cdc8508a57713a4a791ab958b05d727 +Subproject commit 733339b699824f0a3c90910c26d8fd949f13783c diff --git a/.vim/pack/vim-plug b/.vim/pack/vim-plug index 8fdabfba..b6739f35 160000 --- a/.vim/pack/vim-plug +++ b/.vim/pack/vim-plug @@ -1 +1 @@ -Subproject commit 8fdabfba0b5a1b0616977a32d9e04b4b98a6016a +Subproject commit b6739f358b60b7a5590c7a59e49b2305d23f1242 diff --git a/.vim/pluginconfig/vim-coc.vim b/.vim/pluginconfig/vim-coc.vim index d235a50a..c7b2c845 100755 --- a/.vim/pluginconfig/vim-coc.vim +++ b/.vim/pluginconfig/vim-coc.vim @@ -2,28 +2,27 @@ " delays and poor user experience. set updatetime=300 -" Don't pass messages to |ins-completion-menu|. -set shortmess+=c - " Always show the signcolumn, otherwise it would shift the text each time " diagnostics appear/become resolved. -if has("nvim-0.5.0") || has("patch-8.1.1564") - " Recently vim can merge signcolumn and number column into one - set signcolumn=number -else - set signcolumn=yes -endif +set signcolumn=yes " Use tab for trigger completion with characters ahead and navigate. +" NOTE: There's always complete item selected by default, you may want to enable +" no select by `"suggest.noselect": true` in your configuration file. " NOTE: Use command ':verbose imap ' to make sure tab is not mapped by " other plugin before putting this into your config. inoremap - \ pumvisible() ? "\" : - \ check_back_space() ? "\" : + \ coc#pum#visible() ? coc#pum#next(1) : + \ CheckBackspace() ? "\" : \ coc#refresh() -inoremap pumvisible() ? "\" : "\" +inoremap coc#pum#visible() ? coc#pum#prev(1) : "\" -function! s:check_back_space() abort +" Make to accept selected completion item or notify coc.nvim to format +" u breaks current undo, please make your own choice. +inoremap coc#pum#visible() ? coc#pum#confirm() + \: "\u\\=coc#on_enter()\" + +function! CheckBackspace() abort let col = col('.') - 1 return !col || getline('.')[col - 1] =~# '\s' endfunction @@ -34,118 +33,3 @@ if has('nvim') else inoremap coc#refresh() endif - -" Make auto-select the first completion item and notify coc.nvim to -" format on enter, could be remapped by other vim plugin -inoremap pumvisible() ? coc#_select_confirm() - \: "\u\\=coc#on_enter()\" - -" Use `[g` and `]g` to navigate diagnostics -" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list. -nmap [g (coc-diagnostic-prev) -nmap ]g (coc-diagnostic-next) - -" GoTo code navigation. -nmap gd (coc-definition) -nmap gy (coc-type-definition) -nmap gi (coc-implementation) -nmap gr (coc-references) - -" Use K to show documentation in preview window. -nnoremap K :call show_documentation() - -function! s:show_documentation() - if (index(['vim','help'], &filetype) >= 0) - execute 'h '.expand('') - elseif (coc#rpc#ready()) - call CocActionAsync('doHover') - else - execute '!' . &keywordprg . " " . expand('') - endif -endfunction - -" Highlight the symbol and its references when holding the cursor. -autocmd CursorHold * silent call CocActionAsync('highlight') - -" Symbol renaming. -nmap rn (coc-rename) - -" Formatting selected code. -xmap f (coc-format-selected) -nmap f (coc-format-selected) - -augroup mygroup - autocmd! - " Setup formatexpr specified filetype(s). - autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected') - " Update signature help on jump placeholder. - autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp') -augroup end - -" Applying codeAction to the selected region. -" Example: `aap` for current paragraph -xmap a (coc-codeaction-selected) -nmap a (coc-codeaction-selected) - -" Remap keys for applying codeAction to the current buffer. -nmap ac (coc-codeaction) -" Apply AutoFix to problem on the current line. -nmap qf (coc-fix-current) - -" Map function and class text objects -" NOTE: Requires 'textDocument.documentSymbol' support from the language server. -xmap if (coc-funcobj-i) -omap if (coc-funcobj-i) -xmap af (coc-funcobj-a) -omap af (coc-funcobj-a) -xmap ic (coc-classobj-i) -omap ic (coc-classobj-i) -xmap ac (coc-classobj-a) -omap ac (coc-classobj-a) - -" Remap and for scroll float windows/popups. -if has('nvim-0.4.0') || has('patch-8.2.0750') - nnoremap coc#float#has_scroll() ? coc#float#scroll(1) : "\" - nnoremap coc#float#has_scroll() ? coc#float#scroll(0) : "\" - inoremap coc#float#has_scroll() ? "\=coc#float#scroll(1)\" : "\" - inoremap coc#float#has_scroll() ? "\=coc#float#scroll(0)\" : "\" - vnoremap coc#float#has_scroll() ? coc#float#scroll(1) : "\" - vnoremap coc#float#has_scroll() ? coc#float#scroll(0) : "\" -endif - -" Use CTRL-S for selections ranges. -" Requires 'textDocument/selectionRange' support of language server. -" nmap (coc-range-select) -" xmap (coc-range-select) - -" Add `:Format` command to format current buffer. -command! -nargs=0 Format :call CocAction('format') - -" Add `:Fold` command to fold current buffer. -command! -nargs=? Fold :call CocAction('fold', ) - -" Add `:OR` command for organize imports of the current buffer. -command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organizeImport') - -" Add (Neo)Vim's native statusline support. -" NOTE: Please see `:h coc-status` for integrations with external plugins that -" provide custom statusline: lightline.vim, vim-airline. -set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')} - -" Mappings for CoCList -" Show all diagnostics. -nnoremap a :CocList diagnostics -" Manage extensions. -nnoremap e :CocList extensions -" Show commands. -nnoremap c :CocList commands -" Find symbol of current document. -nnoremap o :CocList outline -" Search workspace symbols. -nnoremap s :CocList -I symbols -" Do default action for next item. -nnoremap j :CocNext -" Do default action for previous item. -nnoremap k :CocPrev -" Resume latest coc list. -nnoremap p :CocListResume \ No newline at end of file