From 805e3515ba71a3ac8731c687700152aa3c41edd1 Mon Sep 17 00:00:00 2001 From: stepit Date: Wed, 8 Jan 2025 12:46:00 +0100 Subject: [PATCH 01/28] update context background --- lua/flow/highlights/treesitter.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/flow/highlights/treesitter.lua b/lua/flow/highlights/treesitter.lua index 6f27c0f..3e308a9 100644 --- a/lua/flow/highlights/treesitter.lua +++ b/lua/flow/highlights/treesitter.lua @@ -5,7 +5,7 @@ local M = {} function M.get(c, _) local theme = { - TreesitterContext = { bg = c.grey[3] }, + TreesitterContext = { bg = c.grey[2] }, TreesitterContextLineNumber = { link = "TreesitterContext" }, -- TODO: verify the sp with another terminal. -- sp works only if the terminal support it. From 0ef09ea1f170ee8fd940f8112e1e1d610d9046b8 Mon Sep 17 00:00:00 2001 From: stepit Date: Thu, 9 Jan 2025 08:52:46 +0100 Subject: [PATCH 02/28] add basic barbecue theme --- lua/barbecue/theme/flow.lua | 43 +++++++++++++++++++++++++++++++++++++ lua/flow/palette.lua | 2 -- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 lua/barbecue/theme/flow.lua diff --git a/lua/barbecue/theme/flow.lua b/lua/barbecue/theme/flow.lua new file mode 100644 index 0000000..8fa6ab9 --- /dev/null +++ b/lua/barbecue/theme/flow.lua @@ -0,0 +1,43 @@ +local options = require("flow.config").options +local c = require("flow.colors").setup(options) + +local M = { + normal = { bg = c.none, fg = c.fg_dark }, + + ellipsis = { fg = c.to_check }, + separator = { fg = c.fg_gutter }, + modified = { fg = c.yellow }, + + dirname = { fg = c.comment }, + basename = { fg = c.light_blue, bold = true }, + context = { fg = c.fg_dark }, + + context_enum = { fg = c.orange }, + context_interface = { fg = c.orange }, + context_number = { fg = c.orange }, + context_boolean = { fg = c.orange }, + context_array = { fg = c.orange }, + context_event = { fg = c.orange }, + context_object = { fg = c.cyan }, + context_class = { link = "context_object" }, + context_struct = { link = "context_object" }, + context_file = { fg = c.to_check }, + context_module = { fg = c.yellow }, + context_namespace = { fg = c.yellow }, + context_package = { fg = c.blue }, + context_method = { fg = c.blue }, + context_property = { fg = c.green }, + context_field = { fg = c.green }, + context_constructor = { fg = c.blue }, + context_function = { fg = c.blue }, + context_variable = { fg = c.purple }, + context_constant = { fg = c.purple }, + context_string = { fg = c.green }, + context_key = { fg = c.purple }, + context_null = { fg = c.blue }, + context_enum_member = { fg = c.green }, + context_operator = { fg = c.green }, + context_type_parameter = { fg = c.green }, +} + +return M diff --git a/lua/flow/palette.lua b/lua/flow/palette.lua index de44af1..30b8951 100644 --- a/lua/flow/palette.lua +++ b/lua/flow/palette.lua @@ -21,13 +21,11 @@ function M.get(o) if o.colors.custom.light ~= "" then ---@diagnostic disable-next-line: assign-type-mismatch - --- Options are validated here shade[o.colors.mode].L = tonumber(o.colors.custom.light) end if o.colors.custom.saturation ~= "" then ---@diagnostic disable-next-line: assign-type-mismatch - --- Options are validated here shade[o.colors.mode].S = tonumber(o.colors.custom.saturation) end From ef582e6e1ff9e37d90619636276319f005cdda6b Mon Sep 17 00:00:00 2001 From: stepit Date: Wed, 15 Jan 2025 10:45:37 +0100 Subject: [PATCH 03/28] add configurable special comments --- lua/flow/config.lua | 2 ++ lua/flow/highlights/mini-hipatterns.lua | 6 ++---- lua/flow/highlights/syntax.lua | 16 +++++++++++++++- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/lua/flow/config.lua b/lua/flow/config.lua index a997272..e41fca3 100644 --- a/lua/flow/config.lua +++ b/lua/flow/config.lua @@ -31,6 +31,8 @@ M.defaults = { borders = "inverse", ---@boolean aggressive_spell = false, + ---@boolean + aggressive_special_comment = false, }, } diff --git a/lua/flow/highlights/mini-hipatterns.lua b/lua/flow/highlights/mini-hipatterns.lua index dae4270..b5d4830 100644 --- a/lua/flow/highlights/mini-hipatterns.lua +++ b/lua/flow/highlights/mini-hipatterns.lua @@ -1,15 +1,13 @@ local M = {} ---- @param c table: The available colors. --- @return table: Mini hi plugin highlights. -function M.get(c, _) +function M.get(_, _) local theme = { MiniHipatternsTodo = { link = "Todo" }, MiniHipatternsFixme = { link = "Fixme" }, MiniHipatternsNote = { link = "Note" }, MiniHipatternsHack = { link = "Hack" }, - MiniHipatternsWarn = { link = "Warn" }, - MiniHipatternsContract = { fg = c.fluo, bg = c.comment }, + MiniHipatternsContract = { link = "Fixme" }, } return theme end diff --git a/lua/flow/highlights/syntax.lua b/lua/flow/highlights/syntax.lua index 4fd2e08..90ba7c1 100644 --- a/lua/flow/highlights/syntax.lua +++ b/lua/flow/highlights/syntax.lua @@ -1,8 +1,9 @@ local M = {} --- @param c table: The available colors. +--- @param o FlowConfig: The available options. --- @return table: Syntax highlights. -function M.get(c, _) +function M.get(c, o) local theme = { Boolean = { link = "Constant" }, -- A boolean constant: TRUE, false. @@ -50,6 +51,19 @@ function M.get(c, _) Warn = { fg = c.warning, bg = c.comment }, -- Anything that needs extra attention; mostly the keywords TODO FIXME and XXX. } + -- Special comments + if o.ui.aggressive_special_comment then + theme.Todo = { bg = c.todo, fg = c.comment } + theme.Fixme = { bg = c.fixme, fg = c.comment } + theme.Note = { bg = c.note, fg = c.comment } + theme.Hack = { bg = c.hack, fg = c.comment } + else + theme.Todo = { fg = c.todo, bg = c.comment } + theme.Fixme = { fg = c.fixme, bg = c.comment } + theme.Note = { fg = c.note, bg = c.comment } + theme.Hack = { fg = c.hack, bg = c.comment } + end + return theme end From 6b999786243d023c653aa20fc6d0d831a36eb499 Mon Sep 17 00:00:00 2001 From: stepit Date: Wed, 15 Jan 2025 10:41:23 +0100 Subject: [PATCH 04/28] update comment color --- lua/flow/colors.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/flow/colors.lua b/lua/flow/colors.lua index f3a3b89..487e816 100644 --- a/lua/flow/colors.lua +++ b/lua/flow/colors.lua @@ -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 From e93d01ef00d3bddf130c7e0331113c59f2d5833a Mon Sep 17 00:00:00 2001 From: stepit Date: Wed, 15 Jan 2025 10:05:59 +0100 Subject: [PATCH 05/28] improve search and substitution colors --- lua/flow/highlights/base.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lua/flow/highlights/base.lua b/lua/flow/highlights/base.lua index ef108dd..4e49596 100644 --- a/lua/flow/highlights/base.lua +++ b/lua/flow/highlights/base.lua @@ -57,10 +57,11 @@ function M.get(c, o) 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[6], 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". From e8c0f9fc990411238af9fb91e4b6fe7ea48c5137 Mon Sep 17 00:00:00 2001 From: stepit Date: Wed, 15 Jan 2025 11:18:15 +0100 Subject: [PATCH 06/28] update colors --- lua/barbecue/theme/flow.lua | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/lua/barbecue/theme/flow.lua b/lua/barbecue/theme/flow.lua index 8fa6ab9..6038f0e 100644 --- a/lua/barbecue/theme/flow.lua +++ b/lua/barbecue/theme/flow.lua @@ -4,24 +4,25 @@ local c = require("flow.colors").setup(options) local M = { normal = { bg = c.none, fg = c.fg_dark }, - ellipsis = { fg = c.to_check }, + ellipsis = { fg = c.fg_gutter }, separator = { fg = c.fg_gutter }, modified = { fg = c.yellow }, dirname = { fg = c.comment }, - basename = { fg = c.light_blue, bold = true }, - context = { fg = c.fg_dark }, + basename = { fg = c.light_blue }, + context = { fg = c.grey[6] }, - context_enum = { fg = c.orange }, - context_interface = { fg = c.orange }, - context_number = { fg = c.orange }, - context_boolean = { fg = c.orange }, - context_array = { fg = c.orange }, - context_event = { fg = c.orange }, context_object = { fg = c.cyan }, - context_class = { link = "context_object" }, - context_struct = { link = "context_object" }, - context_file = { fg = c.to_check }, + context_class = { fg = c.cyan }, + context_struct = { fg = c.cyan }, + + context_enum = { fg = c.purple }, + context_interface = { fg = c.purple }, + context_array = { fg = c.purple }, + context_event = { fg = c.yellow }, + context_number = { fg = c.yellow }, + context_boolean = { link = "Number" }, + context_file = { link = "Directory" }, context_module = { fg = c.yellow }, context_namespace = { fg = c.yellow }, context_package = { fg = c.blue }, @@ -32,12 +33,12 @@ local M = { context_function = { fg = c.blue }, context_variable = { fg = c.purple }, context_constant = { fg = c.purple }, - context_string = { fg = c.green }, + context_string = { link = "String" }, context_key = { fg = c.purple }, context_null = { fg = c.blue }, context_enum_member = { fg = c.green }, context_operator = { fg = c.green }, - context_type_parameter = { fg = c.green }, + context_type_parameter = { fg = c.purple }, } return M From 9f8a5d7b113fc82a3d850bb07760683cf7586437 Mon Sep 17 00:00:00 2001 From: stepit Date: Wed, 15 Jan 2025 11:21:44 +0100 Subject: [PATCH 07/28] improve colors for colorcolumns and whitespaces --- lua/flow/highlights/base.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/flow/highlights/base.lua b/lua/flow/highlights/base.lua index 4e49596..cab9654 100644 --- a/lua/flow/highlights/base.lua +++ b/lua/flow/highlights/base.lua @@ -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 }, @@ -51,7 +51,7 @@ 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'). From 372f46bdd47a36379ed077cafa015435841ec5dc Mon Sep 17 00:00:00 2001 From: stepit Date: Wed, 15 Jan 2025 11:23:07 +0100 Subject: [PATCH 08/28] improve treesitter context colors --- lua/flow/highlights/treesitter.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lua/flow/highlights/treesitter.lua b/lua/flow/highlights/treesitter.lua index 6f27c0f..1eb6e19 100644 --- a/lua/flow/highlights/treesitter.lua +++ b/lua/flow/highlights/treesitter.lua @@ -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" }, From 1733c4478de14cec01ed6790e2aab26a80291397 Mon Sep 17 00:00:00 2001 From: stepit Date: Wed, 15 Jan 2025 11:23:25 +0100 Subject: [PATCH 09/28] revert lualine colors for better contrast --- lua/lualine/themes/flow.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/lualine/themes/flow.lua b/lua/lualine/themes/flow.lua index dc2e95a..a0a6687 100644 --- a/lua/lualine/themes/flow.lua +++ b/lua/lualine/themes/flow.lua @@ -5,8 +5,8 @@ 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[4] }, + b = { bg = colors.grey[4], fg = colors.light_blue }, c = { bg = colors.bg_statusline, fg = colors.fg_statusline }, } From fa375e46619cdbce1313bd4b8d2b2dfe631519bd Mon Sep 17 00:00:00 2001 From: stepit Date: Wed, 15 Jan 2025 11:23:45 +0100 Subject: [PATCH 10/28] improve flash nvim colors --- lua/flow/highlights/flash.lua | 5 ++++- lua/flow/highlights/markdown.lua | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lua/flow/highlights/flash.lua b/lua/flow/highlights/flash.lua index 0b1474c..940c64c 100644 --- a/lua/flow/highlights/flash.lua +++ b/lua/flow/highlights/flash.lua @@ -9,7 +9,10 @@ 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, + fg = c.grey[2], + }, } return theme diff --git a/lua/flow/highlights/markdown.lua b/lua/flow/highlights/markdown.lua index ce6c6d8..7555c21 100644 --- a/lua/flow/highlights/markdown.lua +++ b/lua/flow/highlights/markdown.lua @@ -61,7 +61,8 @@ function M.get(c, _) ["@markup.raw.markdown_inline"] = { fg = c.cyan, bg = c.grey[4], - }, -- + }, + -- Obsidian ObsidianRefText = { fg = c.blue }, } From a65aa8043460cc21816d25f3a85ac207a67f24f4 Mon Sep 17 00:00:00 2001 From: stepit Date: Wed, 15 Jan 2025 16:11:35 +0100 Subject: [PATCH 11/28] small change in normal color --- lua/barbecue/theme/flow.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/barbecue/theme/flow.lua b/lua/barbecue/theme/flow.lua index 6038f0e..19e51c1 100644 --- a/lua/barbecue/theme/flow.lua +++ b/lua/barbecue/theme/flow.lua @@ -2,7 +2,7 @@ local options = require("flow.config").options local c = require("flow.colors").setup(options) local M = { - normal = { bg = c.none, fg = c.fg_dark }, + normal = { bg = c.none, fg = c.grey[4] }, ellipsis = { fg = c.fg_gutter }, separator = { fg = c.fg_gutter }, From 77427e39cdf6a751c4ebc557cc62b55f7fb38ac7 Mon Sep 17 00:00:00 2001 From: stepit Date: Wed, 15 Jan 2025 20:18:56 +0100 Subject: [PATCH 12/28] improve git colors --- lua/flow/highlights/git.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lua/flow/highlights/git.lua b/lua/flow/highlights/git.lua index 7d191a5..39dc0bf 100644 --- a/lua/flow/highlights/git.lua +++ b/lua/flow/highlights/git.lua @@ -9,7 +9,8 @@ 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 }, @@ -17,9 +18,9 @@ function M.get(c, _) 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|. @@ -42,6 +43,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 }, From 220fd6e4fd0674995aca9ae64f17296fb0286d64 Mon Sep 17 00:00:00 2001 From: stepit Date: Wed, 15 Jan 2025 21:16:12 +0100 Subject: [PATCH 13/28] git --- lua/flow/highlights/git.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/flow/highlights/git.lua b/lua/flow/highlights/git.lua index 7d191a5..2a737c7 100644 --- a/lua/flow/highlights/git.lua +++ b/lua/flow/highlights/git.lua @@ -28,6 +28,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] }, From 8edcad62abb95cf1c7b33be34fe184686f671a6e Mon Sep 17 00:00:00 2001 From: stepit Date: Wed, 15 Jan 2025 21:18:42 +0100 Subject: [PATCH 14/28] update lualine colors --- lua/lualine/themes/flow.lua | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lua/lualine/themes/flow.lua b/lua/lualine/themes/flow.lua index a0a6687..50334ee 100644 --- a/lua/lualine/themes/flow.lua +++ b/lua/lualine/themes/flow.lua @@ -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.light_blue, fg = colors.grey[4] }, - b = { bg = colors.grey[4], fg = colors.light_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 From c5d87ab344c0ebf4cc5761376b45c76f7293cb01 Mon Sep 17 00:00:00 2001 From: stepit Date: Thu, 16 Jan 2025 19:29:07 +0100 Subject: [PATCH 15/28] update palette colors --- lua/flow/palette.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/flow/palette.lua b/lua/flow/palette.lua index 30b8951..be1fd48 100644 --- a/lua/flow/palette.lua +++ b/lua/flow/palette.lua @@ -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), From ff9e7c5b85125b934e961369425f535ac9642b90 Mon Sep 17 00:00:00 2001 From: stepit Date: Fri, 17 Jan 2025 07:39:46 +0100 Subject: [PATCH 16/28] add snippet md background only to plugin --- lua/flow/highlights/markdown.lua | 2 +- lua/flow/highlights/render-markdown.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/flow/highlights/markdown.lua b/lua/flow/highlights/markdown.lua index 7555c21..5e9be94 100644 --- a/lua/flow/highlights/markdown.lua +++ b/lua/flow/highlights/markdown.lua @@ -56,7 +56,7 @@ 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, diff --git a/lua/flow/highlights/render-markdown.lua b/lua/flow/highlights/render-markdown.lua index 617101f..4a9ad5c 100644 --- a/lua/flow/highlights/render-markdown.lua +++ b/lua/flow/highlights/render-markdown.lua @@ -5,7 +5,7 @@ local M = {} --- @return table: Render markdown plugin highlights. function M.get(c, o) local theme = { - RenderMarkdownCode = { link = "@markup.raw.block" }, -- Code blocks. + RenderMarkdownCode = { bg = c.grey[2] }, -- Code blocks. RenderMarkdownCodeInline = { link = "@markup.raw.markdown_inline" }, -- Code inline. RenderMarkdownBullet = { link = "@markup.list" }, RenderMarkdownDash = { link = "Comment" }, From 719dc7560f5916a13ec73b852a7fd1147ec26ea9 Mon Sep 17 00:00:00 2001 From: stepit Date: Fri, 17 Jan 2025 07:42:03 +0100 Subject: [PATCH 17/28] general colors improvement --- lua/barbecue/theme/flow.lua | 2 +- lua/flow/highlights/base.lua | 2 +- lua/flow/highlights/diagnostic.lua | 4 ++-- lua/flow/highlights/flash.lua | 3 ++- lua/flow/highlights/lazy.lua | 4 ++-- lua/flow/highlights/lsp.lua | 8 ++++---- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lua/barbecue/theme/flow.lua b/lua/barbecue/theme/flow.lua index 19e51c1..1ab1752 100644 --- a/lua/barbecue/theme/flow.lua +++ b/lua/barbecue/theme/flow.lua @@ -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] }, diff --git a/lua/flow/highlights/base.lua b/lua/flow/highlights/base.lua index cab9654..bb42879 100644 --- a/lua/flow/highlights/base.lua +++ b/lua/flow/highlights/base.lua @@ -58,7 +58,7 @@ function M.get(c, o) -- Search and substitution IncSearch = { bg = c.fluo, fg = c.bg_visual }, - Search = { bg = c.grey[6], 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. diff --git a/lua/flow/highlights/diagnostic.lua b/lua/flow/highlights/diagnostic.lua index 47d70bf..30457dd 100644 --- a/lua/flow/highlights/diagnostic.lua +++ b/lua/flow/highlights/diagnostic.lua @@ -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 }, } diff --git a/lua/flow/highlights/flash.lua b/lua/flow/highlights/flash.lua index 940c64c..0c43a4a 100644 --- a/lua/flow/highlights/flash.lua +++ b/lua/flow/highlights/flash.lua @@ -10,7 +10,8 @@ function M.get(c, o) local theme = { FlashBackdrop = { fg = c.comment }, FlashLabel = { - bg = (not is_dark and c.Fluo.dark) or c.Fluo.light, + -- bg = (not is_dark and c.Fluo.dark) or c.Fluo.light, + bg = c.blue, fg = c.grey[2], }, } diff --git a/lua/flow/highlights/lazy.lua b/lua/flow/highlights/lazy.lua index 954d6e3..ac5e8c6 100644 --- a/lua/flow/highlights/lazy.lua +++ b/lua/flow/highlights/lazy.lua @@ -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] }, diff --git a/lua/flow/highlights/lsp.lua b/lua/flow/highlights/lsp.lua index 04bd421..534fe61 100644 --- a/lua/flow/highlights/lsp.lua +++ b/lua/flow/highlights/lsp.lua @@ -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 }, From f8c524b075ba1b0c17c4f947990d81538c92793f Mon Sep 17 00:00:00 2001 From: stepit Date: Fri, 17 Jan 2025 08:09:57 +0100 Subject: [PATCH 18/28] apply transparency to code block when transparent background --- lua/flow/highlights/render-markdown.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lua/flow/highlights/render-markdown.lua b/lua/flow/highlights/render-markdown.lua index 4a9ad5c..e1197f3 100644 --- a/lua/flow/highlights/render-markdown.lua +++ b/lua/flow/highlights/render-markdown.lua @@ -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 = { bg = c.grey[2] }, -- 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 | From 76b11456a63cf5bceab487bc199011c52ca0fbfe Mon Sep 17 00:00:00 2001 From: stepit Date: Thu, 23 Jan 2025 16:00:05 +0100 Subject: [PATCH 19/28] add blink support --- lua/flow/highlights/blink.lua | 61 +++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 lua/flow/highlights/blink.lua diff --git a/lua/flow/highlights/blink.lua b/lua/flow/highlights/blink.lua new file mode 100644 index 0000000..0d0414e --- /dev/null +++ b/lua/flow/highlights/blink.lua @@ -0,0 +1,61 @@ +local M = {} + +-- Defines the highlight group colors for Blink completion. +--- @param c table: The available colors. +--- @param o FlowConfig: The available options. +--- @return table: Nvim cmp highlights. +function M.get(c, o) + local ret = { + BlinkCmpDoc = { fg = c.fg, bg = c.bg_float }, + BlinkCmpGhostText = { fg = c.red }, + BlinkCmpKindCodeium = { fg = c.to_check }, + BlinkCmpKindCopilot = { fg = c.to_check }, + BlinkCmpKindSupermaven = { fg = c.t_check }, + BlinkCmpKindTabNine = { fg = c.to_check }, + BlinkCmpSignatureHelp = { fg = c.fg, bg = c.bg_float }, + + BlinkCmpLabelDeprecated = { fg = c.red, strikethrough = true }, + BlinkCmpLabelMatch = { fg = c.blue, bold = true }, + + BlinkCmpScrollBarGutter = { fg = c.to_check, bg = c.red }, + + BlinkCmpMenuBorder = { fg = c.fg_border, bg = c.bg_float }, + BlinkCmpDocBorder = { link = "BlinkCmpMenuBorder" }, + BlinkCmpSignatureHelpBorder = { link = "BlinkCmpMenuBorder" }, + + BlinkCmpLabel = { fg = c.fg }, + + -- Kind + BlinkCmpKindDefault = { fg = c.fg_visual }, + BlinkCmpKindKeyword = { link = "Keyword" }, + BlinkCmpKindFunction = { link = "Function" }, + BlinkCmpKindSnippet = { fg = c.light_blue }, + BlinkCmpKindField = { link = "@field" }, + BlinkCmpKindProperty = { fg = c.sky_blue }, + BlinkCmpKindEvent = { link = "Type" }, + BlinkCmpKindText = { fg = c.fg_popup }, + BlinkCmpKindEnum = { link = "Type" }, + BlinkCmpKindConstant = { link = "Constant" }, + BlinkCmpKindConstructor = { link = "Function" }, + BlinkCmpKindReference = { fg = c.cyan }, + BlinkCmpKindStruct = { link = "Structure" }, + BlinkCmpKindClass = { link = "Type" }, + BlinkCmpKindModule = { fg = c.yellow }, + BlinkCmpKindOperator = { link = "Operator" }, + BlinkCmpKindVariable = { fg = c.sky_blue }, + BlinkCmpKindUnit = { link = "Constant" }, + BlinkCmpKindFile = { link = "Directory" }, + BlinkCmpKindFolder = { link = "Directory" }, + BlinkCmpKindMethod = { link = "Function" }, + BlinkCmpKindValue = { link = "Constant" }, + BlinkCmpKindEnumMember = { link = "Type" }, + BlinkCmpKindInterface = { link = "Type" }, + BlinkCmpKindColor = { link = "Constant" }, + BlinkCmpKindTypeParameter = { link = "Type" }, + } + + -- require("tokyonight.groups.kinds").kinds(ret, "BlinkCmpKind%s") + return ret +end + +return M From 12600eb7843bb07dfb17b7a4dfe89f54c785c66c Mon Sep 17 00:00:00 2001 From: stepit Date: Thu, 23 Jan 2025 18:07:26 +0100 Subject: [PATCH 20/28] include blink in the theme --- lua/flow/theme.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/flow/theme.lua b/lua/flow/theme.lua index e3f76ec..6de9f7b 100644 --- a/lua/flow/theme.lua +++ b/lua/flow/theme.lua @@ -7,6 +7,7 @@ local M = {} --- @type string[] M.active_highlights = { "base", + "blink", "syntax", "markdown", "completion", From aace6565a0912b74880a310478af47e749ff9165 Mon Sep 17 00:00:00 2001 From: stepit Date: Thu, 23 Jan 2025 18:07:00 +0100 Subject: [PATCH 21/28] update tmux colorscheme and lualine --- lua/flow/extra/template/tmux.lua | 4 ++-- lua/lualine/themes/flow.lua | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lua/flow/extra/template/tmux.lua b/lua/flow/extra/template/tmux.lua index 2bd660c..5a7494a 100644 --- a/lua/flow/extra/template/tmux.lua +++ b/lua/flow/extra/template/tmux.lua @@ -21,8 +21,8 @@ setw -g window-status-separator " " set -g window-status-current-style fg=colour198 set -g window-status-format "(#I) #W" set -g window-status-current-format "(#I) #W" -set -g status-left "#[fg=${black},bg=${light_blue}] #S #[bg=${fg_gutter},fg=${light_blue}] #h #[bg=${bg_statusline}] " -set -g status-right "#[bg=${fg_gutter},fg=${light_blue}] %H:%M #[fg=${black},bg=${light_blue}] %A %d. %b %Y " +set -g status-left "#[fg=${bg_highlight},bg=${light_blue}] #S #[bg=${bg_highlight},fg=${light_blue}] #h #[bg=${bg_statusline}] " +set -g status-right "#[bg=${bg_highlight},fg=${light_blue}] %H:%M #[fg=${bg_highlight},bg=${light_blue}] %A %d. %b %Y " set -g message-command-style fg=${fluo} set -g message-style "fg=${fluo}, bg=${bg_statusline}" # color used in the message popup. diff --git a/lua/lualine/themes/flow.lua b/lua/lualine/themes/flow.lua index 50334ee..a575daf 100644 --- a/lua/lualine/themes/flow.lua +++ b/lua/lualine/themes/flow.lua @@ -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.light_blue, fg = colors.grey[2] }, - b = { bg = colors.grey[2], fg = colors.light_blue }, + a = { bg = colors.light_blue, fg = colors.bg_highlight }, + b = { bg = colors.bg_highlight, 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.grey[2] }, - b = { bg = colors.grey[2], fg = colors.cyan }, + a = { bg = colors.cyan, fg = colors.bg_highlight }, + b = { bg = colors.bg_highlight, 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.grey[2] }, - b = { bg = colors.grey[2], fg = colors.yellow }, + a = { bg = colors.yellow, fg = colors.bg_highlight }, + b = { bg = colors.bg_highlight, 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.grey[2] }, - b = { bg = colors.grey[2], fg = colors.purple }, + a = { bg = colors.purple, fg = colors.bg_highlight }, + b = { bg = colors.bg_highlight, 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.grey[2] }, - b = { bg = colors.grey[2], fg = colors.red }, + a = { bg = colors.red, fg = colors.bg_highlight }, + b = { bg = colors.bg_highlight, 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.grey[2] }, - b = { bg = colors.grey[2], fg = colors.green }, + a = { bg = colors.green, fg = colors.bg_highlight }, + b = { bg = colors.bg_highlight, fg = colors.green }, } -- Inactive mode colors. Only c seems to be applied here From 87e149d2408043439b7f1d5c0ec75586b1094cab Mon Sep 17 00:00:00 2001 From: stepit Date: Thu, 23 Jan 2025 18:13:08 +0100 Subject: [PATCH 22/28] update just colors --- lua/flow/highlights/treesitter.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lua/flow/highlights/treesitter.lua b/lua/flow/highlights/treesitter.lua index 9c51ad1..551ab33 100644 --- a/lua/flow/highlights/treesitter.lua +++ b/lua/flow/highlights/treesitter.lua @@ -152,6 +152,10 @@ function M.get(c, _) -- YAML ["@property.yaml"] = { fg = c.yellow }, + + -- Just + ["@function.just"] = { link = "Function" }, + ["@function.call.just"] = { link = "@variable.parameter" }, } return theme From 0d1e1a96ed7976480845aca87e93e1e25c2de989 Mon Sep 17 00:00:00 2001 From: stepit Date: Thu, 23 Jan 2025 18:13:47 +0100 Subject: [PATCH 23/28] update active parameters colors --- lua/flow/highlights/lsp.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lua/flow/highlights/lsp.lua b/lua/flow/highlights/lsp.lua index 534fe61..39ae044 100644 --- a/lua/flow/highlights/lsp.lua +++ b/lua/flow/highlights/lsp.lua @@ -6,7 +6,7 @@ local M = {} --- @return table: Nvim lsp highlights. function M.get(c, _) local theme = { - LspSignatureActiveParameter = { fg = c.grey[2], bg = c.fg_visual, bold = true }, -- Parameter highlighter in signature help. + LspSignatureActiveParameter = { bg = c.Cyan.very_dark, bold = true }, -- Parameter highlighter in signature help. LspReferenceText = { bg = c.Cyan.very_dark }, -- Used for highlighting "text" references. LspReferenceRead = { link = "LspReferenceText" }, -- Used for highlighting "read" references. @@ -18,6 +18,8 @@ function M.get(c, _) LspInfoBorder = { fg = c.fg_border, bg = c.bg_float }, LspKindSnippet = { fg = c.to_check }, + + SnippetTabstop = { bg = c.Purple.very_dark }, } return theme From a7229655e931dec6379e4df51712afef6934397a Mon Sep 17 00:00:00 2001 From: stepit Date: Thu, 23 Jan 2025 18:14:09 +0100 Subject: [PATCH 24/28] use transparent in md blocks if transparent --- lua/flow/highlights/markdown.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lua/flow/highlights/markdown.lua b/lua/flow/highlights/markdown.lua index 5e9be94..764f195 100644 --- a/lua/flow/highlights/markdown.lua +++ b/lua/flow/highlights/markdown.lua @@ -2,8 +2,11 @@ local M = {} -- Defines the highlight group colors for markdown --- @param c table: The available colors. +--- @param o FlowConfig: The available options. --- @return table: Markdown highlights. -function M.get(c, _) +function M.get(c, o) + local is_transparent = o.theme.transparent + local theme = { htmlH1 = { fg = c.purple, bold = true }, htmlH2 = { fg = c.blue, bold = true }, @@ -56,7 +59,7 @@ function M.get(c, _) ["@label.markdown"] = { link = "Keyword" }, -- Used for the language specified in codeblocks. ["@markup.raw.block"] = { - bg = c.bg, + bg = (is_transparent and c.transparent) or c.grey[2], }, -- ["@markup.raw.markdown_inline"] = { fg = c.cyan, From ed909ef02287f3dcbba6e8f2e164e79b207bb381 Mon Sep 17 00:00:00 2001 From: stepit Date: Thu, 23 Jan 2025 18:15:40 +0100 Subject: [PATCH 25/28] small refactoring colors and names --- lua/flow/colors.lua | 6 +++--- lua/flow/highlights/base.lua | 24 ++++++++++++------------ lua/flow/highlights/git.lua | 4 ++-- lua/flow/highlights/render-markdown.lua | 5 +---- lua/flow/highlights/syntax.lua | 2 +- lua/flow/highlights/telescope.lua | 10 +++++----- lua/flow/highlights/whichkey.lua | 2 +- 7 files changed, 25 insertions(+), 28 deletions(-) diff --git a/lua/flow/colors.lua b/lua/flow/colors.lua index 487e816..92692e8 100644 --- a/lua/flow/colors.lua +++ b/lua/flow/colors.lua @@ -94,7 +94,7 @@ function M.setup(opts) -- Popups: use for completion menu and all visual components that appears autonomously. colors.fg_popup = default_palette.grey[7] - colors.bg_popup = (is_transparent and default_palette.transparent) or colors.grey[1] + colors.bg_popup = (is_transparent and default_palette.transparent) or colors.bg -- Statusline and tabline colors.fg_statusline = colors.grey[4] @@ -105,8 +105,8 @@ function M.setup(opts) colors.bg_highlight = colors.grey[2] -- Visual - colors.fg_visual = colors.fluo - colors.bg_visual = colors.grey[1] + colors.bg_visual = colors.fluo + colors.fg_visual = colors.grey[2] -- Git colors.git = { diff --git a/lua/flow/highlights/base.lua b/lua/flow/highlights/base.lua index bb42879..1988d3e 100644 --- a/lua/flow/highlights/base.lua +++ b/lua/flow/highlights/base.lua @@ -42,8 +42,8 @@ function M.get(c, o) -- Cursors -- NOTE: these highlights groups are superseeded by the terminal colors used. For example, -- the colors used for the cursor are defined in the Alacritty's config. - Cursor = { fg = c.bg, bg = c.fg }, -- Character under the cursor. - lCursor = { fg = c.bg, bg = c.fg }, -- The character under the cursor when |language-mapping| is used (see 'guicursor'). + Cursor = { fg = c.flow, bg = c.fg }, -- Character under the cursor. + lCursor = { fg = c.flow, bg = c.fg }, -- The character under the cursor when |language-mapping| is used (see 'guicursor'). CursorIM = { fg = c.bg, bg = c.fg }, -- Like Cursor, but used when in IME mode |CursorIM|. -- Text @@ -57,30 +57,30 @@ function M.get(c, o) Conceal = { fg = c.fg }, -- Placeholder characters substituted for concealed text (see 'conceallevel'). -- Search and substitution - 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'). + IncSearch = { bg = c.fluo, fg = c.fg_visual }, + Search = { bg = c.grey[5], fg = c.fg_visual }, + CurSearch = { bg = (not is_dark and c.Fluo.dark) or c.Fluo.light, fg = c.fg_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. + Visual = { bg = c.bg_visual, fg = c.fg_visual }, -- Visual mode selection. VisualNOS = { bg = c.to_check }, -- visual mode selection when vim is "Not Owning the Selection". -- Messages MsgArea = { link = "Normal" }, -- Area for messages and cmdline. - ModeMsg = { fg = c.fg_visual }, -- 'showmode' message (e.g., "-- INSERT -- "). - MoreMsg = { fg = c.fg_visual }, -- |more-prompt|. + ModeMsg = { fg = c.bg_visual }, -- 'showmode' message (e.g., "-- INSERT -- "). + MoreMsg = { fg = c.bg_visual }, -- |more-prompt|. ErrorMsg = { fg = c.error }, -- Error messages on the command line. WarningMsg = { fg = c.warning }, -- Warning messages. MsgSeparator = { fg = c.to_check }, -- Separator for scrolled messages |msgsep|. -- Popup menu Pmenu = { bg = c.bg_popup, fg = c.fg_popup }, -- Popup menu: normal item triggered for example when listing plugin commands in terminal. - PmenuSbar = { bg = c.bg_popup }, -- Popup menu: scrollbar. PmenuSel = { bg = c.bg_visual, fg = c.fg_visual }, -- Popup menu: selected item. - PmenuThumb = { bg = c.comment, bold = true }, -- Popup menu: Thumb of the scrollbar. + PmenuThumb = { bg = c.grey[4], bold = true }, -- Popup menu: Thumb of the scrollbar. + PmenuSbar = { bg = c.bg_popup }, -- Popup menu: scrollbar. -- Quickfix - QuickFixLine = { bg = c.fg_visual, fg = c.bg_visual }, -- Current |quickfix| item in the quickfix window. + QuickFixLine = { bg = c.bg_visual, fg = c.fg_visual }, -- Current |quickfix| item in the quickfix window. qfLineNr = { link = "LineNr" }, -- Line number in the quickfix. qfFileName = { link = "Directory" }, -- Name of the file in the quickfix. qfSeparator = { link = "qfLineNr" }, -- Separator between quickfix line number and filename. @@ -107,7 +107,7 @@ function M.get(c, o) -- I'm not sure where these groups are set. Define = { fg = c.grey[6] }, -- Preprocessor #define. Used in rust. Include = { fg = c.red }, -- preprocessor #include - Question = { fg = c.fg_visual }, -- |hit-enter| prompt and yes/no questions. + Question = { fg = c.bg_visual }, -- |hit-enter| prompt and yes/no questions. WildMenu = { bg = c.to_check }, -- current match in 'wildmenu' completion WinBar = { bg = c.none }, -- Window bar, WinBarNC = { bg = c.none }, -- Window bar in inactive windows, used by dap-ui. diff --git a/lua/flow/highlights/git.lua b/lua/flow/highlights/git.lua index e1b0d8f..2177387 100644 --- a/lua/flow/highlights/git.lua +++ b/lua/flow/highlights/git.lua @@ -8,7 +8,7 @@ function M.get(c, _) gitKeyword = { fg = c.blue }, gitIdentityKeyword = { link = "gitKeyword" }, - gitCommitSummary = { fg = c.fg_visual }, + gitCommitSummary = { fg = c.bg_visual }, gitDate = { fg = c.light_blue }, gitDiff = { fg = c.grey[4] }, @@ -43,7 +43,7 @@ function M.get(c, _) fugitiveUnstagedModifier = { link = "fugitiveUnstagedHeading" }, fugitiveStagedHeading = { fg = c.green }, fugitiveStagedModifier = { link = "fugitiveStagedHeading" }, - fugitiveCount = { fg = c.grey[5] }, + fugitiveCount = { fg = c.yellow }, FugitiveblameTime = { link = "gitDate" }, -- Git-conflict diff --git a/lua/flow/highlights/render-markdown.lua b/lua/flow/highlights/render-markdown.lua index e1197f3..617101f 100644 --- a/lua/flow/highlights/render-markdown.lua +++ b/lua/flow/highlights/render-markdown.lua @@ -4,14 +4,11 @@ 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 | diff --git a/lua/flow/highlights/syntax.lua b/lua/flow/highlights/syntax.lua index 90ba7c1..c5b67f4 100644 --- a/lua/flow/highlights/syntax.lua +++ b/lua/flow/highlights/syntax.lua @@ -33,7 +33,7 @@ function M.get(c, o) StorageClass = { fg = c.to_check }, -- Static, register, volatile, etc. String = { fg = c.sky_blue }, -- A string constant: "this is a string". Structure = { link = "Type" }, -- A struct, union, enum, etc. - Tag = { fg = c.fg_visual }, -- You can use CTRL-] on this. Like Help tag in fugitive. + Tag = { fg = c.bg_visual }, -- You can use CTRL-] on this. Like Help tag in fugitive. Type = { fg = c.light_blue }, -- Types like int, long, char, etc. Typedef = { link = "Type" }, -- A typedef. Bold = { fg = c.grey[6], bold = true }, diff --git a/lua/flow/highlights/telescope.lua b/lua/flow/highlights/telescope.lua index d9be8a7..c3d7d09 100644 --- a/lua/flow/highlights/telescope.lua +++ b/lua/flow/highlights/telescope.lua @@ -12,13 +12,13 @@ function M.get(c, _) TelescopeResultsNormal = { link = "TelescopeNormal" }, -- Selection - TelescopeSelectionCaret = { fg = c.fg_visual, bold = true }, - TelescopeSelection = { fg = c.fg_visual, bold = true }, - TelescopeMultiSelection = { fg = c.bg_visual, bg = c.fg_visual, bold = true }, -- Open telescope and press TAB on files. + TelescopeSelectionCaret = { fg = c.bg_visual, bold = true }, + TelescopeSelection = { fg = c.bg_visual, bold = true }, + TelescopeMultiSelection = { fg = c.fg_visual, bg = c.bg_visual, bold = true }, -- Open telescope and press TAB on files. TelescopeMultiIcon = { link = "TelescopeMultiSelection" }, -- Icon of selected items. - TelescopeMatching = { fg = c.comment, bold = true }, + TelescopeMatching = { fg = c.blue, bold = true }, - TelescopePromptPrefix = { bg = c.transparent, fg = c.fg_visual }, + TelescopePromptPrefix = { bg = c.transparent, fg = c.bg_visual }, -- Titles TelescopeResultsTitle = { bg = c.transparent, fg = c.fg_border }, diff --git a/lua/flow/highlights/whichkey.lua b/lua/flow/highlights/whichkey.lua index 46dc2d3..ddb92e6 100644 --- a/lua/flow/highlights/whichkey.lua +++ b/lua/flow/highlights/whichkey.lua @@ -4,7 +4,7 @@ local M = {} --- @return table: Whichkey plugin highlights. function M.get(c, _) local theme = { - WhichKey = { fg = c.fg_visual }, + WhichKey = { fg = c.bg_visual }, WhichKeyGroup = { fg = c.light_blue }, WhichKeyDesc = { fg = c.fg_popup }, WhichKeyFloat = { bg = c.bg_popup }, From 64ceec30ea34d23abdc988d9604162e6034fcc4f Mon Sep 17 00:00:00 2001 From: stepit Date: Sun, 9 Feb 2025 10:36:08 +0100 Subject: [PATCH 26/28] maybe update to colors --- lua/flow/highlights/diagnostic.lua | 2 +- lua/flow/highlights/flash.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/flow/highlights/diagnostic.lua b/lua/flow/highlights/diagnostic.lua index 30457dd..f4aa20b 100644 --- a/lua/flow/highlights/diagnostic.lua +++ b/lua/flow/highlights/diagnostic.lua @@ -14,7 +14,7 @@ function M.get(c, o) DiagnosticWarn = { fg = c.warning }, DiagnosticInfo = { fg = c.info }, DiagnosticHint = { fg = c.hint }, - DiagnosticUnnecessary = { fg = c.comment, undercurl = true }, + DiagnosticUnnecessary = { undercurl = false }, DiagnosticVirtualTextError = { fg = c.error, bg = c.Red[background_tone] }, DiagnosticVirtualTextWarn = { fg = c.warning, bg = c.Yellow[background_tone] }, diff --git a/lua/flow/highlights/flash.lua b/lua/flow/highlights/flash.lua index 0c43a4a..c102442 100644 --- a/lua/flow/highlights/flash.lua +++ b/lua/flow/highlights/flash.lua @@ -8,7 +8,7 @@ function M.get(c, o) local is_dark = o.theme.style == "dark" local theme = { - FlashBackdrop = { fg = c.comment }, + -- FlashBackdrop = { fg = c.comment }, FlashLabel = { -- bg = (not is_dark and c.Fluo.dark) or c.Fluo.light, bg = c.blue, From 83cf20938d3ea9f336eecd62a94bdcbd93d0c338 Mon Sep 17 00:00:00 2001 From: stepit Date: Sun, 16 Feb 2025 09:16:36 +0100 Subject: [PATCH 27/28] delete old extras --- extra/bloom/ghostty-flow-cyan.config | 33 ------------------------ extra/bloom/ghostty-flow-green.config | 33 ------------------------ extra/bloom/ghostty-flow-orange.config | 33 ------------------------ extra/bloom/ghostty-flow-pink.config | 33 ------------------------ extra/bloom/ghostty-flow-yellow.config | 33 ------------------------ extra/eclipse/ghostty-flow-cyan.config | 33 ------------------------ extra/eclipse/ghostty-flow-green.config | 33 ------------------------ extra/eclipse/ghostty-flow-orange.config | 33 ------------------------ extra/eclipse/ghostty-flow-pink.config | 33 ------------------------ extra/eclipse/ghostty-flow-yellow.config | 33 ------------------------ 10 files changed, 330 deletions(-) delete mode 100644 extra/bloom/ghostty-flow-cyan.config delete mode 100644 extra/bloom/ghostty-flow-green.config delete mode 100644 extra/bloom/ghostty-flow-orange.config delete mode 100644 extra/bloom/ghostty-flow-pink.config delete mode 100644 extra/bloom/ghostty-flow-yellow.config delete mode 100644 extra/eclipse/ghostty-flow-cyan.config delete mode 100644 extra/eclipse/ghostty-flow-green.config delete mode 100644 extra/eclipse/ghostty-flow-orange.config delete mode 100644 extra/eclipse/ghostty-flow-pink.config delete mode 100644 extra/eclipse/ghostty-flow-yellow.config diff --git a/extra/bloom/ghostty-flow-cyan.config b/extra/bloom/ghostty-flow-cyan.config deleted file mode 100644 index 207bec5..0000000 --- a/extra/bloom/ghostty-flow-cyan.config +++ /dev/null @@ -1,33 +0,0 @@ -# Flow colorscheme | Ghostty -# https://github.com/0xstepit/flow.nvim - -background = #1b2228 -foreground = #b3c1cc -# black -palette = 0=#0d0d0d -palette = 8=#0d0d0d -# red -palette = 1=#d98c93 -palette = 9=#d98c93 -# green -palette = 2=#93d98c -palette = 10=#93d98c -# yellow -palette = 3=#d9d28c -palette = 11=#d9d28c -# blue -palette = 4=#8cb9d9 -palette = 12=#8cb9d9 -# purple -palette = 5=#ac8cd9 -palette = 13=#ac8cd9 -# aqua -palette = 6=#8cd9d2 -palette = 14=#8cd9d2 -# white -palette = 7=#f2f2f2 -palette = 15=#f2f2f2 - -cursor-color = #00e1ff -selection-background = #0d0d0d -selection-foreground = #00e1ff diff --git a/extra/bloom/ghostty-flow-green.config b/extra/bloom/ghostty-flow-green.config deleted file mode 100644 index cfec631..0000000 --- a/extra/bloom/ghostty-flow-green.config +++ /dev/null @@ -1,33 +0,0 @@ -# Flow colorscheme | Ghostty -# https://github.com/0xstepit/flow.nvim - -background = #1b2228 -foreground = #b3c1cc -# black -palette = 0=#0d0d0d -palette = 8=#0d0d0d -# red -palette = 1=#d98c93 -palette = 9=#d98c93 -# green -palette = 2=#93d98c -palette = 10=#93d98c -# yellow -palette = 3=#d9d28c -palette = 11=#d9d28c -# blue -palette = 4=#8cb9d9 -palette = 12=#8cb9d9 -# purple -palette = 5=#ac8cd9 -palette = 13=#ac8cd9 -# aqua -palette = 6=#8cd9d2 -palette = 14=#8cd9d2 -# white -palette = 7=#f2f2f2 -palette = 15=#f2f2f2 - -cursor-color = #15ff00 -selection-background = #0d0d0d -selection-foreground = #15ff00 diff --git a/extra/bloom/ghostty-flow-orange.config b/extra/bloom/ghostty-flow-orange.config deleted file mode 100644 index 846b378..0000000 --- a/extra/bloom/ghostty-flow-orange.config +++ /dev/null @@ -1,33 +0,0 @@ -# Flow colorscheme | Ghostty -# https://github.com/0xstepit/flow.nvim - -background = #1b2228 -foreground = #b3c1cc -# black -palette = 0=#0d0d0d -palette = 8=#0d0d0d -# red -palette = 1=#d98c93 -palette = 9=#d98c93 -# green -palette = 2=#93d98c -palette = 10=#93d98c -# yellow -palette = 3=#d9d28c -palette = 11=#d9d28c -# blue -palette = 4=#8cb9d9 -palette = 12=#8cb9d9 -# purple -palette = 5=#ac8cd9 -palette = 13=#ac8cd9 -# aqua -palette = 6=#8cd9d2 -palette = 14=#8cd9d2 -# white -palette = 7=#f2f2f2 -palette = 15=#f2f2f2 - -cursor-color = #ff6a00 -selection-background = #0d0d0d -selection-foreground = #ff6a00 diff --git a/extra/bloom/ghostty-flow-pink.config b/extra/bloom/ghostty-flow-pink.config deleted file mode 100644 index 7feaf81..0000000 --- a/extra/bloom/ghostty-flow-pink.config +++ /dev/null @@ -1,33 +0,0 @@ -# Flow colorscheme | Ghostty -# https://github.com/0xstepit/flow.nvim - -background = #1b2228 -foreground = #b3c1cc -# black -palette = 0=#0d0d0d -palette = 8=#0d0d0d -# red -palette = 1=#d98c93 -palette = 9=#d98c93 -# green -palette = 2=#93d98c -palette = 10=#93d98c -# yellow -palette = 3=#d9d28c -palette = 11=#d9d28c -# blue -palette = 4=#8cb9d9 -palette = 12=#8cb9d9 -# purple -palette = 5=#ac8cd9 -palette = 13=#ac8cd9 -# aqua -palette = 6=#8cd9d2 -palette = 14=#8cd9d2 -# white -palette = 7=#f2f2f2 -palette = 15=#f2f2f2 - -cursor-color = #ff007b -selection-background = #0d0d0d -selection-foreground = #ff007b diff --git a/extra/bloom/ghostty-flow-yellow.config b/extra/bloom/ghostty-flow-yellow.config deleted file mode 100644 index 6f602af..0000000 --- a/extra/bloom/ghostty-flow-yellow.config +++ /dev/null @@ -1,33 +0,0 @@ -# Flow colorscheme | Ghostty -# https://github.com/0xstepit/flow.nvim - -background = #1b2228 -foreground = #b3c1cc -# black -palette = 0=#0d0d0d -palette = 8=#0d0d0d -# red -palette = 1=#d98c93 -palette = 9=#d98c93 -# green -palette = 2=#93d98c -palette = 10=#93d98c -# yellow -palette = 3=#d9d28c -palette = 11=#d9d28c -# blue -palette = 4=#8cb9d9 -palette = 12=#8cb9d9 -# purple -palette = 5=#ac8cd9 -palette = 13=#ac8cd9 -# aqua -palette = 6=#8cd9d2 -palette = 14=#8cd9d2 -# white -palette = 7=#f2f2f2 -palette = 15=#f2f2f2 - -cursor-color = #fbff00 -selection-background = #0d0d0d -selection-foreground = #fbff00 diff --git a/extra/eclipse/ghostty-flow-cyan.config b/extra/eclipse/ghostty-flow-cyan.config deleted file mode 100644 index 207bec5..0000000 --- a/extra/eclipse/ghostty-flow-cyan.config +++ /dev/null @@ -1,33 +0,0 @@ -# Flow colorscheme | Ghostty -# https://github.com/0xstepit/flow.nvim - -background = #1b2228 -foreground = #b3c1cc -# black -palette = 0=#0d0d0d -palette = 8=#0d0d0d -# red -palette = 1=#d98c93 -palette = 9=#d98c93 -# green -palette = 2=#93d98c -palette = 10=#93d98c -# yellow -palette = 3=#d9d28c -palette = 11=#d9d28c -# blue -palette = 4=#8cb9d9 -palette = 12=#8cb9d9 -# purple -palette = 5=#ac8cd9 -palette = 13=#ac8cd9 -# aqua -palette = 6=#8cd9d2 -palette = 14=#8cd9d2 -# white -palette = 7=#f2f2f2 -palette = 15=#f2f2f2 - -cursor-color = #00e1ff -selection-background = #0d0d0d -selection-foreground = #00e1ff diff --git a/extra/eclipse/ghostty-flow-green.config b/extra/eclipse/ghostty-flow-green.config deleted file mode 100644 index cfec631..0000000 --- a/extra/eclipse/ghostty-flow-green.config +++ /dev/null @@ -1,33 +0,0 @@ -# Flow colorscheme | Ghostty -# https://github.com/0xstepit/flow.nvim - -background = #1b2228 -foreground = #b3c1cc -# black -palette = 0=#0d0d0d -palette = 8=#0d0d0d -# red -palette = 1=#d98c93 -palette = 9=#d98c93 -# green -palette = 2=#93d98c -palette = 10=#93d98c -# yellow -palette = 3=#d9d28c -palette = 11=#d9d28c -# blue -palette = 4=#8cb9d9 -palette = 12=#8cb9d9 -# purple -palette = 5=#ac8cd9 -palette = 13=#ac8cd9 -# aqua -palette = 6=#8cd9d2 -palette = 14=#8cd9d2 -# white -palette = 7=#f2f2f2 -palette = 15=#f2f2f2 - -cursor-color = #15ff00 -selection-background = #0d0d0d -selection-foreground = #15ff00 diff --git a/extra/eclipse/ghostty-flow-orange.config b/extra/eclipse/ghostty-flow-orange.config deleted file mode 100644 index 846b378..0000000 --- a/extra/eclipse/ghostty-flow-orange.config +++ /dev/null @@ -1,33 +0,0 @@ -# Flow colorscheme | Ghostty -# https://github.com/0xstepit/flow.nvim - -background = #1b2228 -foreground = #b3c1cc -# black -palette = 0=#0d0d0d -palette = 8=#0d0d0d -# red -palette = 1=#d98c93 -palette = 9=#d98c93 -# green -palette = 2=#93d98c -palette = 10=#93d98c -# yellow -palette = 3=#d9d28c -palette = 11=#d9d28c -# blue -palette = 4=#8cb9d9 -palette = 12=#8cb9d9 -# purple -palette = 5=#ac8cd9 -palette = 13=#ac8cd9 -# aqua -palette = 6=#8cd9d2 -palette = 14=#8cd9d2 -# white -palette = 7=#f2f2f2 -palette = 15=#f2f2f2 - -cursor-color = #ff6a00 -selection-background = #0d0d0d -selection-foreground = #ff6a00 diff --git a/extra/eclipse/ghostty-flow-pink.config b/extra/eclipse/ghostty-flow-pink.config deleted file mode 100644 index 7feaf81..0000000 --- a/extra/eclipse/ghostty-flow-pink.config +++ /dev/null @@ -1,33 +0,0 @@ -# Flow colorscheme | Ghostty -# https://github.com/0xstepit/flow.nvim - -background = #1b2228 -foreground = #b3c1cc -# black -palette = 0=#0d0d0d -palette = 8=#0d0d0d -# red -palette = 1=#d98c93 -palette = 9=#d98c93 -# green -palette = 2=#93d98c -palette = 10=#93d98c -# yellow -palette = 3=#d9d28c -palette = 11=#d9d28c -# blue -palette = 4=#8cb9d9 -palette = 12=#8cb9d9 -# purple -palette = 5=#ac8cd9 -palette = 13=#ac8cd9 -# aqua -palette = 6=#8cd9d2 -palette = 14=#8cd9d2 -# white -palette = 7=#f2f2f2 -palette = 15=#f2f2f2 - -cursor-color = #ff007b -selection-background = #0d0d0d -selection-foreground = #ff007b diff --git a/extra/eclipse/ghostty-flow-yellow.config b/extra/eclipse/ghostty-flow-yellow.config deleted file mode 100644 index 6f602af..0000000 --- a/extra/eclipse/ghostty-flow-yellow.config +++ /dev/null @@ -1,33 +0,0 @@ -# Flow colorscheme | Ghostty -# https://github.com/0xstepit/flow.nvim - -background = #1b2228 -foreground = #b3c1cc -# black -palette = 0=#0d0d0d -palette = 8=#0d0d0d -# red -palette = 1=#d98c93 -palette = 9=#d98c93 -# green -palette = 2=#93d98c -palette = 10=#93d98c -# yellow -palette = 3=#d9d28c -palette = 11=#d9d28c -# blue -palette = 4=#8cb9d9 -palette = 12=#8cb9d9 -# purple -palette = 5=#ac8cd9 -palette = 13=#ac8cd9 -# aqua -palette = 6=#8cd9d2 -palette = 14=#8cd9d2 -# white -palette = 7=#f2f2f2 -palette = 15=#f2f2f2 - -cursor-color = #fbff00 -selection-background = #0d0d0d -selection-foreground = #fbff00 From a2f6c8bf40549b0443b79676157f52ab01deb08d Mon Sep 17 00:00:00 2001 From: stepit Date: Sun, 16 Feb 2025 09:16:59 +0100 Subject: [PATCH 28/28] improve colors --- lua/flow/highlights/diagnostic.lua | 4 ++-- lua/flow/highlights/syntax.lua | 2 +- lua/flow/highlights/treesitter.lua | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lua/flow/highlights/diagnostic.lua b/lua/flow/highlights/diagnostic.lua index f4aa20b..04011bc 100644 --- a/lua/flow/highlights/diagnostic.lua +++ b/lua/flow/highlights/diagnostic.lua @@ -27,8 +27,8 @@ function M.get(c, o) DiagnosticFloatingHint = { link = "DiagnosticHint" }, DiagnosticFloatingOk = { fg = c.fg_viusual }, - DiagnosticUnderlineError = { fg = c.error, undercurl = true, sp = c.error }, - DiagnosticUnderlineWarn = { fg = c.warning, undercurl = true, sp = c.warning }, + DiagnosticUnderlineError = { undercurl = true, sp = c.error }, + DiagnosticUnderlineWarn = { undercurl = true, sp = c.warning }, DiagnosticUnderlineInfo = { undercurl = true, sp = c.info }, DiagnosticUnderlineHint = { undercurl = true, sp = c.hint }, } diff --git a/lua/flow/highlights/syntax.lua b/lua/flow/highlights/syntax.lua index c5b67f4..a323c16 100644 --- a/lua/flow/highlights/syntax.lua +++ b/lua/flow/highlights/syntax.lua @@ -30,7 +30,7 @@ function M.get(c, o) SpecialComment = { fg = c.to_check }, -- special things inside a comment SpecialKey = { fg = c.fluo }, -- Unprintable characters: text displayed differently from what it really is. Like pressing Ctrl + k in insert mode. Statement = { fg = c.purple }, -- Any statement. - StorageClass = { fg = c.to_check }, -- Static, register, volatile, etc. + StorageClass = { fg = c.red }, -- Static, register, volatile, etc. (rust lifetimes) String = { fg = c.sky_blue }, -- A string constant: "this is a string". Structure = { link = "Type" }, -- A struct, union, enum, etc. Tag = { fg = c.bg_visual }, -- You can use CTRL-] on this. Like Help tag in fugitive. diff --git a/lua/flow/highlights/treesitter.lua b/lua/flow/highlights/treesitter.lua index 551ab33..f44556c 100644 --- a/lua/flow/highlights/treesitter.lua +++ b/lua/flow/highlights/treesitter.lua @@ -146,6 +146,7 @@ function M.get(c, _) -- Golang ["@module.go"] = { fg = c.cyan }, ["@keyword.function.go"] = { link = "Statement" }, + ["@lsp.type.namespace.go"] = { link = "@module.go" }, -- Rust -- ["@lsp.type.enumMembers.rust"] = { fg = colors.grey[6] },