h/nvim-old
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated keybinds for which-key integration

Browse Source
This commit is contained in:
Haelnorr
2025-01-31 17:06:59 +11:00
parent 21e9cf9f6c
commit 585d8eb7a1
18 changed files with 330 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
lua/haelnorr/lazy/fugitive.lua
View File

@@ -1,44 +1,47 @@
return {
"tpope/vim-fugitive",
config = function()
vim.keymap.set("n", "<leader>gs", vim.cmd.Git)
"tpope/vim-fugitive",
config = function()
vim.keymap.set("n", "<leader>g", vim.cmd.Git, { desc = "Open Git fugitive" })
local Haelnorr_Fugitive = vim.api.nvim_create_augroup("Haelnorr_Fugitive", {})
local Haelnorr_Fugitive = vim.api.nvim_create_augroup("Haelnorr_Fugitive", {})
local autocmd = vim.api.nvim_create_autocmd
autocmd("BufWinEnter", {
group = Haelnorr_Fugitive,
pattern = "*",
callback = function()
if vim.bo.ft ~= "fugitive" then
return
end
local autocmd = vim.api.nvim_create_autocmd
autocmd("BufWinEnter", {
group = Haelnorr_Fugitive,
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>s", function()
vim.cmd.Git('add -A')
end, opts)
vim.keymap.set("n", "<leader>c", function()
vim.cmd.Git('commit')
end, opts)
vim.keymap.set("n", "<leader>p", function()
vim.cmd.Git('push')
end, opts)
local bufnr = vim.api.nvim_get_current_buf()
vim.keymap.set("n", "<leader>s", function()
vim.cmd.Git("add -A")
end, { buffer = bufnr, remap = false, desc = "Stage all files" })
vim.keymap.set("n", "<leader>c", function()
vim.cmd.Git("commit")
end, { buffer = bufnr, remap = false, desc = "Commit" })
vim.keymap.set("n", "<leader>p", function()
vim.cmd.Git("push")
end, { buffer = bufnr, remap = false, desc = "Push" })
-- rebase always
vim.keymap.set("n", "<leader>P", function()
vim.cmd.Git({'pull', '--rebase'})
end, opts)
-- rebase always
vim.keymap.set("n", "<leader>P", function()
vim.cmd.Git({ "pull", "--rebase" })
end, { buffer = bufnr, remap = false, desc = "Pull with rebase" })
-- NOTE: It allows me to easily set the branch i am pushing and any tracking
-- needed if i did not set the branch up correctly
vim.keymap.set("n", "<leader>t", ":Git push -u origin ", opts);
end,
})
-- NOTE: It allows me to easily set the branch i am pushing and any tracking
-- needed if i did not set the branch up correctly
vim.keymap.set(
"n",
"<leader>t",
":Git push -u origin ",
{ buffer = bufnr, remap = false, desc = "Push and set origin" }
)
end,
})
vim.keymap.set("n", "gu", "<cmd>diffget //2<CR>")
vim.keymap.set("n", "gh", "<cmd>diffget //3<CR>")
end
vim.keymap.set("n", "gu", "<cmd>diffget //2<CR>")
vim.keymap.set("n", "gh", "<cmd>diffget //3<CR>")
end,
}