From 1f975ad0750e011be2337d12dd22f32682cd824a Mon Sep 17 00:00:00 2001 From: Squibid Date: Wed, 2 Aug 2023 02:22:04 -0400 Subject: improve git integration --- after/plugin/gitsigns.lua | 8 ++++---- after/plugin/scrollbar.lua | 5 ++++- lua/core/binds.lua | 5 +++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/after/plugin/gitsigns.lua b/after/plugin/gitsigns.lua index b5436ae..440b0ca 100644 --- a/after/plugin/gitsigns.lua +++ b/after/plugin/gitsigns.lua @@ -12,10 +12,10 @@ gitsigns.setup { changedelete = { text = '~' }, untracked = { text = '┆' }, }, - signcolumn = true, -- Toggle with `:Gitsigns toggle_signs` - numhl = false, -- Toggle with `:Gitsigns toggle_numhl` - linehl = false, -- Toggle with `:Gitsigns toggle_linehl` - word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff` + signcolumn = true, + numhl = false, + linehl = false, + word_diff = false, watch_gitdir = { interval = 1000, follow_files = true diff --git a/after/plugin/scrollbar.lua b/after/plugin/scrollbar.lua index 7421536..cc98537 100644 --- a/after/plugin/scrollbar.lua +++ b/after/plugin/scrollbar.lua @@ -11,7 +11,10 @@ scrollbar.setup({ marks = { Cursor = { text = "*", - } + }, + GitAdd = { text = "|" }, + GitChange = { text = "|" }, + GitDelete = { text = "-" }, }, handlers = { cursor = true, diff --git a/lua/core/binds.lua b/lua/core/binds.lua index e495bff..4afc57c 100644 --- a/lua/core/binds.lua +++ b/lua/core/binds.lua @@ -98,5 +98,10 @@ map('n', 'zf', 'lua require("true-zen.focus").toggle()') map('n', 'zm', 'lua require("true-zen.minimalist").toggle()') map('n', 'za', 'lua require("true-zen.ataraxis").toggle()') +-- Git +map('n', 'gph', 'Gitsigns preview_hunk_inline') +map('n', 'gsh', 'Gitsigns stage_hunk') +map('n', 'gb', 'Gitsigns blame_line') + -- neogen map('n', 'df', 'lua require("neogen").generate()') -- cgit v1.2.1