From 525efc6d1425dfab6d0b4ef45cdf5b7aa8d0f8a6 Mon Sep 17 00:00:00 2001 From: GasparVardanyan Date: Mon, 23 Feb 2026 01:38:33 +0400 Subject: [PATCH 1/4] feat(integrations): gitsigns --- lua/base46/init.lua | 1 + lua/base46/integrations/gitsigns.lua | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 lua/base46/integrations/gitsigns.lua diff --git a/lua/base46/init.lua b/lua/base46/init.lua index 8971b2fa..b82d6f2b 100644 --- a/lua/base46/init.lua +++ b/lua/base46/init.lua @@ -28,6 +28,7 @@ local integrations = { "tbline", "telescope", "whichkey", + "gitsigns", } for _, value in ipairs(opts.integrations) do diff --git a/lua/base46/integrations/gitsigns.lua b/lua/base46/integrations/gitsigns.lua new file mode 100644 index 00000000..90e0c944 --- /dev/null +++ b/lua/base46/integrations/gitsigns.lua @@ -0,0 +1,15 @@ +local colors = require("base46").get_theme_tb "base_30" + +local highligths = { + GitSignsAdd = { fg = colors.green }, + GitSignsChange = { fg = colors.blue }, + GitSignsDelete = { fg = colors.red }, + GitSignsAddNr = { fg = colors.green }, + GitSignsChangeNr = { fg = colors.blue }, + GitSignsDeleteNr = { fg = colors.red }, + GitSignsAddLn = { fg = colors.green }, + GitSignsDeleteLn = { fg = colors.red }, + GitSignsCurrentLineBlame = { fg = colors.one_bg }, +} + +return highligths From 6112da55a9519f389f0a041bf5fd63b9f2301b8a Mon Sep 17 00:00:00 2001 From: GasparVardanyan Date: Sat, 28 Feb 2026 06:12:28 +0400 Subject: [PATCH 2/4] fix(gitsigns): use proper fg for current line blame --- lua/base46/integrations/gitsigns.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/integrations/gitsigns.lua b/lua/base46/integrations/gitsigns.lua index 90e0c944..89ed16cb 100644 --- a/lua/base46/integrations/gitsigns.lua +++ b/lua/base46/integrations/gitsigns.lua @@ -9,7 +9,7 @@ local highligths = { GitSignsDeleteNr = { fg = colors.red }, GitSignsAddLn = { fg = colors.green }, GitSignsDeleteLn = { fg = colors.red }, - GitSignsCurrentLineBlame = { fg = colors.one_bg }, + GitSignsCurrentLineBlame = { fg = colors.grey_fg }, } return highligths From 52ba9c74710777f0ec517965a49cb23fbf8e0888 Mon Sep 17 00:00:00 2001 From: GasparVardanyan Date: Sat, 28 Feb 2026 06:26:15 +0400 Subject: [PATCH 3/4] fix(gitsigns): preserve the sorting in the integrations table --- lua/base46/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/init.lua b/lua/base46/init.lua index b82d6f2b..d15e7ec2 100644 --- a/lua/base46/init.lua +++ b/lua/base46/init.lua @@ -18,6 +18,7 @@ local integrations = { "defaults", "devicons", "git", + "gitsigns", "lsp", "mason", "nvcheatsheet", @@ -28,7 +29,6 @@ local integrations = { "tbline", "telescope", "whichkey", - "gitsigns", } for _, value in ipairs(opts.integrations) do From cf8327f92cbdf5e8f8f29755dc0949e5ddb02c60 Mon Sep 17 00:00:00 2001 From: GasparVardanyan Date: Sun, 1 Mar 2026 21:12:49 +0400 Subject: [PATCH 4/4] remove gitsigns from the default integrations list --- lua/base46/init.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/base46/init.lua b/lua/base46/init.lua index d15e7ec2..8971b2fa 100644 --- a/lua/base46/init.lua +++ b/lua/base46/init.lua @@ -18,7 +18,6 @@ local integrations = { "defaults", "devicons", "git", - "gitsigns", "lsp", "mason", "nvcheatsheet",