diff --git a/lua/plugins/diffview.lua b/lua/plugins/diffview.lua deleted file mode 100644 index c75838c..0000000 --- a/lua/plugins/diffview.lua +++ /dev/null @@ -1,83 +0,0 @@ --- https://github.com/sindrets/diffview.nvim - ----@type LazyPluginSpec -return { - "sindrets/diffview.nvim", - keys = { - { "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 = { - [""] = false, - { - "n", - "", - 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, -} diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua index 8ebd489..14ef192 100644 --- a/lua/plugins/fugitive.lua +++ b/lua/plugins/fugitive.lua @@ -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 = { - { "gd", vim.cmd.Gdiffsplit, mode = "n" }, + { "gd", vim.cmd.Ghdiffsplit, mode = "n" }, { "gc", function() vim.cmd.G("commit") end, mode = "n" }, { "ga", function() vim.cmd.G("commit --amend") end, mode = "n" }, { "gp", function() vim.cmd.G("push") end, mode = "n" }, - -- { "gg", git_status_tab, mode = "n" }, + { "gg", git_status_tab, mode = "n" }, }, }