From 4d220ef603a7de566acdb14b52256611c0f99674 Mon Sep 17 00:00:00 2001 From: Martin Larsson Date: Fri, 30 Aug 2024 13:27:57 +0200 Subject: [PATCH] Change bindings and add bindings for git hunk navigation. Also enable gitsigns integration in lspsaga --- home/.config/nvim/lua/plugs/incline.lua | 17 ++++++++++++----- home/.config/nvim/lua/plugs/lspsaga.lua | 3 +++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/home/.config/nvim/lua/plugs/incline.lua b/home/.config/nvim/lua/plugs/incline.lua index 904b3af..735df49 100644 --- a/home/.config/nvim/lua/plugs/incline.lua +++ b/home/.config/nvim/lua/plugs/incline.lua @@ -6,7 +6,8 @@ return { event = "VeryLazy", lazy = true, config = function() - require("gitsigns").setup({}) + local gitsigns = require("gitsigns") + gitsigns.setup({}) local devicons = require("nvim-web-devicons") require("incline").setup({ window = { @@ -81,12 +82,18 @@ return { require("utils").add_keymaps({ n = { - ["gp"] = { - cmd = ":Gitsigns preview_hunk_inline", + ["gh"] = { + cmd = gitsigns.preview_hunk }, - ["gt"] = { - cmd = ":Gitsigns toggle_current_line_blame", + ["gb"] = { + cmd = gitsigns.toggle_current_line_blame }, + ["[h"] = { + cmd = function() gitsigns.nav_hunk("prev") end + }, + ["]h"] = { + cmd = function() gitsigns.nav_hunk("next") end + } } }) }) diff --git a/home/.config/nvim/lua/plugs/lspsaga.lua b/home/.config/nvim/lua/plugs/lspsaga.lua index fafb0f4..d2249df 100644 --- a/home/.config/nvim/lua/plugs/lspsaga.lua +++ b/home/.config/nvim/lua/plugs/lspsaga.lua @@ -22,6 +22,9 @@ return { kind = require("catppuccin.groups.integrations.lsp_saga").custom_kind(), border = "single", title = false + }, + code_action = { + extend_gitsigns = true } })