Dreaded_X/dotfiles
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Adjusted git keymaps to be easier to use

Browse Source
This commit is contained in:
Dreaded_X 2025-05-29 21:39:13 +02:00
parent 3291fb8111
commit 244c1929a3
Signed by: Dreaded_X
GPG Key ID: 5A0CBFE3C3377FAA
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nvim/dot-config/nvim/lua/autocmds.lua
View File

@ -69,7 +69,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
if client and client:supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then if client and client:supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then
map("<leader>th", function() map("<leader>th", function()
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = event.buf })) vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = event.buf }))
end, "Toggle inlay hints") end, "Inlay hints")
end end
end, end,
}) })

11
nvim/dot-config/nvim/lua/plugins/comment.lua
View File

@ -1,6 +1,13 @@
-- https://github.com/numToStr/Comment.nvim -- https://github.com/numToStr/Comment.nvim
return { return {
'numToStr/Comment.nvim', "numToStr/Comment.nvim",
event = "VeryLazy", event = "VeryLazy",
opts = {}, opts = {
toggler = {
block = "gBc",
},
opleader = {
block = "gB",
},
},
} }

13
nvim/dot-config/nvim/lua/plugins/gitsigns.lua
View File

@ -28,19 +28,22 @@ return {
}, },
init = function() init = function()
local ga = require("gitsigns.actions") local ga = require("gitsigns.actions")
vim.keymap.set("n", "<leader>gs", ga.stage_hunk, { desc = "(Un)stage hunk" }) vim.keymap.set("n", "gs", ga.stage_hunk, { desc = "(Un)stage hunk" })
vim.keymap.set("v", "<leader>gs", function() vim.keymap.set("n", "gS", ga.stage_buffer, { desc = "Stage buffer" })
vim.keymap.set("v", "gs", function()
ga.stage_hunk({ vim.fn.line("."), vim.fn.line("v") }) ga.stage_hunk({ vim.fn.line("."), vim.fn.line("v") })
end, { desc = "(Un)stage selection" }) end, { desc = "(Un)stage selection" })
vim.keymap.set("n", "<leader>gd", ga.preview_hunk, { desc = "Diff hunk" }) vim.keymap.set("n", "gd", ga.preview_hunk, { desc = "Diff hunk" })
vim.keymap.set("n", "<leader>gb", ga.toggle_current_line_blame, { desc = "Blame" }) vim.keymap.set("n", "<leader>tb", ga.toggle_current_line_blame, { desc = "Line blame" })
vim.keymap.set("n", "gb", ga.blame_line, { desc = "View blame" })
vim.keymap.set("n", "<leader>gr", ga.reset_hunk, { desc = "Reset hunk" }) vim.keymap.set("n", "<leader>gr", ga.reset_hunk, { desc = "Reset hunk" })
vim.keymap.set("n", "<leader>gR", ga.reset_buffer, { desc = "Reset buffer" })
vim.keymap.set("v", "<leader>gr", function() vim.keymap.set("v", "<leader>gr", function()
ga.reset_hunk({ vim.fn.line("."), vim.fn.line("v") }) ga.reset_hunk({ vim.fn.line("."), vim.fn.line("v") })
end, { desc = "Reset selection" }) end, { desc = "Git reset selection" })
vim.keymap.set("n", "]g", function() vim.keymap.set("n", "]g", function()
ga.nav_hunk("next") ga.nav_hunk("next")

3
nvim/dot-config/nvim/lua/plugins/which-key.lua
View File

@ -48,8 +48,9 @@ return {
-- TODO: Only make a category show up if there actually are any keybinds under it -- TODO: Only make a category show up if there actually are any keybinds under it
require("which-key").add({ require("which-key").add({
{ "<leader>b", group = "Buffer" }, { "<leader>b", group = "Buffer" },
{ "<leader>d", group = "Document" }, { "<leader>d", group = "Doument" },
{ "<leader>g", group = "Git" }, { "<leader>g", group = "Git" },
{ "<leader>t", group = "Toggle" },
{ "<leader>s", group = "Search" }, { "<leader>s", group = "Search" },
{ "gr", group = "LSP" }, { "gr", group = "LSP" },
}) })