From 50b44520d604739e5f77c1e0f7a7484782d28871 Mon Sep 17 00:00:00 2001 From: Benjamin Wolff Date: Sun, 20 Apr 2025 22:55:45 +0200 Subject: [PATCH 1/4] add diff highlighting --- lua/neogit/lib/hl.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lua/neogit/lib/hl.lua b/lua/neogit/lib/hl.lua index 483913a64..210cd50f6 100644 --- a/lua/neogit/lib/hl.lua +++ b/lua/neogit/lib/hl.lua @@ -188,14 +188,14 @@ function M.setup(config) NeogitDiffContext = { bg = palette.bg1 }, NeogitDiffContextHighlight = { bg = palette.bg2 }, NeogitDiffContextCursor = { bg = palette.bg1 }, - NeogitDiffAdditions = { fg = palette.bg_green }, - NeogitDiffAdd = { bg = palette.line_green, fg = palette.bg_green }, - NeogitDiffAddHighlight = { bg = palette.line_green, fg = palette.green }, - NeogitDiffAddCursor = { bg = palette.bg1, fg = palette.green }, - NeogitDiffDeletions = { fg = palette.bg_red }, - NeogitDiffDelete = { bg = palette.line_red, fg = palette.bg_red }, - NeogitDiffDeleteHighlight = { bg = palette.line_red, fg = palette.red }, - NeogitDiffDeleteCursor = { bg = palette.bg1, fg = palette.red }, + NeogitDiffAdditions = { fg = palette.bg_green , ctermfg = 2 }, + NeogitDiffAdd = { bg = palette.line_green, fg = palette.bg_green, ctermfg = 2 }, + NeogitDiffAddHighlight = { bg = palette.line_green, fg = palette.green, ctermfg = 2 }, + NeogitDiffAddCursor = { bg = palette.bg1, fg = palette.green, ctermfg = 2 }, + NeogitDiffDeletions = { fg = palette.bg_red, ctermfg = 1 }, + NeogitDiffDelete = { bg = palette.line_red, fg = palette.bg_red, ctermfg = 1 }, + NeogitDiffDeleteHighlight = { bg = palette.line_red, fg = palette.red, ctermfg = 1 }, + NeogitDiffDeleteCursor = { bg = palette.bg1, fg = palette.red, ctermfg = 1 }, NeogitPopupSectionTitle = { link = "Function" }, NeogitPopupBranchName = { link = "String" }, NeogitPopupBold = { bold = palette.bold }, From 63d6701732fd7db29d7020cbb65062930344297e Mon Sep 17 00:00:00 2001 From: Benjamin Wolff Date: Sun, 20 Apr 2025 23:17:31 +0200 Subject: [PATCH 2/4] choose a cterm foreground color for all highlight groups --- lua/neogit/lib/hl.lua | 112 +++++++++++++++++++++--------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/lua/neogit/lib/hl.lua b/lua/neogit/lib/hl.lua index 210cd50f6..63061fcdd 100644 --- a/lua/neogit/lib/hl.lua +++ b/lua/neogit/lib/hl.lua @@ -150,25 +150,25 @@ function M.setup(config) -- stylua: ignore hl_store = { - NeogitGraphAuthor = { fg = palette.orange }, - NeogitGraphRed = { fg = palette.red }, - NeogitGraphWhite = { fg = palette.white }, - NeogitGraphYellow = { fg = palette.yellow }, - NeogitGraphGreen = { fg = palette.green }, - NeogitGraphCyan = { fg = palette.cyan }, - NeogitGraphBlue = { fg = palette.blue }, - NeogitGraphPurple = { fg = palette.purple }, - NeogitGraphGray = { fg = palette.grey }, - NeogitGraphOrange = { fg = palette.orange }, - NeogitGraphBoldOrange = { fg = palette.orange, bold = palette.bold }, - NeogitGraphBoldRed = { fg = palette.red, bold = palette.bold }, - NeogitGraphBoldWhite = { fg = palette.white, bold = palette.bold }, - NeogitGraphBoldYellow = { fg = palette.yellow, bold = palette.bold }, - NeogitGraphBoldGreen = { fg = palette.green, bold = palette.bold }, - NeogitGraphBoldCyan = { fg = palette.cyan, bold = palette.bold }, - NeogitGraphBoldBlue = { fg = palette.blue, bold = palette.bold }, - NeogitGraphBoldPurple = { fg = palette.purple, bold = palette.bold }, - NeogitGraphBoldGray = { fg = palette.grey, bold = palette.bold }, + NeogitGraphAuthor = { fg = palette.orange , ctermfg = 3 }, + NeogitGraphRed = { fg = palette.red, ctermfg = 1 }, + NeogitGraphWhite = { fg = palette.white, ctermfg = 7 }, + NeogitGraphYellow = { fg = palette.yellow, ctermfg = 3 }, + NeogitGraphGreen = { fg = palette.green, ctermfg = 2 }, + NeogitGraphCyan = { fg = palette.cyan, ctermfg = 6 }, + NeogitGraphBlue = { fg = palette.blue, ctermfg = 4 }, + NeogitGraphPurple = { fg = palette.purple, ctermfg = 5 }, + NeogitGraphGray = { fg = palette.grey, ctermfg = 7 }, + NeogitGraphOrange = { fg = palette.orange, ctermfg = 3 }, + NeogitGraphBoldOrange = { fg = palette.orange, bold = palette.bold, ctermfg = 3 }, + NeogitGraphBoldRed = { fg = palette.red, bold = palette.bold, ctermfg = 1 }, + NeogitGraphBoldWhite = { fg = palette.white, bold = palette.bold, ctermfg = 7 }, + NeogitGraphBoldYellow = { fg = palette.yellow, bold = palette.bold, ctermfg = 3 }, + NeogitGraphBoldGreen = { fg = palette.green, bold = palette.bold, ctermfg = 2 }, + NeogitGraphBoldCyan = { fg = palette.cyan, bold = palette.bold, ctermfg = 6 }, + NeogitGraphBoldBlue = { fg = palette.blue, bold = palette.bold, ctermfg = 4 }, + NeogitGraphBoldPurple = { fg = palette.purple, bold = palette.bold, ctermfg = 5 }, + NeogitGraphBoldGray = { fg = palette.grey, bold = palette.bold, ctermfg = 7 }, NeogitSubtleText = { link = "Comment" }, NeogitSignatureGood = { link = "NeogitGraphGreen" }, NeogitSignatureBad = { link = "NeogitGraphBoldRed" }, @@ -179,15 +179,15 @@ function M.setup(config) NeogitSignatureGoodExpiredKey = { link = "NeogitGraphYellow" }, NeogitSignatureGoodRevokedKey = { link = "NeogitGraphRed" }, NeogitCursorLine = { link = "CursorLine" }, - NeogitHunkMergeHeader = { fg = palette.bg2, bg = palette.grey, bold = palette.bold }, - NeogitHunkMergeHeaderHighlight = { fg = palette.bg0, bg = palette.bg_cyan, bold = palette.bold }, - NeogitHunkMergeHeaderCursor = { fg = palette.bg0, bg = palette.bg_cyan, bold = palette.bold }, - NeogitHunkHeader = { fg = palette.bg0, bg = palette.grey, bold = palette.bold }, - NeogitHunkHeaderHighlight = { fg = palette.bg0, bg = palette.md_purple, bold = palette.bold }, - NeogitHunkHeaderCursor = { fg = palette.bg0, bg = palette.md_purple, bold = palette.bold }, - NeogitDiffContext = { bg = palette.bg1 }, - NeogitDiffContextHighlight = { bg = palette.bg2 }, - NeogitDiffContextCursor = { bg = palette.bg1 }, + NeogitHunkMergeHeader = { fg = palette.bg2, bg = palette.grey, bold = palette.bold, ctermfg = 4 }, + NeogitHunkMergeHeaderHighlight = { fg = palette.bg0, bg = palette.bg_cyan, bold = palette.bold, ctermfg = 4 }, + NeogitHunkMergeHeaderCursor = { fg = palette.bg0, bg = palette.bg_cyan, bold = palette.bold, ctermfg = 4 }, + NeogitHunkHeader = { fg = palette.bg0, bg = palette.grey, bold = palette.bold, ctermfg = 3 }, + NeogitHunkHeaderHighlight = { fg = palette.bg0, bg = palette.md_purple, bold = palette.bold, ctermfg = 3 }, + NeogitHunkHeaderCursor = { fg = palette.bg0, bg = palette.md_purple, bold = palette.bold, ctermfg = 3 }, + NeogitDiffContext = { bg = palette.bg1, ctermfg = 7 }, + NeogitDiffContextHighlight = { bg = palette.bg2, ctermfg = 7 }, + NeogitDiffContextCursor = { bg = palette.bg1, ctermfg = 7 }, NeogitDiffAdditions = { fg = palette.bg_green , ctermfg = 2 }, NeogitDiffAdd = { bg = palette.line_green, fg = palette.bg_green, ctermfg = 2 }, NeogitDiffAddHighlight = { bg = palette.line_green, fg = palette.green, ctermfg = 2 }, @@ -199,32 +199,32 @@ function M.setup(config) NeogitPopupSectionTitle = { link = "Function" }, NeogitPopupBranchName = { link = "String" }, NeogitPopupBold = { bold = palette.bold }, - NeogitPopupSwitchKey = { fg = palette.purple }, + NeogitPopupSwitchKey = { fg = palette.purple, ctermfg = 5 }, NeogitPopupSwitchEnabled = { link = "SpecialChar" }, NeogitPopupSwitchDisabled = { link = "NeogitSubtleText" }, - NeogitPopupOptionKey = { fg = palette.purple }, + NeogitPopupOptionKey = { fg = palette.purple, ctermfg = 5 }, NeogitPopupOptionEnabled = { link = "SpecialChar" }, NeogitPopupOptionDisabled = { link = "NeogitSubtleText" }, - NeogitPopupConfigKey = { fg = palette.purple }, + NeogitPopupConfigKey = { fg = palette.purple, ctermfg = 5 }, NeogitPopupConfigEnabled = { link = "SpecialChar" }, NeogitPopupConfigDisabled = { link = "NeogitSubtleText" }, - NeogitPopupActionKey = { fg = palette.purple }, + NeogitPopupActionKey = { fg = palette.purple, ctermfg = 5 }, NeogitPopupActionDisabled = { link = "NeogitSubtleText" }, - NeogitFilePath = { fg = palette.blue, italic = palette.italic }, - NeogitCommitViewHeader = { bg = palette.bg_cyan, fg = palette.bg0 }, + NeogitFilePath = { fg = palette.blue, italic = palette.italic, ctermfg = 3 }, + NeogitCommitViewHeader = { bg = palette.bg_cyan, fg = palette.bg0, ctermfg = 7 }, NeogitCommitViewDescription = { link = "String" }, - NeogitDiffHeader = { bg = palette.bg3, fg = palette.blue, bold = palette.bold }, - NeogitDiffHeaderHighlight = { bg = palette.bg3, fg = palette.orange, bold = palette.bold }, + NeogitDiffHeader = { bg = palette.bg3, fg = palette.blue, bold = palette.bold, ctermfg = 3 }, + NeogitDiffHeaderHighlight = { bg = palette.bg3, fg = palette.orange, bold = palette.bold, ctermfg = 3 }, NeogitCommandText = { link = "NeogitSubtleText" }, NeogitCommandTime = { link = "NeogitSubtleText" }, NeogitCommandCodeNormal = { link = "String" }, NeogitCommandCodeError = { link = "Error" }, - NeogitBranch = { fg = palette.blue, bold = palette.bold }, - NeogitBranchHead = { fg = palette.blue, bold = palette.bold, underline = palette.underline }, - NeogitRemote = { fg = palette.green, bold = palette.bold }, - NeogitUnmergedInto = { fg = palette.bg_purple, bold = palette.bold }, - NeogitUnpushedTo = { fg = palette.bg_purple, bold = palette.bold }, - NeogitUnpulledFrom = { fg = palette.bg_purple, bold = palette.bold }, + NeogitBranch = { fg = palette.blue, bold = palette.bold, ctermfg = 4 }, + NeogitBranchHead = { fg = palette.blue, bold = palette.bold, underline = palette.underline, ctermfg = 4 }, + NeogitRemote = { fg = palette.green, bold = palette.bold, ctermfg =2 }, + NeogitUnmergedInto = { fg = palette.bg_purple, bold = palette.bold, ctermfg = 5 }, + NeogitUnpushedTo = { fg = palette.bg_purple, bold = palette.bold, ctermfg = 5 }, + NeogitUnpulledFrom = { fg = palette.bg_purple, bold = palette.bold, ctermfg = 5 }, NeogitStatusHEAD = {}, NeogitObjectId = { link = "NeogitSubtleText" }, NeogitStash = { link = "NeogitSubtleText" }, @@ -278,15 +278,15 @@ function M.setup(config) NeogitChangeAUstaged = { link = "NeogitChangeUnmerged" }, NeogitChangeUAstaged = { link = "NeogitChangeUnmerged" }, NeogitChangeUntrackedstaged = { fg = "None" }, - NeogitChangeModified = { fg = palette.bg_blue, bold = palette.bold, italic = palette.italic }, - NeogitChangeAdded = { fg = palette.bg_green, bold = palette.bold, italic = palette.italic }, - NeogitChangeDeleted = { fg = palette.bg_red, bold = palette.bold, italic = palette.italic }, - NeogitChangeRenamed = { fg = palette.bg_purple, bold = palette.bold, italic = palette.italic }, - NeogitChangeUpdated = { fg = palette.bg_orange, bold = palette.bold, italic = palette.italic }, - NeogitChangeCopied = { fg = palette.bg_cyan, bold = palette.bold, italic = palette.italic }, - NeogitChangeUnmerged = { fg = palette.bg_yellow, bold = palette.bold, italic = palette.italic }, - NeogitChangeNewFile = { fg = palette.bg_green, bold = palette.bold, italic = palette.italic }, - NeogitSectionHeader = { fg = palette.bg_purple, bold = palette.bold }, + NeogitChangeModified = { fg = palette.bg_blue, bold = palette.bold, italic = palette.italic, ctermfg = 4 }, + NeogitChangeAdded = { fg = palette.bg_green, bold = palette.bold, italic = palette.italic, ctermfg = 2 }, + NeogitChangeDeleted = { fg = palette.bg_red, bold = palette.bold, italic = palette.italic, ctermfg = 1 }, + NeogitChangeRenamed = { fg = palette.bg_purple, bold = palette.bold, italic = palette.italic, ctermfg = 5 }, + NeogitChangeUpdated = { fg = palette.bg_orange, bold = palette.bold, italic = palette.italic, ctermfg = 3 }, + NeogitChangeCopied = { fg = palette.bg_cyan, bold = palette.bold, italic = palette.italic, ctermfg = 6 }, + NeogitChangeUnmerged = { fg = palette.bg_yellow, bold = palette.bold, italic = palette.italic, ctermfg = 3 }, + NeogitChangeNewFile = { fg = palette.bg_green, bold = palette.bold, italic = palette.italic, ctermfg = 2 }, + NeogitSectionHeader = { fg = palette.bg_purple, bold = palette.bold, ctermfg = 5 }, NeogitSectionHeaderCount = {}, NeogitUntrackedfiles = { link = "NeogitSectionHeader" }, NeogitUnstagedchanges = { link = "NeogitSectionHeader" }, @@ -301,11 +301,11 @@ function M.setup(config) NeogitRebasing = { link = "NeogitSectionHeader" }, NeogitPicking = { link = "NeogitSectionHeader" }, NeogitReverting = { link = "NeogitSectionHeader" }, - NeogitTagName = { fg = palette.yellow }, - NeogitTagDistance = { fg = palette.cyan }, - NeogitFloatHeader = { bg = palette.bg0, bold = palette.bold }, - NeogitFloatHeaderHighlight = { bg = palette.bg2, fg = palette.cyan, bold = palette.bold }, - NeogitActiveItem = { bg = palette.bg_orange, fg = palette.bg0, bold = palette.bold }, + NeogitTagName = { fg = palette.yellow, ctermfg = 3 }, + NeogitTagDistance = { fg = palette.cyan, ctermfg = 6 }, + NeogitFloatHeader = { bg = palette.bg0, bold = palette.bold, ctermfg = 5 }, + NeogitFloatHeaderHighlight = { bg = palette.bg2, fg = palette.cyan, bold = palette.bold, ctermfg = 5 }, + NeogitActiveItem = { bg = palette.bg_orange, fg = palette.bg0, bold = palette.bold, ctermfg = 5 }, } for group, hl in pairs(hl_store) do From f8c99177ee41bf906b5e507d75e3f61d13dfd018 Mon Sep 17 00:00:00 2001 From: Benjamin Wolff Date: Mon, 21 Apr 2025 13:12:02 +0200 Subject: [PATCH 3/4] formatting --- lua/neogit/lib/hl.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/neogit/lib/hl.lua b/lua/neogit/lib/hl.lua index 63061fcdd..c93c14acc 100644 --- a/lua/neogit/lib/hl.lua +++ b/lua/neogit/lib/hl.lua @@ -221,7 +221,7 @@ function M.setup(config) NeogitCommandCodeError = { link = "Error" }, NeogitBranch = { fg = palette.blue, bold = palette.bold, ctermfg = 4 }, NeogitBranchHead = { fg = palette.blue, bold = palette.bold, underline = palette.underline, ctermfg = 4 }, - NeogitRemote = { fg = palette.green, bold = palette.bold, ctermfg =2 }, + NeogitRemote = { fg = palette.green, bold = palette.bold, ctermfg = 2 }, NeogitUnmergedInto = { fg = palette.bg_purple, bold = palette.bold, ctermfg = 5 }, NeogitUnpushedTo = { fg = palette.bg_purple, bold = palette.bold, ctermfg = 5 }, NeogitUnpulledFrom = { fg = palette.bg_purple, bold = palette.bold, ctermfg = 5 }, From 9c11c6cf8ce9368eb6bfc912416c85857cc13835 Mon Sep 17 00:00:00 2001 From: Benjamin Wolff Date: Mon, 21 Apr 2025 13:48:33 +0200 Subject: [PATCH 4/4] fix too much hihglighting --- lua/neogit/lib/hl.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/neogit/lib/hl.lua b/lua/neogit/lib/hl.lua index c93c14acc..90dd6428a 100644 --- a/lua/neogit/lib/hl.lua +++ b/lua/neogit/lib/hl.lua @@ -185,9 +185,9 @@ function M.setup(config) NeogitHunkHeader = { fg = palette.bg0, bg = palette.grey, bold = palette.bold, ctermfg = 3 }, NeogitHunkHeaderHighlight = { fg = palette.bg0, bg = palette.md_purple, bold = palette.bold, ctermfg = 3 }, NeogitHunkHeaderCursor = { fg = palette.bg0, bg = palette.md_purple, bold = palette.bold, ctermfg = 3 }, - NeogitDiffContext = { bg = palette.bg1, ctermfg = 7 }, - NeogitDiffContextHighlight = { bg = palette.bg2, ctermfg = 7 }, - NeogitDiffContextCursor = { bg = palette.bg1, ctermfg = 7 }, + NeogitDiffContext = { bg = palette.bg1 }, + NeogitDiffContextHighlight = { bg = palette.bg2 }, + NeogitDiffContextCursor = { bg = palette.bg1 }, NeogitDiffAdditions = { fg = palette.bg_green , ctermfg = 2 }, NeogitDiffAdd = { bg = palette.line_green, fg = palette.bg_green, ctermfg = 2 }, NeogitDiffAddHighlight = { bg = palette.line_green, fg = palette.green, ctermfg = 2 },