fix(nvim): improve fugitive config

modules/neovim/config/after/ftplugin/fugitive.lua

@@ -0,0 +1,27 @@
+local keymap = function(lhs, rhs, desc)
+  vim.keymap.set("n", lhs, rhs, {
+    noremap = true,
+    silent = true,
+    buffer = vim.api.nvim_get_current_buf(),
+    desc = desc,
+  })
+end
+
+keymap("<leader>p", function()
+  vim.cmd.Git("push")
+end, "Git push")
+
+keymap("<leader>P", function()
+  vim.cmd.Git("pull --rebase")
+end, "Git pull --rebase")
+
+keymap("<leader>t", function()
+  vim.cmd.Git("push -u origin")
+end, "Git push tracking origin")
+
+keymap("<leader>o", function()
+  vim.cmd.Git("push")
+  vim.cmd.Git("pr")
+end, "Git push & open browser in PR view")
+
+vim.cmd.runtime({ "lua/bdelete.lua", bang = true })

modules/neovim/config/after/ftplugin/git.lua

@@ -1,5 +1 @@
-vim.keymap.set("n", "<leader>q", ":bdelete!<cr>", {
-  noremap = true,
-  silent = true,
-  buffer = vim.api.nvim_get_current_buf(),
-})
+vim.cmd.runtime({ "lua/bdelete.lua", bang = true })

modules/neovim/config/after/ftplugin/gomod.lua

@@ -1,4 +1 @@
-vim.cmd.runtime({
-  "after/ftplugin/go.lua",
-  bang = true,
-})
+vim.cmd.runtime({ "after/ftplugin/go.lua", bang = true })

modules/neovim/config/after/ftplugin/help.lua

@@ -1,5 +1 @@
-vim.keymap.set("n", "<leader>q", ":bdelete!<cr>", {
-  noremap = true,
-  silent = true,
-  buffer = vim.api.nvim_get_current_buf(),
-})
+vim.cmd.runtime({ "lua/bdelete.lua", bang = true })

modules/neovim/config/after/ftplugin/qf.lua

@@ -1,5 +1 @@
-vim.keymap.set("n", "<leader>q", ":bdelete!<cr>", {
-  noremap = true,
-  silent = true,
-  buffer = vim.api.nvim_get_current_buf(),
-})
+vim.cmd.runtime({ "lua/bdelete.lua", bang = true })

modules/neovim/config/lua/bdelete.lua

@@ -0,0 +1,6 @@
+vim.keymap.set("n", "<leader>q", ":bdelete!<cr>", {
+  noremap = true,
+  silent = true,
+  buffer = vim.api.nvim_get_current_buf(),
+  desc = "Close buffer",
+})

modules/neovim/config/lua/user/fugitive.lua

@@ -1,39 +1,5 @@
 vim.g.fugitive_legacy_commands = 0
 
-vim.api.nvim_create_autocmd("FileType", {
-  group = vim.api.nvim_create_augroup("user-fugitive", { clear = true }),
-  pattern = "fugitive",
-  callback = function()
-    local keymap = function(lhs, rhs, desc)
-      vim.keymap.set("n", lhs, rhs, {
-        noremap = true,
-        silent = true,
-        buffer = vim.api.nvim_get_current_buf(),
-        desc = desc,
-      })
-    end
-
-    keymap("<leader>p", function()
-      vim.cmd.Git("push")
-    end, "Git push")
-
-    keymap("<leader>P", function()
-      vim.cmd.Git("pull --rebase")
-    end, "Git pull --rebase")
-
-    keymap("<leader>t", function()
-      vim.cmd.Git("push -u origin")
-    end, "Git push tracking origin")
-
-    keymap("<leader>o", function()
-      vim.cmd.Git("push")
-      vim.cmd.Git("pr")
-    end, "Git push & open browser in PR view")
-
-    keymap("<leader>q", ":bdelete!<cr>", "Close Git status")
-  end,
-})
-
 vim.keymap.set("n", "<leader>gs", vim.cmd.Git, {
   noremap = true,
   silent = true,