From f043dc579827b74db3dddba503524cd3c743a6ac Mon Sep 17 00:00:00 2001 From: Dmitry Poyarkov <14233263+Strash@users.noreply.github.com> Date: Mon, 25 Nov 2024 05:03:39 +0300 Subject: [PATCH 01/12] feat(highlights): blink.cmp --- lua/mellifluous/default_config.lua | 1 + .../highlights/plugins/blink_cmp.lua | 47 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 lua/mellifluous/highlights/plugins/blink_cmp.lua diff --git a/lua/mellifluous/default_config.lua b/lua/mellifluous/default_config.lua index 698d0e5..d447e24 100644 --- a/lua/mellifluous/default_config.lua +++ b/lua/mellifluous/default_config.lua @@ -2,6 +2,7 @@ return { colorset = "mellifluous", plugins = { cmp = true, + blink_cmp = true, indent_blankline = true, nvim_tree = { enabled = true, diff --git a/lua/mellifluous/highlights/plugins/blink_cmp.lua b/lua/mellifluous/highlights/plugins/blink_cmp.lua new file mode 100644 index 0000000..de2024c --- /dev/null +++ b/lua/mellifluous/highlights/plugins/blink_cmp.lua @@ -0,0 +1,47 @@ +local M = {} + +function M.set(hl, colors) + hl.set("BlinkCmpMenu", { bg = hl.get("Pmenu").bg }) + hl.set("BlinkCmpMenuBorder", { bg = hl.get("Pmenu").bg }) + hl.set("BlinkCmpMenuSelection", { bg = hl.get("PmenuSel").bg, fg = hl.get("PmenuSel").fg }) + hl.set("BlinkCmpScrollBarThumb", { fg = hl.get("PmenuThumb").fg }) + hl.set("BlinkCmpScrollBarGutter", { fg = hl.get("PmenuSbar").fg }) + hl.set("BlinkCmpLabel", { fg = hl.get("Pmenu").fg }) + hl.set("BlinkCmpLabelDeprecated", { fg = hl.get("Comment").fg }) + hl.set("BlinkCmpLabelMatch", { fg = colors.fg }) + hl.set("BlinkCmpGhostText", { fg = hl.get("Comment").fg }) + hl.set("BlinkCmpKind", { fg = hl.get("Type").fg }) + hl.set("BlinkCmpKindText", { fg = hl.get("String").fg }) + hl.set("BlinkCmpKindMethod", { fg = hl.get("CmpItemKindFunction").fg }) + hl.set("BlinkCmpKindFunction", { fg = hl.get("Function").fg }) + hl.set("BlinkCmpKindConstructor", { fg = hl.get("Function").fg }) + hl.set("BlinkCmpKindField", { fg = hl.get("Identifier").fg }) + hl.set("BlinkCmpKindVariable", { fg = hl.get("Identifier").fg }) + hl.set("BlinkCmpKindClass", { fg = hl.get("Type").fg }) + hl.set("BlinkCmpKindInterface", { fg = hl.get("Type").fg }) + hl.set("BlinkCmpKindModule", { fg = hl.get("Function").fg }) + hl.set("BlinkCmpKindProperty", { fg = hl.get("CmpItemKindField").fg }) + hl.set("BlinkCmpKindUnit", { fg = hl.get("CmpItemKindStruct").fg }) + hl.set("BlinkCmpKindValue", { fg = hl.get("CmpItemKindConstant").fg }) + hl.set("BlinkCmpKindEnum", { fg = hl.get("Constant").fg }) + hl.set("BlinkCmpKindKeyword", { fg = hl.get("Keyword").fg }) + hl.set("BlinkCmpKindSnippet", { fg = hl.get("Special").fg }) + hl.set("BlinkCmpKindColor", { fg = hl.get("Label").fg }) + hl.set("BlinkCmpKindFile", { fg = hl.get("Directory").fg }) + hl.set("BlinkCmpKindReference", { fg = hl.get("StorageClass").fg }) + hl.set("BlinkCmpKindFolder", { fg = hl.get("CmpItemKindFile").fg }) + hl.set("BlinkCmpKindEnumMember", { fg = hl.get("Constant").fg }) + hl.set("BlinkCmpKindConstant", { fg = hl.get("Constant").fg }) + hl.set("BlinkCmpKindStruct", { fg = hl.get("Structure").fg }) + hl.set("BlinkCmpKindEvent", { fg = hl.get("Repeat").fg }) + hl.set("BlinkCmpKindOperator", { fg = hl.get("Operator").fg }) + hl.set("BlinkCmpKindTypeParameter", { fg = hl.get("Type").fg }) + hl.set("BlinkCmpDoc", { bg = hl.get("NormalFloat").bg }) + hl.set("BlinkCmpDocBorder", { bg = hl.get("NormalFloat").bg }) + hl.set("BlinkCmpDocCursorLine", { bg = hl.get("Visual").bg }) + hl.set("BlinkCmpSignatureHelp", { bg = hl.get("NormalFloat").bg }) + hl.set("BlinkCmpSignatureHelpBorder", { bg = hl.get("NormalFloat").bg }) + hl.set("BlinkCmpSignatureHelpActiveParameter", { bg = hl.get("LspSignatureActiveParameter").bg }) +end + +return M From 7beb13f8fa4182bc8850d29f94c2302b10b2e96b Mon Sep 17 00:00:00 2001 From: Dmitry Poyarkov <14233263+Strash@users.noreply.github.com> Date: Mon, 25 Nov 2024 05:22:49 +0300 Subject: [PATCH 02/12] fix(highlights): remove cmp hl groups --- lua/mellifluous/highlights/plugins/blink_cmp.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lua/mellifluous/highlights/plugins/blink_cmp.lua b/lua/mellifluous/highlights/plugins/blink_cmp.lua index de2024c..84309a8 100644 --- a/lua/mellifluous/highlights/plugins/blink_cmp.lua +++ b/lua/mellifluous/highlights/plugins/blink_cmp.lua @@ -12,7 +12,7 @@ function M.set(hl, colors) hl.set("BlinkCmpGhostText", { fg = hl.get("Comment").fg }) hl.set("BlinkCmpKind", { fg = hl.get("Type").fg }) hl.set("BlinkCmpKindText", { fg = hl.get("String").fg }) - hl.set("BlinkCmpKindMethod", { fg = hl.get("CmpItemKindFunction").fg }) + hl.set("BlinkCmpKindMethod", { fg = hl.get("Function").fg }) hl.set("BlinkCmpKindFunction", { fg = hl.get("Function").fg }) hl.set("BlinkCmpKindConstructor", { fg = hl.get("Function").fg }) hl.set("BlinkCmpKindField", { fg = hl.get("Identifier").fg }) @@ -20,16 +20,16 @@ function M.set(hl, colors) hl.set("BlinkCmpKindClass", { fg = hl.get("Type").fg }) hl.set("BlinkCmpKindInterface", { fg = hl.get("Type").fg }) hl.set("BlinkCmpKindModule", { fg = hl.get("Function").fg }) - hl.set("BlinkCmpKindProperty", { fg = hl.get("CmpItemKindField").fg }) - hl.set("BlinkCmpKindUnit", { fg = hl.get("CmpItemKindStruct").fg }) - hl.set("BlinkCmpKindValue", { fg = hl.get("CmpItemKindConstant").fg }) + hl.set("BlinkCmpKindProperty", { fg = hl.get("Identifier").fg }) + hl.set("BlinkCmpKindUnit", { fg = hl.get("Structure").fg }) + hl.set("BlinkCmpKindValue", { fg = hl.get("Constant").fg }) hl.set("BlinkCmpKindEnum", { fg = hl.get("Constant").fg }) hl.set("BlinkCmpKindKeyword", { fg = hl.get("Keyword").fg }) hl.set("BlinkCmpKindSnippet", { fg = hl.get("Special").fg }) hl.set("BlinkCmpKindColor", { fg = hl.get("Label").fg }) hl.set("BlinkCmpKindFile", { fg = hl.get("Directory").fg }) hl.set("BlinkCmpKindReference", { fg = hl.get("StorageClass").fg }) - hl.set("BlinkCmpKindFolder", { fg = hl.get("CmpItemKindFile").fg }) + hl.set("BlinkCmpKindFolder", { fg = hl.get("Directory").fg }) hl.set("BlinkCmpKindEnumMember", { fg = hl.get("Constant").fg }) hl.set("BlinkCmpKindConstant", { fg = hl.get("Constant").fg }) hl.set("BlinkCmpKindStruct", { fg = hl.get("Structure").fg }) From 75ece50957870a96e75ba35019a3125df12c15b4 Mon Sep 17 00:00:00 2001 From: Dmitry Poyarkov <14233263+Strash@users.noreply.github.com> Date: Mon, 25 Nov 2024 14:11:29 +0300 Subject: [PATCH 03/12] fix(highlights): blink_cmp --- lua/mellifluous/highlights/plugins/blink_cmp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/mellifluous/highlights/plugins/blink_cmp.lua b/lua/mellifluous/highlights/plugins/blink_cmp.lua index 84309a8..f35e2a8 100644 --- a/lua/mellifluous/highlights/plugins/blink_cmp.lua +++ b/lua/mellifluous/highlights/plugins/blink_cmp.lua @@ -9,7 +9,7 @@ function M.set(hl, colors) hl.set("BlinkCmpLabel", { fg = hl.get("Pmenu").fg }) hl.set("BlinkCmpLabelDeprecated", { fg = hl.get("Comment").fg }) hl.set("BlinkCmpLabelMatch", { fg = colors.fg }) - hl.set("BlinkCmpGhostText", { fg = hl.get("Comment").fg }) + hl.set("BlinkCmpGhostText", { fg = hl.get("NonText").fg }) hl.set("BlinkCmpKind", { fg = hl.get("Type").fg }) hl.set("BlinkCmpKindText", { fg = hl.get("String").fg }) hl.set("BlinkCmpKindMethod", { fg = hl.get("Function").fg }) From 8f9bd00a290518f5820129c12d758aed22a1eabd Mon Sep 17 00:00:00 2001 From: Dmitry Poyarkov <14233263+Strash@users.noreply.github.com> Date: Tue, 26 Nov 2024 04:19:32 +0300 Subject: [PATCH 04/12] feat(highlights): fzf lua --- lua/mellifluous/default_config.lua | 25 ++++++++-------- lua/mellifluous/highlights/plugins/fzf.lua | 34 ++++++++++++++++++++++ 2 files changed, 47 insertions(+), 12 deletions(-) create mode 100644 lua/mellifluous/highlights/plugins/fzf.lua diff --git a/lua/mellifluous/default_config.lua b/lua/mellifluous/default_config.lua index d447e24..b260efd 100644 --- a/lua/mellifluous/default_config.lua +++ b/lua/mellifluous/default_config.lua @@ -1,28 +1,29 @@ return { colorset = "mellifluous", plugins = { - cmp = true, + aerial = true, blink_cmp = true, + cmp = true, + fzf = true, + gitsigns = true, indent_blankline = true, - nvim_tree = { + lazy = true, + mason = true, + neo_tree = { enabled = true, - show_root = false, }, - neo_tree = { + neorg = true, + neotest = true, + nvim_notify = true, + nvim_tree = { enabled = true, + show_root = false, }, + startify = true, telescope = { enabled = true, nvchad_like = true, }, - startify = true, - gitsigns = true, - neorg = true, - nvim_notify = true, - aerial = true, - neotest = true, - lazy = true, - mason = true, }, dim_inactive = false, styles = { -- see :h attr-list for options. set {} for NONE, { option = true } for option diff --git a/lua/mellifluous/highlights/plugins/fzf.lua b/lua/mellifluous/highlights/plugins/fzf.lua new file mode 100644 index 0000000..b93cae4 --- /dev/null +++ b/lua/mellifluous/highlights/plugins/fzf.lua @@ -0,0 +1,34 @@ +local M = {} + +function M.set(hl, colors) + local normal = hl.get("Normal") + local normal_float = hl.get("NormalFloat") + + hl.set("FzfLuaNormal", { bg = colors.dark_bg, fg = normal_float.fg }) + hl.set("FzfLuaBorder", { bg = colors.dark_bg, fg = colors.dark_bg }) + hl.set("FzfLuaTitle", { fg = normal.fg }) + hl.set("FzfLuaBackdrop", { bg = normal.bg, fg = normal.fg }) + hl.set("FzfLuaPreviewNormal", { bg = normal.bg, fg = normal.fg }) + hl.set("FzfLuaPreviewBorder", { bg = normal.bg, fg = normal.bg }) + hl.set("FzfLuaPreviewTitle", { link = "FzfLuaTitle" }) + hl.set("FzfLuaCursorLine", { bg = colors.bg2 }) + hl.set("FzfLuaScrollBorderFull", { fg = colors.bg4 }) + hl.set("FzfLuaScrollBorderEmpty", { fg = colors.bg }) + hl.set("FzfLuaScrollFloatFull", { link = "FzfLuaScrollBorderFull" }) + hl.set("FzfLuaScrollFloatEmpty", { link = "FzfLuaScrollBorderEmpty" }) + hl.set("FzfLuaHeaderBind", { fg = colors.ui_purple }) + hl.set("FzfLuaHeaderText", { fg = colors.fg2 }) + hl.set("FzfLuaPathLineNr", { fg = colors.fg4 }) + hl.set("FzfLuaPathColNr", { fg = colors.fg4 }) + hl.set("FzfLuaBufName", { fg = colors.ui_yellow }) + hl.set("FzfLuaBufNr", { fg = colors.fg4 }) + hl.set("FzfLuaBufFlagCur", { fg = colors.fg }) + hl.set("FzfLuaBufFlagAlt", { fg = colors.fg2 }) + hl.set("FzfLuaTabTitle", { link = "FzfLuaTitle" }) + hl.set("FzfLuaTabMarker", { fg = colors.fg2 }) + hl.set("FzfLuaLiveSym", { fg = colors.ui_green }) + hl.set("FzfLuaFzfMatch", { fg = colors.ui_green }) + hl.set("FzfLuaFzfGutter", { fg = colors.bg, bg = colors.bg }) +end + +return M From b8a3a49b0735a816b50cfd28fa20b07b31967f0c Mon Sep 17 00:00:00 2001 From: Dmitry Poyarkov <14233263+Strash@users.noreply.github.com> Date: Tue, 26 Nov 2024 14:31:40 +0300 Subject: [PATCH 05/12] update(highlights): fzf lua --- lua/mellifluous/highlights/plugins/fzf.lua | 27 +++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/lua/mellifluous/highlights/plugins/fzf.lua b/lua/mellifluous/highlights/plugins/fzf.lua index b93cae4..6d6e1a6 100644 --- a/lua/mellifluous/highlights/plugins/fzf.lua +++ b/lua/mellifluous/highlights/plugins/fzf.lua @@ -2,33 +2,38 @@ local M = {} function M.set(hl, colors) local normal = hl.get("Normal") - local normal_float = hl.get("NormalFloat") - hl.set("FzfLuaNormal", { bg = colors.dark_bg, fg = normal_float.fg }) + hl.set("FzfLuaNormal", { bg = colors.dark_bg, fg = colors.fg3 }) hl.set("FzfLuaBorder", { bg = colors.dark_bg, fg = colors.dark_bg }) hl.set("FzfLuaTitle", { fg = normal.fg }) hl.set("FzfLuaBackdrop", { bg = normal.bg, fg = normal.fg }) hl.set("FzfLuaPreviewNormal", { bg = normal.bg, fg = normal.fg }) hl.set("FzfLuaPreviewBorder", { bg = normal.bg, fg = normal.bg }) hl.set("FzfLuaPreviewTitle", { link = "FzfLuaTitle" }) - hl.set("FzfLuaCursorLine", { bg = colors.bg2 }) + hl.set("FzfLuaCursorLine", { bg = colors.bg2, fg = colors.fg2 }) hl.set("FzfLuaScrollBorderFull", { fg = colors.bg4 }) hl.set("FzfLuaScrollBorderEmpty", { fg = colors.bg }) hl.set("FzfLuaScrollFloatFull", { link = "FzfLuaScrollBorderFull" }) hl.set("FzfLuaScrollFloatEmpty", { link = "FzfLuaScrollBorderEmpty" }) hl.set("FzfLuaHeaderBind", { fg = colors.ui_purple }) - hl.set("FzfLuaHeaderText", { fg = colors.fg2 }) + hl.set("FzfLuaHeaderText", { fg = colors.fg4 }) hl.set("FzfLuaPathLineNr", { fg = colors.fg4 }) hl.set("FzfLuaPathColNr", { fg = colors.fg4 }) - hl.set("FzfLuaBufName", { fg = colors.ui_yellow }) + hl.set("FzfLuaBufName", { fg = colors.ui_orange }) hl.set("FzfLuaBufNr", { fg = colors.fg4 }) - hl.set("FzfLuaBufFlagCur", { fg = colors.fg }) - hl.set("FzfLuaBufFlagAlt", { fg = colors.fg2 }) + hl.set("FzfLuaBufFlagCur", { fg = colors.ui_purple }) + hl.set("FzfLuaBufFlagAlt", { fg = colors.ui_green }) hl.set("FzfLuaTabTitle", { link = "FzfLuaTitle" }) - hl.set("FzfLuaTabMarker", { fg = colors.fg2 }) - hl.set("FzfLuaLiveSym", { fg = colors.ui_green }) - hl.set("FzfLuaFzfMatch", { fg = colors.ui_green }) - hl.set("FzfLuaFzfGutter", { fg = colors.bg, bg = colors.bg }) + hl.set("FzfLuaTabMarker", { fg = colors.ui_purple }) + hl.set("FzfLuaLiveSym", { fg = colors.fg }) + hl.set("FzfLuaFzfMatch", { fg = colors.fg }) + hl.set("FzfLuaFzfScrollbar", { fg = colors.fg4 }) + hl.set("FzfLuaFzfSeparator", { fg = colors.ui_yellow }) + hl.set("FzfLuaFzfGutter", { bg = colors.dark_bg }) + hl.set("FzfLuaFzfPointer", { fg = colors.fg4 }) + hl.set("FzfLuaFzfMarker", { fg = colors.ui_orange }) + hl.set("FzfLuaFzfPrompt", { fg = colors.fg4 }) + hl.set("FzfLuaFzfQuery", { fg = colors.fg }) end return M From ed7cd13845453fa8b3fbb1bf9ccb03ac4ec08676 Mon Sep 17 00:00:00 2001 From: Dmitry Poyarkov <14233263+Strash@users.noreply.github.com> Date: Tue, 26 Nov 2024 14:47:00 +0300 Subject: [PATCH 06/12] update(highlights): fzf lua --- lua/mellifluous/highlights/plugins/fzf.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/mellifluous/highlights/plugins/fzf.lua b/lua/mellifluous/highlights/plugins/fzf.lua index 6d6e1a6..7fa7e29 100644 --- a/lua/mellifluous/highlights/plugins/fzf.lua +++ b/lua/mellifluous/highlights/plugins/fzf.lua @@ -28,7 +28,7 @@ function M.set(hl, colors) hl.set("FzfLuaLiveSym", { fg = colors.fg }) hl.set("FzfLuaFzfMatch", { fg = colors.fg }) hl.set("FzfLuaFzfScrollbar", { fg = colors.fg4 }) - hl.set("FzfLuaFzfSeparator", { fg = colors.ui_yellow }) + hl.set("FzfLuaFzfSeparator", { fg = colors.dark_bg }) hl.set("FzfLuaFzfGutter", { bg = colors.dark_bg }) hl.set("FzfLuaFzfPointer", { fg = colors.fg4 }) hl.set("FzfLuaFzfMarker", { fg = colors.ui_orange }) From 24c7def6745cd39644a9756832a58f07478a2977 Mon Sep 17 00:00:00 2001 From: Dmitry Poyarkov <14233263+Strash@users.noreply.github.com> Date: Sun, 1 Dec 2024 16:34:23 +0300 Subject: [PATCH 07/12] update(highlights): blink.cmp --- README.md | 1 + .../highlights/plugins/blink_cmp.lua | 70 +++++++++++-------- 2 files changed, 42 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 1d30d8a..1d7d6b6 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ A colorscheme for [Neovim](https://github.com/neovim/neovim). Pleasant and produ - [NvimTree](https://github.com/kyazdani42/nvim-tree.lua) - [Neo-Tree](https://github.com/nvim-neo-tree/neo-tree.nvim) - [Nvim-cmp](https://github.com/hrsh7th/nvim-cmp) +- [Blink.cmp](https://github.com/Saghen/blink.cmp) - [Indent Blankline](https://github.com/lukas-reineke/indent-blankline.nvim) - [Startify](https://github.com/mhinz/vim-startify) - [Gitsigns](https://github.com/lewis6991/gitsigns.nvim) diff --git a/lua/mellifluous/highlights/plugins/blink_cmp.lua b/lua/mellifluous/highlights/plugins/blink_cmp.lua index f35e2a8..57b43a4 100644 --- a/lua/mellifluous/highlights/plugins/blink_cmp.lua +++ b/lua/mellifluous/highlights/plugins/blink_cmp.lua @@ -1,46 +1,58 @@ local M = {} function M.set(hl, colors) - hl.set("BlinkCmpMenu", { bg = hl.get("Pmenu").bg }) - hl.set("BlinkCmpMenuBorder", { bg = hl.get("Pmenu").bg }) - hl.set("BlinkCmpMenuSelection", { bg = hl.get("PmenuSel").bg, fg = hl.get("PmenuSel").fg }) + local shader = require("mellifluous.utils.shader") + + local pmenu = hl.get("Pmenu") + local type = hl.get("Type") + local func = hl.get("Function") + local id = hl.get("Identifier") + local struct = hl.get("Structure") + local const = hl.get("Constant") + local pmenu_sel = hl.get("PmenuSel") + local dir = hl.get("Directory") + local normal_float = hl.get("NormalFloat") + + hl.set("BlinkCmpMenu", { bg = pmenu.bg }) + hl.set("BlinkCmpMenuBorder", { bg = pmenu.bg }) + hl.set("BlinkCmpMenuSelection", { bg = pmenu_sel.bg, fg = pmenu_sel.fg }) hl.set("BlinkCmpScrollBarThumb", { fg = hl.get("PmenuThumb").fg }) hl.set("BlinkCmpScrollBarGutter", { fg = hl.get("PmenuSbar").fg }) - hl.set("BlinkCmpLabel", { fg = hl.get("Pmenu").fg }) - hl.set("BlinkCmpLabelDeprecated", { fg = hl.get("Comment").fg }) + hl.set("BlinkCmpLabel", { fg = pmenu.fg }) + hl.set("BlinkCmpLabelDeprecated", { fg = pmenu.fg, style = { strikethrough = true } }) hl.set("BlinkCmpLabelMatch", { fg = colors.fg }) hl.set("BlinkCmpGhostText", { fg = hl.get("NonText").fg }) - hl.set("BlinkCmpKind", { fg = hl.get("Type").fg }) + hl.set("BlinkCmpKind", { fg = type.fg }) hl.set("BlinkCmpKindText", { fg = hl.get("String").fg }) - hl.set("BlinkCmpKindMethod", { fg = hl.get("Function").fg }) - hl.set("BlinkCmpKindFunction", { fg = hl.get("Function").fg }) - hl.set("BlinkCmpKindConstructor", { fg = hl.get("Function").fg }) - hl.set("BlinkCmpKindField", { fg = hl.get("Identifier").fg }) - hl.set("BlinkCmpKindVariable", { fg = hl.get("Identifier").fg }) - hl.set("BlinkCmpKindClass", { fg = hl.get("Type").fg }) - hl.set("BlinkCmpKindInterface", { fg = hl.get("Type").fg }) - hl.set("BlinkCmpKindModule", { fg = hl.get("Function").fg }) - hl.set("BlinkCmpKindProperty", { fg = hl.get("Identifier").fg }) - hl.set("BlinkCmpKindUnit", { fg = hl.get("Structure").fg }) - hl.set("BlinkCmpKindValue", { fg = hl.get("Constant").fg }) - hl.set("BlinkCmpKindEnum", { fg = hl.get("Constant").fg }) + hl.set("BlinkCmpKindMethod", { fg = func.fg }) + hl.set("BlinkCmpKindFunction", { fg = func.fg }) + hl.set("BlinkCmpKindConstructor", { fg = func.fg }) + hl.set("BlinkCmpKindField", { fg = id.fg }) + hl.set("BlinkCmpKindVariable", { fg = id.fg }) + hl.set("BlinkCmpKindClass", { fg = type.fg }) + hl.set("BlinkCmpKindInterface", { fg = type.fg }) + hl.set("BlinkCmpKindModule", { fg = func.fg }) + hl.set("BlinkCmpKindProperty", { fg = id.fg }) + hl.set("BlinkCmpKindUnit", { fg = struct.fg }) + hl.set("BlinkCmpKindValue", { fg = const.fg }) + hl.set("BlinkCmpKindEnum", { fg = const.fg }) hl.set("BlinkCmpKindKeyword", { fg = hl.get("Keyword").fg }) hl.set("BlinkCmpKindSnippet", { fg = hl.get("Special").fg }) hl.set("BlinkCmpKindColor", { fg = hl.get("Label").fg }) - hl.set("BlinkCmpKindFile", { fg = hl.get("Directory").fg }) + hl.set("BlinkCmpKindFile", { fg = dir.fg }) hl.set("BlinkCmpKindReference", { fg = hl.get("StorageClass").fg }) - hl.set("BlinkCmpKindFolder", { fg = hl.get("Directory").fg }) - hl.set("BlinkCmpKindEnumMember", { fg = hl.get("Constant").fg }) - hl.set("BlinkCmpKindConstant", { fg = hl.get("Constant").fg }) - hl.set("BlinkCmpKindStruct", { fg = hl.get("Structure").fg }) + hl.set("BlinkCmpKindFolder", { fg = dir.fg }) + hl.set("BlinkCmpKindEnumMember", { fg = const.fg }) + hl.set("BlinkCmpKindConstant", { fg = const.fg }) + hl.set("BlinkCmpKindStruct", { fg = struct.fg }) hl.set("BlinkCmpKindEvent", { fg = hl.get("Repeat").fg }) hl.set("BlinkCmpKindOperator", { fg = hl.get("Operator").fg }) - hl.set("BlinkCmpKindTypeParameter", { fg = hl.get("Type").fg }) - hl.set("BlinkCmpDoc", { bg = hl.get("NormalFloat").bg }) - hl.set("BlinkCmpDocBorder", { bg = hl.get("NormalFloat").bg }) - hl.set("BlinkCmpDocCursorLine", { bg = hl.get("Visual").bg }) - hl.set("BlinkCmpSignatureHelp", { bg = hl.get("NormalFloat").bg }) - hl.set("BlinkCmpSignatureHelpBorder", { bg = hl.get("NormalFloat").bg }) + hl.set("BlinkCmpKindTypeParameter", { fg = type.fg }) + hl.set("BlinkCmpDoc", { bg = normal_float.bg }) + hl.set("BlinkCmpDocBorder", { link = "FloatBorder" }) + hl.set("BlinkCmpDocCursorLine", { bg = shader.replicate_shade(colors.bg, hl.get("CursorLine").bg, normal_float.bg) }) + hl.set("BlinkCmpSignatureHelp", { bg = normal_float.bg }) + hl.set("BlinkCmpSignatureHelpBorder", { bg = normal_float.bg }) hl.set("BlinkCmpSignatureHelpActiveParameter", { bg = hl.get("LspSignatureActiveParameter").bg }) end From 9bebdbf8a647c975ed69da1eab3cfd6917cc8b2d Mon Sep 17 00:00:00 2001 From: Dmitry Poyarkov <14233263+Strash@users.noreply.github.com> Date: Sun, 1 Dec 2024 16:51:23 +0300 Subject: [PATCH 08/12] update(README): add fzf lua --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1d7d6b6..7b42500 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ A colorscheme for [Neovim](https://github.com/neovim/neovim). Pleasant and produ - [Treesitter](https://github.com/nvim-treesitter/nvim-treesitter) - [Native LSP](https://github.com/neovim/nvim-lspconfig) - [Telescope](https://github.com/nvim-telescope/telescope.nvim) +- [Fzf-lua](https://github.com/ibhagwan/fzf-lua) - [NvimTree](https://github.com/kyazdani42/nvim-tree.lua) - [Neo-Tree](https://github.com/nvim-neo-tree/neo-tree.nvim) - [Nvim-cmp](https://github.com/hrsh7th/nvim-cmp) From f2e0b306d0c7d8ce8011b68e92e8def6d5561cc2 Mon Sep 17 00:00:00 2001 From: Dmitry Poyarkov <14233263+Strash@users.noreply.github.com> Date: Tue, 3 Dec 2024 00:08:54 +0300 Subject: [PATCH 09/12] feat(highlights): blink_cmp. add new highlight --- lua/mellifluous/highlights/plugins/blink_cmp.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lua/mellifluous/highlights/plugins/blink_cmp.lua b/lua/mellifluous/highlights/plugins/blink_cmp.lua index 57b43a4..a182781 100644 --- a/lua/mellifluous/highlights/plugins/blink_cmp.lua +++ b/lua/mellifluous/highlights/plugins/blink_cmp.lua @@ -12,6 +12,7 @@ function M.set(hl, colors) local pmenu_sel = hl.get("PmenuSel") local dir = hl.get("Directory") local normal_float = hl.get("NormalFloat") + local non_text = hl.get("NonText") hl.set("BlinkCmpMenu", { bg = pmenu.bg }) hl.set("BlinkCmpMenuBorder", { bg = pmenu.bg }) @@ -21,7 +22,7 @@ function M.set(hl, colors) hl.set("BlinkCmpLabel", { fg = pmenu.fg }) hl.set("BlinkCmpLabelDeprecated", { fg = pmenu.fg, style = { strikethrough = true } }) hl.set("BlinkCmpLabelMatch", { fg = colors.fg }) - hl.set("BlinkCmpGhostText", { fg = hl.get("NonText").fg }) + hl.set("BlinkCmpGhostText", { fg = non_text.fg }) hl.set("BlinkCmpKind", { fg = type.fg }) hl.set("BlinkCmpKindText", { fg = hl.get("String").fg }) hl.set("BlinkCmpKindMethod", { fg = func.fg }) @@ -48,6 +49,7 @@ function M.set(hl, colors) hl.set("BlinkCmpKindEvent", { fg = hl.get("Repeat").fg }) hl.set("BlinkCmpKindOperator", { fg = hl.get("Operator").fg }) hl.set("BlinkCmpKindTypeParameter", { fg = type.fg }) + hl.set("BlinkCmpSource", { fg = non_text.fg }) hl.set("BlinkCmpDoc", { bg = normal_float.bg }) hl.set("BlinkCmpDocBorder", { link = "FloatBorder" }) hl.set("BlinkCmpDocCursorLine", { bg = shader.replicate_shade(colors.bg, hl.get("CursorLine").bg, normal_float.bg) }) From 82af4f00eb790454bb41ddc9c440e5c17819cddd Mon Sep 17 00:00:00 2001 From: Dmitry Poyarkov <14233263+Strash@users.noreply.github.com> Date: Sat, 7 Dec 2024 02:12:13 +0300 Subject: [PATCH 10/12] fix(highlights): revert FzfLuaBackdrop hl --- lua/mellifluous/highlights/plugins/fzf.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/mellifluous/highlights/plugins/fzf.lua b/lua/mellifluous/highlights/plugins/fzf.lua index 7fa7e29..0a4fe7b 100644 --- a/lua/mellifluous/highlights/plugins/fzf.lua +++ b/lua/mellifluous/highlights/plugins/fzf.lua @@ -6,7 +6,6 @@ function M.set(hl, colors) hl.set("FzfLuaNormal", { bg = colors.dark_bg, fg = colors.fg3 }) hl.set("FzfLuaBorder", { bg = colors.dark_bg, fg = colors.dark_bg }) hl.set("FzfLuaTitle", { fg = normal.fg }) - hl.set("FzfLuaBackdrop", { bg = normal.bg, fg = normal.fg }) hl.set("FzfLuaPreviewNormal", { bg = normal.bg, fg = normal.fg }) hl.set("FzfLuaPreviewBorder", { bg = normal.bg, fg = normal.bg }) hl.set("FzfLuaPreviewTitle", { link = "FzfLuaTitle" }) From a555a3da18898ec043c5e06ae8f023aa7f7736d5 Mon Sep 17 00:00:00 2001 From: Dmitry Poyarkov <14233263+Strash@users.noreply.github.com> Date: Sun, 8 Dec 2024 03:28:52 +0300 Subject: [PATCH 11/12] refactoring(highlights): blink and fzf --- .../highlights/plugins/blink_cmp.lua | 76 +++++++++---------- lua/mellifluous/highlights/plugins/fzf.lua | 8 +- 2 files changed, 38 insertions(+), 46 deletions(-) diff --git a/lua/mellifluous/highlights/plugins/blink_cmp.lua b/lua/mellifluous/highlights/plugins/blink_cmp.lua index a182781..8f65fe0 100644 --- a/lua/mellifluous/highlights/plugins/blink_cmp.lua +++ b/lua/mellifluous/highlights/plugins/blink_cmp.lua @@ -3,58 +3,52 @@ local M = {} function M.set(hl, colors) local shader = require("mellifluous.utils.shader") - local pmenu = hl.get("Pmenu") - local type = hl.get("Type") - local func = hl.get("Function") - local id = hl.get("Identifier") - local struct = hl.get("Structure") - local const = hl.get("Constant") - local pmenu_sel = hl.get("PmenuSel") - local dir = hl.get("Directory") - local normal_float = hl.get("NormalFloat") - local non_text = hl.get("NonText") - - hl.set("BlinkCmpMenu", { bg = pmenu.bg }) - hl.set("BlinkCmpMenuBorder", { bg = pmenu.bg }) - hl.set("BlinkCmpMenuSelection", { bg = pmenu_sel.bg, fg = pmenu_sel.fg }) + hl.set("BlinkCmpMenu", { bg = hl.get("Pmenu").bg }) + hl.set("BlinkCmpMenuBorder", { bg = hl.get("Pmenu").bg }) + hl.set("BlinkCmpMenuSelection", { bg = hl.get("PmenuSel").bg, fg = hl.get("PmenuSel").fg }) hl.set("BlinkCmpScrollBarThumb", { fg = hl.get("PmenuThumb").fg }) hl.set("BlinkCmpScrollBarGutter", { fg = hl.get("PmenuSbar").fg }) - hl.set("BlinkCmpLabel", { fg = pmenu.fg }) - hl.set("BlinkCmpLabelDeprecated", { fg = pmenu.fg, style = { strikethrough = true } }) + hl.set("BlinkCmpLabel", { fg = hl.get("Pmenu").fg }) + hl.set("BlinkCmpLabelDeprecated", { fg = hl.get("Pmenu").fg, style = { strikethrough = true } }) hl.set("BlinkCmpLabelMatch", { fg = colors.fg }) - hl.set("BlinkCmpGhostText", { fg = non_text.fg }) - hl.set("BlinkCmpKind", { fg = type.fg }) + hl.set("BlinkCmpGhostText", { fg = hl.get("NonText").fg }) + hl.set("BlinkCmpKind", { fg = hl.get("Type").fg }) hl.set("BlinkCmpKindText", { fg = hl.get("String").fg }) - hl.set("BlinkCmpKindMethod", { fg = func.fg }) - hl.set("BlinkCmpKindFunction", { fg = func.fg }) - hl.set("BlinkCmpKindConstructor", { fg = func.fg }) - hl.set("BlinkCmpKindField", { fg = id.fg }) - hl.set("BlinkCmpKindVariable", { fg = id.fg }) - hl.set("BlinkCmpKindClass", { fg = type.fg }) - hl.set("BlinkCmpKindInterface", { fg = type.fg }) - hl.set("BlinkCmpKindModule", { fg = func.fg }) - hl.set("BlinkCmpKindProperty", { fg = id.fg }) - hl.set("BlinkCmpKindUnit", { fg = struct.fg }) - hl.set("BlinkCmpKindValue", { fg = const.fg }) - hl.set("BlinkCmpKindEnum", { fg = const.fg }) + hl.set("BlinkCmpKindMethod", { fg = hl.get("Function").fg }) + hl.set("BlinkCmpKindFunction", { fg = hl.get("Function").fg }) + hl.set("BlinkCmpKindConstructor", { fg = hl.get("Function").fg }) + hl.set("BlinkCmpKindField", { fg = hl.get("Identifier").fg }) + hl.set("BlinkCmpKindVariable", { fg = hl.get("Identifier").fg }) + hl.set("BlinkCmpKindClass", { fg = hl.get("Type").fg }) + hl.set("BlinkCmpKindInterface", { fg = hl.get("Type").fg }) + hl.set("BlinkCmpKindModule", { fg = hl.get("Function").fg }) + hl.set("BlinkCmpKindProperty", { fg = hl.get("Identifier").fg }) + hl.set("BlinkCmpKindUnit", { fg = hl.get("Structure").fg }) + hl.set("BlinkCmpKindValue", { fg = hl.get("Constant").fg }) + hl.set("BlinkCmpKindEnum", { fg = hl.get("Constant").fg }) hl.set("BlinkCmpKindKeyword", { fg = hl.get("Keyword").fg }) hl.set("BlinkCmpKindSnippet", { fg = hl.get("Special").fg }) hl.set("BlinkCmpKindColor", { fg = hl.get("Label").fg }) - hl.set("BlinkCmpKindFile", { fg = dir.fg }) + hl.set("BlinkCmpKindFile", { fg = hl.get("Directory").fg }) hl.set("BlinkCmpKindReference", { fg = hl.get("StorageClass").fg }) - hl.set("BlinkCmpKindFolder", { fg = dir.fg }) - hl.set("BlinkCmpKindEnumMember", { fg = const.fg }) - hl.set("BlinkCmpKindConstant", { fg = const.fg }) - hl.set("BlinkCmpKindStruct", { fg = struct.fg }) + hl.set("BlinkCmpKindFolder", { fg = hl.get("Directory").fg }) + hl.set("BlinkCmpKindEnumMember", { fg = hl.get("Constant").fg }) + hl.set("BlinkCmpKindConstant", { fg = hl.get("Constant").fg }) + hl.set("BlinkCmpKindStruct", { fg = hl.get("Structure").fg }) hl.set("BlinkCmpKindEvent", { fg = hl.get("Repeat").fg }) hl.set("BlinkCmpKindOperator", { fg = hl.get("Operator").fg }) - hl.set("BlinkCmpKindTypeParameter", { fg = type.fg }) - hl.set("BlinkCmpSource", { fg = non_text.fg }) - hl.set("BlinkCmpDoc", { bg = normal_float.bg }) + hl.set("BlinkCmpKindTypeParameter", { fg = hl.get("Type").fg }) + hl.set("BlinkCmpSource", { fg = hl.get("NonText").fg }) + hl.set("BlinkCmpDoc", { bg = hl.get("NormalFloat").bg }) hl.set("BlinkCmpDocBorder", { link = "FloatBorder" }) - hl.set("BlinkCmpDocCursorLine", { bg = shader.replicate_shade(colors.bg, hl.get("CursorLine").bg, normal_float.bg) }) - hl.set("BlinkCmpSignatureHelp", { bg = normal_float.bg }) - hl.set("BlinkCmpSignatureHelpBorder", { bg = normal_float.bg }) + hl.set("BlinkCmpDocCursorLine", { + bg = shader.replicate_shade( + colors.bg, + hl.get("CursorLine").bg, + hl.get("NormalFloat").bg) + }) + hl.set("BlinkCmpSignatureHelp", { bg = hl.get("NormalFloat").bg }) + hl.set("BlinkCmpSignatureHelpBorder", { bg = hl.get("NormalFloat").bg }) hl.set("BlinkCmpSignatureHelpActiveParameter", { bg = hl.get("LspSignatureActiveParameter").bg }) end diff --git a/lua/mellifluous/highlights/plugins/fzf.lua b/lua/mellifluous/highlights/plugins/fzf.lua index 0a4fe7b..8a1bbe5 100644 --- a/lua/mellifluous/highlights/plugins/fzf.lua +++ b/lua/mellifluous/highlights/plugins/fzf.lua @@ -1,13 +1,11 @@ local M = {} function M.set(hl, colors) - local normal = hl.get("Normal") - hl.set("FzfLuaNormal", { bg = colors.dark_bg, fg = colors.fg3 }) hl.set("FzfLuaBorder", { bg = colors.dark_bg, fg = colors.dark_bg }) - hl.set("FzfLuaTitle", { fg = normal.fg }) - hl.set("FzfLuaPreviewNormal", { bg = normal.bg, fg = normal.fg }) - hl.set("FzfLuaPreviewBorder", { bg = normal.bg, fg = normal.bg }) + hl.set("FzfLuaTitle", { fg = hl.get("Normal").fg }) + hl.set("FzfLuaPreviewNormal", { bg = hl.get("Normal").bg, fg = hl.get("Normal").fg }) + hl.set("FzfLuaPreviewBorder", { bg = hl.get("Normal").bg, fg = hl.get("Normal").bg }) hl.set("FzfLuaPreviewTitle", { link = "FzfLuaTitle" }) hl.set("FzfLuaCursorLine", { bg = colors.bg2, fg = colors.fg2 }) hl.set("FzfLuaScrollBorderFull", { fg = colors.bg4 }) From 2e8617a2ebab031b69c5c9896f3a71e358b15896 Mon Sep 17 00:00:00 2001 From: Dmitry Poyarkov <14233263+Strash@users.noreply.github.com> Date: Sat, 14 Dec 2024 23:55:17 +0300 Subject: [PATCH 12/12] fix(highlights): fzf lua --- lua/mellifluous/highlights/plugins/fzf.lua | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lua/mellifluous/highlights/plugins/fzf.lua b/lua/mellifluous/highlights/plugins/fzf.lua index 8a1bbe5..baa300e 100644 --- a/lua/mellifluous/highlights/plugins/fzf.lua +++ b/lua/mellifluous/highlights/plugins/fzf.lua @@ -1,13 +1,15 @@ local M = {} function M.set(hl, colors) + local normal = hl.get("Normal") + hl.set("FzfLuaNormal", { bg = colors.dark_bg, fg = colors.fg3 }) hl.set("FzfLuaBorder", { bg = colors.dark_bg, fg = colors.dark_bg }) - hl.set("FzfLuaTitle", { fg = hl.get("Normal").fg }) - hl.set("FzfLuaPreviewNormal", { bg = hl.get("Normal").bg, fg = hl.get("Normal").fg }) - hl.set("FzfLuaPreviewBorder", { bg = hl.get("Normal").bg, fg = hl.get("Normal").bg }) - hl.set("FzfLuaPreviewTitle", { link = "FzfLuaTitle" }) - hl.set("FzfLuaCursorLine", { bg = colors.bg2, fg = colors.fg2 }) + hl.set("FzfLuaTitle", { bg = colors.dark_bg, fg = normal.fg, style = { bold = true } }) + hl.set("FzfLuaPreviewNormal", { bg = normal.bg, fg = normal.fg }) + hl.set("FzfLuaPreviewBorder", { bg = normal.bg, fg = normal.bg }) + hl.set("FzfLuaPreviewTitle", { bg = normal.bg, fg = normal.fg, style = { bold = true } }) + hl.set("FzfLuaCursorLineNr", { fg = colors.fg4 }) hl.set("FzfLuaScrollBorderFull", { fg = colors.bg4 }) hl.set("FzfLuaScrollBorderEmpty", { fg = colors.bg }) hl.set("FzfLuaScrollFloatFull", { link = "FzfLuaScrollBorderFull" }) @@ -23,11 +25,13 @@ function M.set(hl, colors) hl.set("FzfLuaTabTitle", { link = "FzfLuaTitle" }) hl.set("FzfLuaTabMarker", { fg = colors.ui_purple }) hl.set("FzfLuaLiveSym", { fg = colors.fg }) + hl.set("FzfLuaFzfHeader", { fg = colors.fg4 }) hl.set("FzfLuaFzfMatch", { fg = colors.fg }) hl.set("FzfLuaFzfScrollbar", { fg = colors.fg4 }) hl.set("FzfLuaFzfSeparator", { fg = colors.dark_bg }) hl.set("FzfLuaFzfGutter", { bg = colors.dark_bg }) - hl.set("FzfLuaFzfPointer", { fg = colors.fg4 }) + hl.set("FzfLuaFzfPointer", { fg = colors.fg4, style = { bold = false, nocombine = true } }) + hl.set("FzfLuaFzfCursorLine", { fg = colors.fg, bg = colors.bg4, style = { bold = false, nocombine = true } }) hl.set("FzfLuaFzfMarker", { fg = colors.ui_orange }) hl.set("FzfLuaFzfPrompt", { fg = colors.fg4 }) hl.set("FzfLuaFzfQuery", { fg = colors.fg })