summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSyndamia <kamen@syndamia.com>2024-08-08 08:08:28 +0300
committerSyndamia <kamen@syndamia.com>2024-08-08 08:08:28 +0300
commitedbcd138dc5d68762e7e4fe26a1b73534d4e75e6 (patch)
tree3d002598e36b98dc749ed4f3f25e33dab7cb9577
parenta6e96b572371a9da9f133f81e268befcae7d5fd8 (diff)
downloaddotfiles-edbcd138dc5d68762e7e4fe26a1b73534d4e75e6.tar
dotfiles-edbcd138dc5d68762e7e4fe26a1b73534d4e75e6.tar.gz
dotfiles-edbcd138dc5d68762e7e4fe26a1b73534d4e75e6.zip
feat(vim): Final vimrc edits
-rw-r--r--.vim/feat/term_scroll.vim10
-rw-r--r--.vim/mappings.vim2
2 files changed, 6 insertions, 6 deletions
diff --git a/.vim/feat/term_scroll.vim b/.vim/feat/term_scroll.vim
index d01fe4c..ef55017 100644
--- a/.vim/feat/term_scroll.vim
+++ b/.vim/feat/term_scroll.vim
@@ -1,19 +1,19 @@
" Scrolling (shows history) in terminal (except in lazygit)
" Scroll up to activate it, and press right mouse button to deactivate it
" Slightly modified version of: https://github.com/vim/vim/issues/2490#issuecomment-393973253
-tmap <silent> <ScrollWheelUp> <c-w>:call EnterNormalMode()<CR>
+tmap <silent> <buffer> <ScrollWheelUp> <c-w>:call EnterNormalMode()<CR>
function! ExitNormalMode()
- unmap <buffer> <silent> <RightMouse>
+ unmap <silent> <buffer> <RightMouse>
call feedkeys("a")
endfunction
function! EnterNormalMode()
- if @% == '!lazygit'
- tunmap <buffer> <silent> <ScrollWheelUp>
+ if bufname('%') =~ '!lazygit'
+ tunmap <buffer> <ScrollWheelUp>
elseif &buftype == 'terminal' && mode('') == 't'
call feedkeys("\<c-w>N")
call feedkeys("\<c-y>")
- map <buffer> <silent> <RightMouse> :call ExitNormalMode()<CR>
+ map <silent> <buffer> <RightMouse> :call ExitNormalMode()<CR>
endif
endfunction
diff --git a/.vim/mappings.vim b/.vim/mappings.vim
index c620b69..b751272 100644
--- a/.vim/mappings.vim
+++ b/.vim/mappings.vim
@@ -27,7 +27,7 @@ let g:tabman_toggle = '<S-Tab>'
"""
inoremap <C-S> <C-O>:w<CR>
-inoremap <C-V> <C-O>"+p<CR>
+inoremap <C-V> <C-O>"+P<CR>
inoremap <C-A> <Esc>ggVG
inoremap <C-R> <C-O><C-R>
inoremap <C-U> <C-O>u