From bb75584fa2bb5a2b9878e7499fdb98d08dd598bd Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Wed, 24 Jan 2024 13:51:39 +0200
Subject: [PATCH] Nvim: add diffview plugin

---
 home/.config/git/config                        | 4 ++--
 home/.config/nvim/lua/plugins/confirm-quit.lua | 4 +++-
 home/.config/nvim/lua/plugins/diffview.lua     | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 home/.config/nvim/lua/plugins/diffview.lua

diff --git a/home/.config/git/config b/home/.config/git/config
index 25e6c42d..d3b78fbf 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -28,7 +28,7 @@ keepBackup = false
 prompt = false
 
 [mergetool "nvim"]
-cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+cmd = nvim +DiffviewOpen
 
 [diff]
 tool = nvim
@@ -37,7 +37,7 @@ tool = nvim
 prompt = false
 
 [difftool "nvim"]
-cmd = nvim -d $LOCAL $REMOTE
+cmd = nvim +DiffviewOpen
 
 [pull]
 rebase = merges
diff --git a/home/.config/nvim/lua/plugins/confirm-quit.lua b/home/.config/nvim/lua/plugins/confirm-quit.lua
index bcfac070..08d85558 100644
--- a/home/.config/nvim/lua/plugins/confirm-quit.lua
+++ b/home/.config/nvim/lua/plugins/confirm-quit.lua
@@ -4,5 +4,7 @@ return {
   enabled = vim.g.neovide == not nil,
   "yutkat/confirm-quit.nvim",
   event = "CmdlineEnter",
-  config = true,
+  opts = {
+    quit_message = "You are in Neovide, are you sure you want to quit?",
+  },
 }
diff --git a/home/.config/nvim/lua/plugins/diffview.lua b/home/.config/nvim/lua/plugins/diffview.lua
new file mode 100644
index 00000000..aa17c163
--- /dev/null
+++ b/home/.config/nvim/lua/plugins/diffview.lua
@@ -0,0 +1,3 @@
+-- Improved diffs
+--- @type LazyPluginSpec
+return { "sindrets/diffview.nvim" }