feat: remove diffview

This commit is contained in:
2024-12-10 15:08:56 +01:00
parent c3e18e232f
commit 1494ef49d9
2 changed files with 3 additions and 86 deletions
-83
View File
@@ -1,83 +0,0 @@
-- https://github.com/sindrets/diffview.nvim
---@type LazyPluginSpec
return {
"sindrets/diffview.nvim",
keys = {
{ "<leader>gg", vim.cmd.DiffviewOpen, mode = "n" },
},
config = function()
local actions = require("diffview.actions")
require("diffview").setup({
enhanced_diff_hl = true,
use_icons = false,
signs = {
fold_closed = "+ ",
fold_open = "- ",
done = "",
},
view = {
default = {
layout = "diff2_horizontal",
winbar_info = true,
},
merge_tool = {
layout = "diff3_mixed",
disable_diagnostics = true,
winbar_info = true,
},
file_history = {
layout = "diff2_horizontal",
winbar_info = true,
},
},
default_args = {
DiffviewOpen = { "--imply-local" },
},
keymaps = {
file_panel = {
["<cr>"] = false,
{
"n",
"<CR>",
function()
actions.select_entry()
vim.cmd.wincmd("l")
end,
{ desc = "Open the current file in diffview" },
},
{
"n",
"s",
actions.toggle_stage_entry,
{ desc = "Stage / unstage the selected entry" },
},
{
"n",
"u",
actions.toggle_stage_entry,
{ desc = "Stage / unstage the selected entry" },
},
{
"n",
"cc",
function()
vim.cmd.G("commit")
vim.cmd.wincmd("J")
end,
{ desc = "Commit staged changes" },
},
{
"n",
"ca",
function()
vim.cmd.G("commit --amend")
vim.cmd.wincmd("J")
end,
{ desc = "Amend the last commit" },
},
},
},
})
end,
}
+3 -3
View File
@@ -3,7 +3,7 @@
local function git_status_tab()
vim.cmd.tabnew()
vim.cmd("leftabove vertical G")
vim.cmd("vertical resize 60")
vim.cmd("vertical resize 40")
vim.cmd.set("wfw")
end
@@ -13,10 +13,10 @@ return {
event = "VeryLazy",
---@type LazyKeysSpec[]
keys = {
{ "<leader>gd", vim.cmd.Gdiffsplit, mode = "n" },
{ "<leader>gd", vim.cmd.Ghdiffsplit, mode = "n" },
{ "<leader>gc", function() vim.cmd.G("commit") end, mode = "n" },
{ "<leader>ga", function() vim.cmd.G("commit --amend") end, mode = "n" },
{ "<leader>gp", function() vim.cmd.G("push") end, mode = "n" },
-- { "<leader>gg", git_status_tab, mode = "n" },
{ "<leader>gg", git_status_tab, mode = "n" },
},
}