mirror of
https://github.com/zoriya/flake.git
synced 2026-06-20 17:10:05 +00:00
87 lines
2.7 KiB
Lua
87 lines
2.7 KiB
Lua
-- fugitive keybinds
|
|
|
|
vim.keymap.set("n", "<leader>gA", "<cmd>Git add -A<CR>", { desc = "Git add all" })
|
|
vim.keymap.set("n", "<leader>gc", "<cmd>Git commit<CR>", { desc = "Git commit" })
|
|
vim.keymap.set("n", "<leader>gC", "<cmd>Git commit --amend<CR>", { desc = "Git commit amend" })
|
|
vim.keymap.set("n", "<leader>gp", "<cmd>Git! push<CR>", { desc = "Git push" })
|
|
vim.keymap.set("n", "<leader>gP", "<cmd>Git! push --force-with-lease --force-if-includes<CR>",
|
|
{ desc = "Git push force" })
|
|
vim.keymap.set("n", "<leader>gb", "<cmd>Git blame<cr>", { desc = "Git fugitive status" })
|
|
vim.keymap.set("n", "<leader>gg", vim.cmd.Git, { desc = "Git fugitive status" })
|
|
|
|
vim.api.nvim_create_autocmd("FileType", {
|
|
desc = "Fix fold method",
|
|
group = vim.api.nvim_create_augroup("git-fold-method", { clear = true }),
|
|
callback = function(evt)
|
|
-- this seems to trigger a bit late & we need to :e to make it work. idk why
|
|
if evt.match == "git" then
|
|
vim.wo.foldmethod = "syntax"
|
|
else
|
|
vim.wo.foldmethod = "expr"
|
|
end
|
|
end,
|
|
})
|
|
|
|
return {
|
|
{
|
|
"gitsigns.nvim",
|
|
event = { "BufReadPost", "BufWritePost", "BufNewFile" },
|
|
opts = {
|
|
signs = {
|
|
add = { text = "▕" },
|
|
change = { text = "▕" },
|
|
changedelete = { text = "▕" },
|
|
untracked = { text = "▕" },
|
|
},
|
|
signs_staged = {
|
|
add = { text = "▕" },
|
|
change = { text = "▕" },
|
|
changedelete = { text = "▕" },
|
|
untracked = { text = "▕" },
|
|
},
|
|
on_attach = function(buffer)
|
|
local gs = require("gitsigns")
|
|
local function map(mode, l, r, desc)
|
|
vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc })
|
|
end
|
|
|
|
map('n', ']h', function() gs.nav_hunk("next", { target = "all" }) end, "Next Hunk")
|
|
map('n', '[h', function() gs.nav_hunk("prev", { target = "all" }) end, "Prev Hunk")
|
|
|
|
map({ "n", "v" }, "<leader>ha", gs.stage_hunk, "Add Hunk")
|
|
map({ "n", "v" }, "<leader>hr", gs.reset_hunk, "Reset Hunk")
|
|
map("n", "<leader>hp", gs.preview_hunk, "Preview Hunk")
|
|
|
|
map("n", "<leader>ga", gs.stage_buffer, "Add buffer")
|
|
map("n", "<leader>gR", gs.reset_buffer, "Reset Buffer")
|
|
|
|
map({ "o", "x" }, "ih", gs.select_hunk, "Git Select Hunk")
|
|
map({ "o", "x" }, "ah", gs.select_hunk, "Git Select Hunk")
|
|
end,
|
|
},
|
|
after = function(plug)
|
|
require("gitsigns").setup(plug.opts)
|
|
end,
|
|
},
|
|
|
|
{
|
|
"git-conflict.nvim",
|
|
-- load on enter to detect + highlight conflicts
|
|
-- lazy loading make it not work, idk why
|
|
-- event = { "BufReadPost", "BufWritePost", "BufNewFile" },
|
|
opts = {
|
|
default_mappings = {
|
|
ours = 'c<',
|
|
theirs = 'c>',
|
|
none = 'cd',
|
|
both = 'c=',
|
|
next = ']x',
|
|
prev = '[x',
|
|
},
|
|
},
|
|
after = function(plug)
|
|
require("git-conflict").setup(plug.opts)
|
|
end
|
|
},
|
|
}
|