From 8ca75d2ecc98680e2392cba45a2aba73fc732058 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Fri, 14 Jun 2024 00:42:18 +0200 Subject: [PATCH] Improved gitsigns settings --- nvim/dot-config/nvim/lua/plugins/gitsigns.lua | 23 ++++++++++++++++--- nvim/dot-config/nvim/lua/themes/gruvbox.lua | 4 ++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/nvim/dot-config/nvim/lua/plugins/gitsigns.lua b/nvim/dot-config/nvim/lua/plugins/gitsigns.lua index 996e808..1eb3496 100644 --- a/nvim/dot-config/nvim/lua/plugins/gitsigns.lua +++ b/nvim/dot-config/nvim/lua/plugins/gitsigns.lua @@ -8,6 +8,21 @@ return { delete = { text = "_" }, topdelete = { text = "‾" }, changedelete = { text = "~" }, + untracked = { text = "|" }, + }, + signs_staged = { + add = { text = "+" }, + change = { text = "~" }, + delete = { text = "_" }, + topdelete = { text = "‾" }, + changedelete = { text = "~" }, + untracked = { text = "|" }, + }, + attach_to_untracked = true, + current_line_blame_opts = { + virt_text_pos = "right_align", + delay = 200, + priority = 9999, }, }, init = function() @@ -23,11 +38,13 @@ return { { desc = "[G]it undo [S]tage hunk" } ) + vim.keymap.set("n", "gd", require("gitsigns.actions").preview_hunk, { desc = "[G]it [D]iff hunk" }) + vim.keymap.set( "n", - "gd", - require("gitsigns.actions").preview_hunk_inline, - { desc = "[G]it [D]iff hunk" } + "gb", + require("gitsigns.actions").toggle_current_line_blame, + { desc = "[G]it [B]lame" } ) vim.keymap.set("n", "gr", require("gitsigns.actions").reset_hunk, { desc = "[G]it [R]eset hunk" }) diff --git a/nvim/dot-config/nvim/lua/themes/gruvbox.lua b/nvim/dot-config/nvim/lua/themes/gruvbox.lua index 3b526aa..665cef6 100644 --- a/nvim/dot-config/nvim/lua/themes/gruvbox.lua +++ b/nvim/dot-config/nvim/lua/themes/gruvbox.lua @@ -42,8 +42,12 @@ return { TodoCommentTest = { fg = palette.bright_purple }, TodoCommentDefault = { fg = palette.bright_blue }, GitSignsAdd = { link = "GruvboxGreenSign" }, + GitSignsStagedAdd = { fg = palette.dark_green, bg = palette.dark1 }, GitSignsChange = { link = "GruvboxAquaSign" }, + GitSignsStagedChange = { fg = palette.dark_aqua, bg = palette.dark1 }, GitSignsDelete = { link = "GruvboxRedSign" }, + GitSignsStagedDelete = { fg = palette.dark_red, bg = palette.dark1 }, + GitSignsCurrentLineBlame = { link = "GruvboxFg4" }, NeoTreeGitAdded = { link = "GruboxGreen" }, NeoTreeGitModified = { link = "GruvboxAqua" }, NeoTreeGitDelete = { link = "GruboxRed" },