Add rest of settings

2026-05-16 11:42:20 -04:00
parent 11932ebf7f
commit 63c4fcc16c
18 changed files with 465 additions and 82 deletions
@@ -11,6 +11,29 @@ local M = {
 			{ "<leader>gg", "<cmd>Neogit<cr>", desc = "Show Neogit UI" },
 		},
 	},
+	{
+		"esmuellert/codediff.nvim",
+		dependencies = { "MunifTanjim/nui.nvim" },
+		cmd = "CodeDiff",
+	},
+	{
+		"lewis6991/gitsigns.nvim",
+	},
+	{
+		"akinsho/git-conflict.nvim",
+		version = "*",
+		config = function()
+			require("git-conflict").setup({
+				default_mappings = true, -- disable buffer local mapping created by this plugin
+				default_commands = true, -- disable commands created by this plugin
+				disable_diagnostics = true, -- This will disable the diagnostics in a buffer whilst it is conflicted
+				highlights = {
+					incoming = "DiffText",
+					current = "DiffAdd",
+				},
+			})
+		end,
+	},
 }

-return M
+return M