Skip to content

fix(barbar): add highlight groups for gitsigns #727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
folke merged 2 commits into from
Oct 24, 2025
+51 −39
Merged

fix(barbar): add highlight groups for gitsigns #727

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fc8fb1
fix(barbar): add highlight groups for gitsigns
LimaoC Jul 19, 2025
5a81dd0
Merge branch 'main' into barbar-gitsigns-highlight-groups
folke Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 51 additions & 39 deletions lua/tokyonight/groups/barbar.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,45 +8,57 @@ M.url = "https://github.com/romgrk/barbar.nvim"
function M.get(c)
-- stylua: ignore
return {
BufferAlternate = { bg = c.fg_gutter, fg = c.fg },
BufferAlternateERROR = { bg = c.fg_gutter, fg = c.error },
BufferAlternateHINT = { bg = c.fg_gutter, fg = c.hint },
BufferAlternateINFO = { bg = c.fg_gutter, fg = c.info },
BufferAlternateIndex = { bg = c.fg_gutter, fg = c.info },
BufferAlternateMod = { bg = c.fg_gutter, fg = c.warning },
BufferAlternateSign = { bg = c.fg_gutter, fg = c.info },
BufferAlternateTarget = { bg = c.fg_gutter, fg = c.red },
BufferAlternateWARN = { bg = c.fg_gutter, fg = c.warning },
BufferCurrent = { bg = c.bg, fg = c.fg },
BufferCurrentERROR = { bg = c.bg, fg = c.error },
BufferCurrentHINT = { bg = c.bg, fg = c.hint },
BufferCurrentINFO = { bg = c.bg, fg = c.info },
BufferCurrentIndex = { bg = c.bg, fg = c.info },
BufferCurrentMod = { bg = c.bg, fg = c.warning },
BufferCurrentSign = { bg = c.bg, fg = c.bg },
BufferCurrentTarget = { bg = c.bg, fg = c.red },
BufferCurrentWARN = { bg = c.bg, fg = c.warning },
BufferInactive = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = Util.blend_bg(c.dark5, 0.8) },
BufferInactiveERROR = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = Util.blend_bg(c.error, 0.8) },
BufferInactiveHINT = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = Util.blend_bg(c.hint, 0.8) },
BufferInactiveINFO = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = Util.blend_bg(c.info, 0.8) },
BufferInactiveIndex = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = c.dark5 },
BufferInactiveMod = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = Util.blend_bg(c.warning, 0.8) },
BufferInactiveSign = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = c.bg },
BufferInactiveTarget = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = c.red },
BufferInactiveWARN = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = Util.blend_bg(c.warning, 0.8) },
BufferOffset = { bg = c.bg_statusline, fg = c.dark5 },
BufferTabpageFill = { bg = Util.blend_bg(c.bg_highlight, 0.8), fg = c.dark5 },
BufferTabpages = { bg = c.bg_statusline, fg = c.none },
BufferVisible = { bg = c.bg_statusline, fg = c.fg },
BufferVisibleERROR = { bg = c.bg_statusline, fg = c.error },
BufferVisibleHINT = { bg = c.bg_statusline, fg = c.hint },
BufferVisibleINFO = { bg = c.bg_statusline, fg = c.info },
BufferVisibleIndex = { bg = c.bg_statusline, fg = c.info },
BufferVisibleMod = { bg = c.bg_statusline, fg = c.warning },
BufferVisibleSign = { bg = c.bg_statusline, fg = c.info },
BufferVisibleTarget = { bg = c.bg_statusline, fg = c.red },
BufferVisibleWARN = { bg = c.bg_statusline, fg = c.warning },
BufferAlternate = { bg = c.fg_gutter, fg = c.fg },
BufferAlternateADDED = { bg = c.fg_gutter, fg = c.git.add },
BufferAlternateCHANGED = { bg = c.fg_gutter, fg = c.git.change },
BufferAlternateDELETED = { bg = c.fg_gutter, fg = c.git.delete },
BufferAlternateERROR = { bg = c.fg_gutter, fg = c.error },
BufferAlternateHINT = { bg = c.fg_gutter, fg = c.hint },
BufferAlternateINFO = { bg = c.fg_gutter, fg = c.info },
BufferAlternateIndex = { bg = c.fg_gutter, fg = c.info },
BufferAlternateMod = { bg = c.fg_gutter, fg = c.warning },
BufferAlternateSign = { bg = c.fg_gutter, fg = c.info },
BufferAlternateTarget = { bg = c.fg_gutter, fg = c.red },
BufferAlternateWARN = { bg = c.fg_gutter, fg = c.warning },
BufferCurrent = { bg = c.bg, fg = c.fg },
BufferCurrentADDED = { bg = c.bg, fg = c.git.add },
BufferCurrentCHANGED = { bg = c.bg, fg = c.git.change },
BufferCurrentDELETED = { bg = c.bg, fg = c.git.delete },
BufferCurrentERROR = { bg = c.bg, fg = c.error },
BufferCurrentHINT = { bg = c.bg, fg = c.hint },
BufferCurrentINFO = { bg = c.bg, fg = c.info },
BufferCurrentIndex = { bg = c.bg, fg = c.info },
BufferCurrentMod = { bg = c.bg, fg = c.warning },
BufferCurrentSign = { bg = c.bg, fg = c.bg },
BufferCurrentTarget = { bg = c.bg, fg = c.red },
BufferCurrentWARN = { bg = c.bg, fg = c.warning },
BufferInactive = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = Util.blend_bg(c.dark5, 0.8) },
BufferInactiveADDED = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = Util.blend_bg(c.git.add, 0.8) },
BufferInactiveCHANGED = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = Util.blend_bg(c.git.change, 0.8) },
BufferInactiveDELETED = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = Util.blend_bg(c.git.delete, 0.8) },
BufferInactiveERROR = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = Util.blend_bg(c.error, 0.8) },
BufferInactiveHINT = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = Util.blend_bg(c.hint, 0.8) },
BufferInactiveINFO = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = Util.blend_bg(c.info, 0.8) },
BufferInactiveIndex = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = c.dark5 },
BufferInactiveMod = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = Util.blend_bg(c.warning, 0.8) },
BufferInactiveSign = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = c.bg },
BufferInactiveTarget = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = c.red },
BufferInactiveWARN = { bg = Util.blend_bg(c.bg_highlight, 0.4), fg = Util.blend_bg(c.warning, 0.8) },
BufferOffset = { bg = c.bg_statusline, fg = c.dark5 },
BufferTabpageFill = { bg = Util.blend_bg(c.bg_highlight, 0.8), fg = c.dark5 },
BufferTabpages = { bg = c.bg_statusline, fg = c.none },
BufferVisible = { bg = c.bg_statusline, fg = c.fg },
BufferVisibleADDED = { bg = c.bg_statusline, fg = c.git.add },
BufferVisibleCHANGED = { bg = c.bg_statusline, fg = c.git.change },
BufferVisibleDELETED = { bg = c.bg_statusline, fg = c.git.delete },
BufferVisibleERROR = { bg = c.bg_statusline, fg = c.error },
BufferVisibleHINT = { bg = c.bg_statusline, fg = c.hint },
BufferVisibleINFO = { bg = c.bg_statusline, fg = c.info },
BufferVisibleIndex = { bg = c.bg_statusline, fg = c.info },
BufferVisibleMod = { bg = c.bg_statusline, fg = c.warning },
BufferVisibleSign = { bg = c.bg_statusline, fg = c.info },
BufferVisibleTarget = { bg = c.bg_statusline, fg = c.red },
BufferVisibleWARN = { bg = c.bg_statusline, fg = c.warning },
}
end

Expand Down