Re-add vim-fugitive

This reverts commit 75f3877a13.
This commit is contained in:
Oliver Davies 2024-04-17 20:11:56 +01:00
parent 16f47fa41e
commit 942e334cb5
3 changed files with 33 additions and 9 deletions

23
after/plugin/fugitive.lua Normal file
View file

@ -0,0 +1,23 @@
vim.keymap.set("n", "<leader>gc", "<cmd>Git commit<cr><C-w>K")
vim.keymap.set("n", "<leader>gs", "<cmd>Git<cr><C-w>K")
vim.api.nvim_create_autocmd("BufWinEnter", {
pattern = "*",
callback = function()
if vim.bo.ft ~= "fugitive" then
return
end
local bufnr = vim.api.nvim_get_current_buf()
local opts = { buffer = bufnr, remap = false }
vim.keymap.set("n", "<leader>p", function()
vim.cmd.Git "push"
end, opts)
vim.keymap.set("n", "<leader>P", function()
vim.cmd.Git { "pull", "--rebase" }
end, opts)
end,
})

View file

@ -15,22 +15,22 @@ local vmap = require("opdavies.keymap").vmap
nmap { "[h", "<cmd>Gitsigns prev_hunk<CR>" } nmap { "[h", "<cmd>Gitsigns prev_hunk<CR>" }
nmap { "]h", "<cmd>Gitsigns next_hunk<CR>" } nmap { "]h", "<cmd>Gitsigns next_hunk<CR>" }
nmap { "<leader>gR", gitsigns.reset_buffer } nmap { "<leader>hR", gitsigns.reset_buffer }
nmap { "<leader>gS", gitsigns.stage_buffer } nmap { "<leader>hS", gitsigns.stage_buffer }
nmap { "<leader>gb", gitsigns.blame_line } nmap { "<leader>hb", gitsigns.blame_line }
nmap { "<leader>gp", gitsigns.preview_hunk } nmap { "<leader>hp", gitsigns.preview_hunk }
nmap { "<leader>gr", gitsigns.reset_hunk } nmap { "<leader>hr", gitsigns.reset_hunk }
nmap { "<leader>gs", gitsigns.stage_hunk } nmap { "<leader>hs", gitsigns.stage_hunk }
nmap { "<leader>gu", gitsigns.undo_stage_hunk } nmap { "<leader>hu", gitsigns.undo_stage_hunk }
vmap { vmap {
"<leader>gr", "<leader>hr",
function() function()
gitsigns.reset_hunk { vim.fn.line ".", vim.fn.line "v" } gitsigns.reset_hunk { vim.fn.line ".", vim.fn.line "v" }
end, end,
} }
vmap { vmap {
"<leader>gs", "<leader>hs",
function() function()
gitsigns.stage_hunk { vim.fn.line ".", vim.fn.line "v" } gitsigns.stage_hunk { vim.fn.line ".", vim.fn.line "v" }
end, end,

View file

@ -153,6 +153,7 @@ in rec {
# Git # Git
vimPlugins.committia-vim vimPlugins.committia-vim
vimPlugins.diffview-nvim vimPlugins.diffview-nvim
vimPlugins.vim-fugitive
# Debugging # Debugging
vimPlugins.nvim-dap vimPlugins.nvim-dap