mirror of
https://oauth2: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@github.com/m1ngsama/chopsticks.git
synced 2026-05-10 19:10:59 +08:00
m1ngsama
dbb11c9473
Startup: replace vim-unimpaired (2.5ms) with 2-line blank line insertion. 29 plugins now. All [q/]q, [e/]e, [x/]x mappings were already ours. Runtime: - ALE lint_delay=200ms, echo_delay=100ms — less thrashing during edits - LSP virtual_text_delay=200ms, highlight_delay=200ms, echo_delay=100ms - Disable gitgutter default mappings (map_keys=0) — we don't use them - Merge two BufReadPre large-file autocmds into one (single getfsize) - Remove redundant filetype detection autocmds (Vim 9.2 handles natively)
26 lines
1.3 KiB
VimL
26 lines
1.3 KiB
VimL
" git.vim — Fugitive mappings, GitGutter config, conflict navigation
|
|
|
|
" ── GitGutter ───────────────────────────────────────────────────────────────
|
|
|
|
let g:gitgutter_map_keys = 0
|
|
let g:gitgutter_sign_added = '+'
|
|
let g:gitgutter_sign_modified = '~'
|
|
let g:gitgutter_sign_removed = '-'
|
|
let g:gitgutter_sign_removed_first_line = '^'
|
|
let g:gitgutter_sign_modified_removed = '~'
|
|
|
|
" ── Fugitive ────────────────────────────────────────────────────────────────
|
|
|
|
if exists('g:plugs["vim-fugitive"]')
|
|
nnoremap <leader>gs :Git status<CR>
|
|
nnoremap <leader>gc :Git commit<CR>
|
|
nnoremap <leader>gp :Git push<CR>
|
|
nnoremap <leader>gl :Git pull<CR>
|
|
nnoremap <leader>gd :Gdiffsplit<CR>
|
|
nnoremap <leader>gb :Git blame<CR>
|
|
endif
|
|
|
|
" ── Conflict Navigation ────────────────────────────────────────────────────
|
|
|
|
nnoremap <silent> ]x /^\(<<<<<<<\\|=======\\|>>>>>>>\)<CR>
|
|
nnoremap <silent> [x ?^\(<<<<<<<\\|=======\\|>>>>>>>\)<CR>
|