Update vim & config

taco_diabolo 3 months ago
parent 180889521f
commit f7bab906e2
  1. 6
  2. 2
  3. 2
  4. 2
  5. 2
  6. 2
  7. 2
  8. 2
  9. 2
  10. 2
  11. 2
  12. 2
  13. 140

@ -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"

@ -19,7 +19,7 @@ SudoLoop

@ -1 +1 @@
Subproject commit 9bdc923624a489aa4c0a44cb1c77b984ad90e8ba
Subproject commit 9feba1148c7949523108a38ab45297d5ed0d5b1a

@ -1 +1 @@
Subproject commit b4d732a29b66c75e6d130cab296cc604a2d73bc4
Subproject commit f63823713515d872e19f79c0b92258625738008a

@ -1 +1 @@
Subproject commit 3ce448c9687ae96dea0caf4da388ecd8d9072f72
Subproject commit 8b4a9523632049b3b373de1233bef346073b8982

@ -1 +1 @@
Subproject commit eed488b1cd1867bd25f19f90e10440c5cc7d6424
Subproject commit fc85a6f07c2cd694be93496ffad75be126240068

@ -1 +1 @@
Subproject commit 5d7e6560817138110abec3e5c9903b408bc21f51
Subproject commit 2cea8346cfaf0d92da079c27708bec7c092cef84

@ -1 +1 @@
Subproject commit 97cf3e6e638f936187d5f6e9b5eb1bdf0a4df256
Subproject commit 55bad92d246a31e3425dfaf16b7eec657eab1fad

@ -1 +1 @@
Subproject commit 5920f807f5a52957a6a09dd36aab1c00bfd85455
Subproject commit dd8107cabf5fe85df94d5eedcae52415e543f208

@ -1 +1 @@
Subproject commit ded11946c04aeab5526f869174044019ae9e3c32
Subproject commit f19b6203191d69de955d91467a5707959572119b

@ -1 +1 @@
Subproject commit 8ed1eea47cdc8508a57713a4a791ab958b05d727
Subproject commit 733339b699824f0a3c90910c26d8fd949f13783c

@ -1 +1 @@
Subproject commit 8fdabfba0b5a1b0616977a32d9e04b4b98a6016a
Subproject commit b6739f358b60b7a5590c7a59e49b2305d23f1242

@ -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
set signcolumn=yes
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 <tab>' to make sure tab is not mapped by
" other plugin before putting this into your config.
inoremap <silent><expr> <TAB>
\ pumvisible() ? "\<C-n>" :
\ <SID>check_back_space() ? "\<TAB>" :
\ coc#pum#visible() ? coc#pum#next(1) :
\ CheckBackspace() ? "\<Tab>" :
\ coc#refresh()
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
inoremap <expr><S-TAB> coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"
function! s:check_back_space() abort
" Make <CR> to accept selected completion item or notify coc.nvim to format
" <C-g>u breaks current undo, please make your own choice.
inoremap <silent><expr> <CR> coc#pum#visible() ? coc#pum#confirm()
\: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
function! CheckBackspace() abort
let col = col('.') - 1
return !col || getline('.')[col - 1] =~# '\s'
@ -34,118 +33,3 @@ if has('nvim')
inoremap <silent><expr> <c-@> coc#refresh()
" Make <CR> auto-select the first completion item and notify coc.nvim to
" format on enter, <cr> could be remapped by other vim plugin
inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm()
\: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
" Use `[g` and `]g` to navigate diagnostics
" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list.
nmap <silent> [g <Plug>(coc-diagnostic-prev)
nmap <silent> ]g <Plug>(coc-diagnostic-next)
" GoTo code navigation.
nmap <silent> gd <Plug>(coc-definition)
nmap <silent> gy <Plug>(coc-type-definition)
nmap <silent> gi <Plug>(coc-implementation)
nmap <silent> gr <Plug>(coc-references)
" Use K to show documentation in preview window.
nnoremap <silent> K :call <SID>show_documentation()<CR>
function! s:show_documentation()
if (index(['vim','help'], &filetype) >= 0)
execute 'h '.expand('<cword>')
elseif (coc#rpc#ready())
call CocActionAsync('doHover')
execute '!' . &keywordprg . " " . expand('<cword>')
" Highlight the symbol and its references when holding the cursor.
autocmd CursorHold * silent call CocActionAsync('highlight')
" Symbol renaming.
nmap <leader>rn <Plug>(coc-rename)
" Formatting selected code.
xmap <leader>f <Plug>(coc-format-selected)
nmap <leader>f <Plug>(coc-format-selected)
augroup mygroup
" 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: `<leader>aap` for current paragraph
xmap <leader>a <Plug>(coc-codeaction-selected)
nmap <leader>a <Plug>(coc-codeaction-selected)
" Remap keys for applying codeAction to the current buffer.
nmap <leader>ac <Plug>(coc-codeaction)
" Apply AutoFix to problem on the current line.
nmap <leader>qf <Plug>(coc-fix-current)
" Map function and class text objects
" NOTE: Requires 'textDocument.documentSymbol' support from the language server.
xmap if <Plug>(coc-funcobj-i)
omap if <Plug>(coc-funcobj-i)
xmap af <Plug>(coc-funcobj-a)
omap af <Plug>(coc-funcobj-a)
xmap ic <Plug>(coc-classobj-i)
omap ic <Plug>(coc-classobj-i)
xmap ac <Plug>(coc-classobj-a)
omap ac <Plug>(coc-classobj-a)
" Remap <C-f> and <C-b> for scroll float windows/popups.
if has('nvim-0.4.0') || has('patch-8.2.0750')
nnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
nnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
inoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(1)\<cr>" : "\<Right>"
inoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(0)\<cr>" : "\<Left>"
vnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
vnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
" Use CTRL-S for selections ranges.
" Requires 'textDocument/selectionRange' support of language server.
" nmap <silent> <C-s> <Plug>(coc-range-select)
" xmap <silent> <C-s> <Plug>(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', <f-args>)
" 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 <silent><nowait> <space>a :<C-u>CocList diagnostics<cr>
" Manage extensions.
nnoremap <silent><nowait> <space>e :<C-u>CocList extensions<cr>
" Show commands.
nnoremap <silent><nowait> <space>c :<C-u>CocList commands<cr>
" Find symbol of current document.
nnoremap <silent><nowait> <space>o :<C-u>CocList outline<cr>
" Search workspace symbols.
nnoremap <silent><nowait> <space>s :<C-u>CocList -I symbols<cr>
" Do default action for next item.
nnoremap <silent><nowait> <space>j :<C-u>CocNext<CR>
" Do default action for previous item.
nnoremap <silent><nowait> <space>k :<C-u>CocPrev<CR>
" Resume latest coc list.
nnoremap <silent><nowait> <space>p :<C-u>CocListResume<CR>