aboutsummaryrefslogtreecommitdiffhomepage
path: root/vim
diff options
context:
space:
mode:
Diffstat (limited to 'vim')
-rw-r--r--vim/init/keymaps.vim19
-rw-r--r--vim/lua/mappings.lua2
2 files changed, 15 insertions, 6 deletions
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index 67cf1d0..7be91b5 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -266,6 +266,7 @@ augroup SaveLastBuffer
266 au BufLeave * let g:lastbuffer = bufnr() 266 au BufLeave * let g:lastbuffer = bufnr()
267augroup END 267augroup END
268 268
269" Uset <C-w>d to toggle Diff mode
269function! s:SwitchDiff() 270function! s:SwitchDiff()
270 if &diff 271 if &diff
271 windo | if &buftype == "nofile" | bdelete | endif 272 windo | if &buftype == "nofile" | bdelete | endif
@@ -277,6 +278,19 @@ endfunction
277com! SwitchDiff call s:SwitchDiff() 278com! SwitchDiff call s:SwitchDiff()
278nnoremap <C-w>d <Cmd>silent! SwitchDiff<CR> 279nnoremap <C-w>d <Cmd>silent! SwitchDiff<CR>
279 280
281function! s:SwitchDiffForGitHEAD()
282 nmap cdg
283 if &diff
284 windo | if &buftype == "nofile" | bdelete | endif
285 else
286 vert new | set buftype=nofile nobuflisted
287 read !git show HEAD:#
288 0d_ | diffthis | wincmd p | diffthis
289 endif
290endfunction
291com! SwitchDiffForGitHEAD call s:SwitchDiffForGitHEAD()
292nnoremap <C-w>D <Cmd>silent! SwitchDiffForGitHEAD<CR>
293
280 294
281"---------------------------------------------------------------------- 295"----------------------------------------------------------------------
282" MANAGE_WINDOWS 296" MANAGE_WINDOWS
@@ -551,8 +565,3 @@ else
551 \ --include='*.js' --include='*.vim' 565 \ --include='*.js' --include='*.vim'
552 \ '<root>' <CR> 566 \ '<root>' <CR>
553endif 567endif
554
555hi DiffAdd ctermfg=Green ctermbg=NONE
556hi DiffChange ctermfg=Yellow ctermbg=NONE
557hi DiffDelete ctermfg=LightBlue ctermbg=None
558hi DiffText ctermfg=Yellow ctermbg=None
diff --git a/vim/lua/mappings.lua b/vim/lua/mappings.lua
index 6aa81f6..d223431 100644
--- a/vim/lua/mappings.lua
+++ b/vim/lua/mappings.lua
@@ -213,5 +213,5 @@ vim.g.mkdp_preview_options = {
213 213
214 vim.cmd("setl nocul nonu nornu") 214 vim.cmd("setl nocul nonu nornu")
215 vim.cmd("hi ActiveWindow guibg=#2a5a6a guifg=White | setl winhighlight=Normal:ActiveWindow") 215 vim.cmd("hi ActiveWindow guibg=#2a5a6a guifg=White | setl winhighlight=Normal:ActiveWindow")
216 vim.cmd(':%s/\\%x1b\\[[0-9;]*m//g') 216 vim.cmd(':silent %s/\\%x1b\\[[0-9;]*m//g')
217 end, { desc = "Description" }) 217 end, { desc = "Description" })