feat(nvim): remap yanking cmd, add hunk_preview

Author: sbulav

nvim/lua/config/autocommands.lua

@@ -1,5 +1,3 @@
-local utils = require "utils"
-
 vim.api.nvim_create_augroup("Highlight", { clear = true })
 vim.api.nvim_create_autocmd("TextYankPost", {
     command = "silent! lua vim.highlight.on_yank({higroup='IncSearch', timeout=1500, on_visual = true})",

nvim/lua/config/mappings.lua

@@ -107,7 +107,7 @@ vim.keymap.set("n", "<F3>", function()
     }
 end, { noremap = true, silent = true })
 
-vim.keymap.set("n", "<Space>fn", function()
+vim.keymap.set("n", "<Space>yn", function()
     local filename = vim.fn.expand "%:p"
     utils.info("Yanking current filename: " .. filename, "INFO")
     vim.fn.setreg("+", filename)
@@ -122,7 +122,7 @@ local function yank_nodepath()
     end
 end
 
-vim.keymap.set("n", "<Space>fp", function()
+vim.keymap.set("n", "<Space>yp", function()
     local path = yank_nodepath()
     print(path)
     utils.info("Yanking current " .. vim.bo.ft .. "path: " .. path, "INFO")

nvim/lua/config/options.lua

@@ -1,4 +1,5 @@
 vim.g.mapleader = " "
+vim.g.localleader = " "
 
 local globals = {
     -- Fix vim sandwitch overriding sentence text object

nvim/lua/plugins/gitsigns.lua

@@ -13,6 +13,35 @@ return {
                 delay = 100,
             },
             current_line_blame_formatter = " <abbrev_sha> | <author>, <author_time> - <summary>",
+            on_attach = function(bufnr)
+                vim.keymap.set(
+                    "n",
+                    "<leader>hp",
+                    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 "<Ignore>"
+                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 "<Ignore>"
+                end, { expr = true, buffer = bufnr, desc = "Jump to previous hunk" })
+            end,
             worktrees = {
                 {
                     toplevel = vim.env.HOME,