Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lua/barbecue/theme/flow.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local M = {
separator = { fg = c.fg_gutter },
modified = { fg = c.yellow },

dirname = { fg = c.comment },
dirname = { fg = c.grey[4] },
basename = { fg = c.light_blue },
context = { fg = c.grey[6] },

Expand Down
2 changes: 1 addition & 1 deletion lua/flow/colors.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function M.setup(opts)
colors[Key] = default_palette[key]
end

colors.comment = default_palette.grey[4]
colors.comment = default_palette.grey[5]

-- +----------------------------------------------------------------------------------------+
-- | Sidebar (e.g., NERDTree, Telescope, Quickfix) | <- Sidebar
Expand Down
11 changes: 6 additions & 5 deletions lua/flow/highlights/base.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function M.get(c, o)

-- Highlighted elements
CursorLine = { bg = c.bg_highlight }, -- Used with the line set with 'cursorline'.
ColorColumn = { bg = c.bg_highlight, fg = c.fg_highlight }, -- Used for the columns set with 'colorcolumn'.
ColorColumn = { bg = c.bg_highlight }, -- Used for the columns set with 'colorcolumn'.
CursorColumn = { link = "ColorColumn" }, -- Used with the column set with 'cursorcolumn'.
Folded = { link = "ColorColumn" }, -- Line used for closed folds.
CursorLineNr = { fg = c.fluo },
Expand Down Expand Up @@ -51,16 +51,17 @@ function M.get(c, o)
MatchParen = { fg = c.fluo, bold = true }, -- The character under the cursor if it is a paired bracket, and its match. |pi_paren.txt|.
Title = { fg = c.purple, bold = true }, -- Titles for output from ":set all", ":autocmd" etc.
FloatTitle = { fg = c.fg_float, bg = c.bg_float, bold = true }, -- Title of floating windows.
Whitespace = { fg = c.bg }, -- "nbsp", "space", "tab" and "trail" in 'listchars'. Set as bg to not show them.
Whitespace = { link = "Comment" }, -- "nbsp", "space", "tab" and "trail" in 'listchars'. Set as bg to not show them.
NonText = { fg = c.fg_gutter }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|.
EndOfBuffer = { link = "NonText" }, -- Filler lines (~) after the end of the buffer.
Conceal = { fg = c.fg }, -- Placeholder characters substituted for concealed text (see 'conceallevel').

-- Search and substitution
IncSearch = { bg = (not is_dark and c.Fluo.dark) or c.Fluo.light, fg = c.bg_visual }, -- Last search pattern highlighting (see 'hlsearch').
Search = { bg = c.grey[5], fg = c.bg_visual }, -- Used for 'incsearch' highlighting.
CurSearch = { link = "IncSearch" }, -- Used for highlighting a search pattern under the cursor (see 'hlsearch').
IncSearch = { bg = c.fluo, fg = c.bg_visual },
Search = { bg = c.grey[5], fg = c.bg_visual },
CurSearch = { bg = (not is_dark and c.Fluo.dark) or c.Fluo.light, fg = c.bg_visual }, -- Used for highlighting a search pattern under the cursor (see 'hlsearch').
Substitute = { link = "IncSearch" }, -- |:substitute| replacement text highlighting.

Visual = { bg = c.fg_visual, fg = c.bg_visual }, -- Visual mode selection.
VisualNOS = { bg = c.to_check }, -- visual mode selection when vim is "Not Owning the Selection".

Expand Down
4 changes: 2 additions & 2 deletions lua/flow/highlights/diagnostic.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ function M.get(c, o)
DiagnosticFloatingHint = { link = "DiagnosticHint" },
DiagnosticFloatingOk = { fg = c.fg_viusual },

DiagnosticUnderlineError = { undercurl = true, sp = c.error },
DiagnosticUnderlineWarn = { undercurl = true, sp = c.warning },
DiagnosticUnderlineError = { fg = c.error, undercurl = true, sp = c.error },
DiagnosticUnderlineWarn = { fg = c.warning, undercurl = true, sp = c.warning },
DiagnosticUnderlineInfo = { undercurl = true, sp = c.info },
DiagnosticUnderlineHint = { undercurl = true, sp = c.hint },
}
Expand Down
6 changes: 5 additions & 1 deletion lua/flow/highlights/flash.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ function M.get(c, o)

local theme = {
FlashBackdrop = { fg = c.comment },
FlashLabel = { bg = c.fluo, fg = (not is_dark and c.grey[2]) or c.grey[7] },
FlashLabel = {
-- bg = (not is_dark and c.Fluo.dark) or c.Fluo.light,
bg = c.blue,
fg = c.grey[2],
},
}

return theme
Expand Down
9 changes: 6 additions & 3 deletions lua/flow/highlights/git.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,18 @@ function M.get(c, _)
gitKeyword = { fg = c.blue },
gitIdentityKeyword = { link = "gitKeyword" },
gitCommitSummary = { fg = c.fg_visual },
gitDate = { link = "Comment" },
gitDate = { fg = c.light_blue },
gitDiff = { fg = c.grey[4] },

-- Diff
diffAdded = { fg = c.git.add, bg = c.diff.add },
diffRemoved = { fg = c.git.delete, bg = c.diff.delete },
diffChanged = { fg = c.git.change, bg = c.diff.change },
diffOldFile = { fg = c.git.delete },
diffNewFile = { fg = c.git.add },
diffFile = { fg = c.cyan },
diffFile = { fg = c.yellow },
diffLine = { fg = c.comment },
diffIndexLine = { fg = c.blue },
diffIndexLine = { fg = c.fg },

DiffAdd = { link = "Added" }, -- Diff mode: Added line |diff.txt|.
DiffChange = { link = "Changed" }, -- Diff mode: Changed line |diff.txt|.
Expand All @@ -28,6 +29,7 @@ function M.get(c, _)

-- GitSigns
GitSignsAdd = { fg = c.git.add }, -- diff mode: Added line |diff.txt|
GitSignsAddPreview = { bg = c.diff.add },
GitSignsChange = { fg = c.git.change }, -- diff mode: Changed line |diff.txt|
GitSignsDelete = { fg = c.git.delete }, -- diff mode: Deleted line |diff.txt|
GitSignsCurrentLineBlame = { fg = c.grey[4] },
Expand All @@ -42,6 +44,7 @@ function M.get(c, _)
fugitiveStagedHeading = { fg = c.green },
fugitiveStagedModifier = { link = "fugitiveStagedHeading" },
fugitiveCount = { fg = c.grey[5] },
FugitiveblameTime = { link = "gitDate" },

-- Git-conflict
GitConflictCurrentLabel = { bg = c.Light_blue.dark },
Expand Down
4 changes: 2 additions & 2 deletions lua/flow/highlights/lazy.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ function M.get(c, _)
local theme = {
LazyH1 = { bg = c.fluo, fg = c.grey[3] },

LazyProgressDone = { bold = true, fg = c.fluo },
LazyProgressTodo = { bold = true, fg = c.light_blue },
LazyProgressDone = { bold = true, fg = c.purple },
LazyProgressTodo = { bold = true, fg = c.cyan },

LazyNormal = { fg = c.light_blue },
LazyButton = { bg = c.grey[5], fg = c.grey[3] },
Expand Down
8 changes: 4 additions & 4 deletions lua/flow/highlights/lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ local M = {}
--- @return table: Nvim lsp highlights.
function M.get(c, _)
local theme = {
LspSignatureActiveParameter = { fg = c.fg_visual, bold = true }, -- Parameter highlighter in signature help.
LspSignatureActiveParameter = { fg = c.grey[2], bg = c.fg_visual, bold = true }, -- Parameter highlighter in signature help.

LspReferenceText = { bg = c.fg_gutter }, -- Used for highlighting "text" references.
LspReferenceRead = { bg = c.fg_gutter }, -- Used for highlighting "read" references.
LspReferenceWrite = { bg = c.fg_gutter }, -- Used for highlighting "write" references.
LspReferenceText = { bg = c.Cyan.very_dark }, -- Used for highlighting "text" references.
LspReferenceRead = { link = "LspReferenceText" }, -- Used for highlighting "read" references.
LspReferenceWrite = { link = "LspReferenceText" }, -- Used for highlighting "write" references.

LspCodeLens = { fg = c.comment },

Expand Down
5 changes: 3 additions & 2 deletions lua/flow/highlights/markdown.lua
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,13 @@ function M.get(c, _)
["@label.markdown"] = { link = "Keyword" }, -- Used for the language specified in codeblocks.

["@markup.raw.block"] = {
bg = c.grey[2],
bg = c.bg,
}, --
["@markup.raw.markdown_inline"] = {
fg = c.cyan,
bg = c.grey[4],
}, --
},

-- Obsidian
ObsidianRefText = { fg = c.blue },
}
Expand Down
5 changes: 4 additions & 1 deletion lua/flow/highlights/render-markdown.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@ local M = {}
--- @param o FlowConfig: The available options.
--- @return table: Render markdown plugin highlights.
function M.get(c, o)
local is_transparent = o.theme.transparent
print(is_transparent)

local theme = {
RenderMarkdownCode = { link = "@markup.raw.block" }, -- Code blocks.
RenderMarkdownCodeInline = { link = "@markup.raw.markdown_inline" }, -- Code inline.
RenderMarkdownBullet = { link = "@markup.list" },
RenderMarkdownDash = { link = "Comment" },
RenderMarkdownCode = { link = "@markup.raw.block" }, -- Code blocks.

-- TODO: complete
-- | RenderMarkdownTableHead | @markup.heading | Pipe table heading rows |
Expand Down
5 changes: 3 additions & 2 deletions lua/flow/highlights/treesitter.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ function M.get(c, _)
TreesitterContextLineNumber = { link = "TreesitterContext" },
-- TODO: verify the sp with another terminal.
-- sp works only if the terminal support it.
TreesitterContextBottom = { sp = c.fluo, underline = true },
TreesitterContextLineNumberBottom = { link = "TreesitterContextBottom" },
-- TreesitterContextBottom = { fg = c.comment, sp = c.fluo, underline = false },
-- TreesitterContextLineNumberBottom = { link = "TreesitterContextBottom" },
TreesitterContextSeparator = { fg = c.fg_border },

-- Linked
["@annotation"] = { link = "PreProc" },
Expand Down
2 changes: 1 addition & 1 deletion lua/flow/palette.lua
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function M.get(o)
[1] = hsl(203, 20, 10), -- Very dark grey
[2] = hsl(203, 20, 13),
[3] = hsl(203, 20, 15),
[4] = hsl(203, 20, 30),
[4] = hsl(203, 20, 29),
[5] = hsl(203, 20, 35),
[6] = hsl(203, 20, 65),
[7] = hsl(203, 20, 85),
Expand Down
24 changes: 12 additions & 12 deletions lua/lualine/themes/flow.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,44 @@ local flow = {}
-- Normal mode colors. a will be used also for x,
-- b for y, and c for z to have a symmetrical coloration.
flow.normal = {
a = { bg = colors.blue, fg = colors.grey[4] },
b = { bg = colors.grey[4], fg = colors.blue },
a = { bg = colors.light_blue, fg = colors.grey[2] },
b = { bg = colors.grey[2], fg = colors.light_blue },
c = { bg = colors.bg_statusline, fg = colors.fg_statusline },
}

-- Insert mode colors. a will be used also for x,
-- b for y, and c for z to have a symmetrical coloration.
flow.insert = {
a = { bg = colors.cyan, fg = colors.black },
b = { bg = colors.fg_gutter, fg = colors.cyan },
a = { bg = colors.cyan, fg = colors.grey[2] },
b = { bg = colors.grey[2], fg = colors.cyan },
}

-- Command mode colors. a will be used also for x,
-- b for y, and c for z to have a symmetrical coloration.
flow.command = {
a = { bg = colors.yellow, fg = colors.fg_gutter },
b = { bg = colors.fg_gutter, fg = colors.yellow },
a = { bg = colors.yellow, fg = colors.grey[2] },
b = { bg = colors.grey[2], fg = colors.yellow },
}

-- Visual mode colors. a will be used also for x,
-- b for y, and c for z to have a symmetrical coloration.
flow.visual = {
a = { bg = colors.purple, fg = colors.black },
b = { bg = colors.fg_gutter, fg = colors.purple },
a = { bg = colors.purple, fg = colors.grey[2] },
b = { bg = colors.grey[2], fg = colors.purple },
}

-- Replace mode colors. a will be used also for x,
-- b for y, and c for z to have a symmetrical coloration.
flow.replace = {
a = { bg = colors.red, fg = colors.black },
b = { bg = colors.fg_gutter, fg = colors.red },
a = { bg = colors.red, fg = colors.grey[2] },
b = { bg = colors.grey[2], fg = colors.red },
}

-- Terminal mode colors. a will be used also for x,
-- b for y, and c for z to have a symmetrical coloration.
flow.terminal = {
a = { bg = colors.green, fg = colors.black },
b = { bg = colors.fg_gutter, fg = colors.green },
a = { bg = colors.green, fg = colors.grey[2] },
b = { bg = colors.grey[2], fg = colors.green },
}

-- Inactive mode colors. Only c seems to be applied here
Expand Down