Clean up keymaps

lua/plugins/config/diffview.lua

@@ -41,6 +41,15 @@ require("diffview").setup({
     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",
@@ -56,31 +65,23 @@ require("diffview").setup({
             {
                 "n",
                 "cc",
-                ":G commit | wincmd J<CR>",
+                function ()
+                    vim.cmd.G("commit")
+                    vim.cmd.wincmd("J")
+                end,
                 { desc = "Commit staged changes", },
             },
             {
                 "n",
                 "ca",
-                ":G commit --amend | wincmd J<CR>",
+                function ()
+                    vim.cmd.G("commit --amend")
+                    vim.cmd.wincmd("J")
+                end,
                 { desc = "Amend the last commit", },
             },
         },
     },
 })
 
-local opts = { silent = true, remap = false, }
-vim.keymap.set("n", "<leader>gg", ":DiffviewOpen<CR>", opts)
-vim.api.nvim_create_autocmd("FileType", {
-    pattern = "DiffviewFiles",
-    callback = function ()
-        vim.keymap.set(
-            "n",
-            "<CR>",
-            function ()
-                actions.select_entry()
-                vim.fn.execute("wincmd l")
-            end,
-            { silent = true, noremap = true, buffer = true, })
-    end,
-})
+vim.keymap.set("n", "<leader>gg", vim.cmd.DiffviewOpen)