From c525a3e6e429137d8cf4f5756d3ae2332ec5c0e9 Mon Sep 17 00:00:00 2001 From: Oliver Ladner Date: Thu, 3 Apr 2025 14:27:32 +0200 Subject: [PATCH 1/2] feat(gitsigns): keymap for :Gitsigns preview_hunk --- lua/weeheavy/plugins/gitsigns.lua | 59 ++++++++++--------------------- 1 file changed, 19 insertions(+), 40 deletions(-) diff --git a/lua/weeheavy/plugins/gitsigns.lua b/lua/weeheavy/plugins/gitsigns.lua index fd7391b..9b38ca7 100644 --- a/lua/weeheavy/plugins/gitsigns.lua +++ b/lua/weeheavy/plugins/gitsigns.lua @@ -1,43 +1,22 @@ -- Adds git related signs to the gutter, as well as utilities for managing changes return { - "lewis6991/gitsigns.nvim", - opts = { - -- See `:help gitsigns.txt` - signs = { - add = { text = "+" }, - change = { text = "~" }, - delete = { text = "_" }, - topdelete = { text = "‾" }, - changedelete = { text = "~" }, - }, - on_attach = function(bufnr) - --vim.keymap.set( - -- "n", - -- "ggh", - -- require("gitsigns").preview_hunk, - -- { buffer = bufnr, desc = "Preview git hunk" } - --) - - -- don't override the built-in and fugitive keymaps - local gs = package.loaded.gitsigns - vim.keymap.set({ "n", "v" }, "]c", function() - if vim.wo.diff then - return "]c" - end - vim.schedule(function() - gs.next_hunk() - end) - return "" - end, { expr = true, buffer = bufnr, desc = "Jump to next hunk" }) - vim.keymap.set({ "n", "v" }, "[c", function() - if vim.wo.diff then - return "[c" - end - vim.schedule(function() - gs.prev_hunk() - end) - return "" - end, { expr = true, buffer = bufnr, desc = "Jump to previous hunk" }) - end, - }, + "lewis6991/gitsigns.nvim", + opts = { + -- See `:help gitsigns.txt` + signs = { + add = { text = "+" }, + change = { text = "~" }, + delete = { text = "_" }, + topdelete = { text = "‾" }, + changedelete = { text = "~" }, + }, + on_attach = function(bufnr) + vim.keymap.set( + "n", + "gg", + require("gitsigns").preview_hunk, + { buffer = bufnr, desc = "Preview git hunk" } + ) + end, + }, } From 2fc217a01da85e1f574b6af4a891dce691bf7b9f Mon Sep 17 00:00:00 2001 From: Oliver Ladner Date: Thu, 3 Apr 2025 14:27:39 +0200 Subject: [PATCH 2/2] chore: update lazy plugins --- lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 8bb6cec..98604bd 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -11,8 +11,8 @@ "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mini.nvim": { "branch": "main", "commit": "687fa868d869078194c02065628712982d971fd6" }, "newpaper.nvim": { "branch": "main", "commit": "d8f2a29001f795a59e4f28713427c200c15449ea" }, - "nvim-lint": { "branch": "master", "commit": "93b8040115c9114dac1047311763bef275e752dc" }, - "nvim-treesitter": { "branch": "master", "commit": "30654ee72a69e7c76a54b66d748dae088429e863" }, + "nvim-lint": { "branch": "master", "commit": "81e8ba7655cc4395b1092ef4e1b6e83f54cd54ad" }, + "nvim-treesitter": { "branch": "master", "commit": "997288c55253e27f782d991099490f80205d65bf" }, "nvim-treesitter-context": { "branch": "master", "commit": "93b29a32d5f4be10e39226c6b796f28d68a8b483" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" }, "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" },