Nvim: add diffview plugin

This commit is contained in:
Marko Korhonen 2024-01-24 13:51:39 +02:00
parent f9b7a93570
commit 845f4024df
Signed by: FunctionalHacker
GPG key ID: A7F78BCB859CD890
3 changed files with 8 additions and 3 deletions

View file

@ -28,7 +28,7 @@ keepBackup = false
prompt = false prompt = false
[mergetool "nvim"] [mergetool "nvim"]
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' cmd = nvim +DiffviewOpen
[diff] [diff]
tool = nvim tool = nvim
@ -37,7 +37,7 @@ tool = nvim
prompt = false prompt = false
[difftool "nvim"] [difftool "nvim"]
cmd = nvim -d $LOCAL $REMOTE cmd = nvim +DiffviewOpen
[pull] [pull]
rebase = merges rebase = merges

View file

@ -4,5 +4,7 @@ return {
enabled = vim.g.neovide == not nil, enabled = vim.g.neovide == not nil,
"yutkat/confirm-quit.nvim", "yutkat/confirm-quit.nvim",
event = "CmdlineEnter", event = "CmdlineEnter",
config = true, opts = {
quit_message = "You are in Neovide, are you sure you want to quit?",
},
} }

View file

@ -0,0 +1,3 @@
-- Improved diffs
--- @type LazyPluginSpec
return { "sindrets/diffview.nvim" }