From 805e3515ba71a3ac8731c687700152aa3c41edd1 Mon Sep 17 00:00:00 2001 From: stepit Date: Wed, 8 Jan 2025 12:46:00 +0100 Subject: [PATCH 1/4] 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 2/4] 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 e8c0f9fc990411238af9fb91e4b6fe7ea48c5137 Mon Sep 17 00:00:00 2001 From: stepit Date: Wed, 15 Jan 2025 11:18:15 +0100 Subject: [PATCH 3/4] 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 a65aa8043460cc21816d25f3a85ac207a67f24f4 Mon Sep 17 00:00:00 2001 From: stepit Date: Wed, 15 Jan 2025 16:11:35 +0100 Subject: [PATCH 4/4] 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 },