From 7d0006b429776b8fec11b38900219e7c4454fe86 Mon Sep 17 00:00:00 2001 From: vividsystem Date: Fri, 19 May 2023 23:01:32 +0200 Subject: [PATCH 1/4] feat: nvim-navic support --- fnl/oxocarbon/init.fnl | 29 +++++++++++++++++++++++++++++ lua/oxocarbon/init.lua | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/fnl/oxocarbon/init.fnl b/fnl/oxocarbon/init.fnl index c2cfb28..6094540 100644 --- a/fnl/oxocarbon/init.fnl +++ b/fnl/oxocarbon/init.fnl @@ -612,4 +612,33 @@ (custom-set-face! :VimwikiLink [] {:link "markdownUrl"}) (custom-set-face! :VimwikiCode [] {:link "markdownCode"}) +(custom-set-face! :NavicIconsFile [] {:fg oxocarbon.base14 :bg oxocarbon.none }) +(custom-set-face! :NavicIconsModule [] {:fg oxocarbon.base11 :bg oxocarbon.none }) +(custom-set-face! :NavicIconsNamespace [] {:fg oxocarbon.base07 :bg oxocarbon.none }) +(custom-set-face! :NavicIconsClass [] {:fg oxocarbon.base11 :bg oxocarbon.none}) +(custom-set-face! :NavicIconsMethod [] {:fg oxocarbon.base14 :bg oxocarbon.none}) +(custom-set-face! :NavicIconsProperty [] {:fg oxocarbon.base12 :bg oxocarbon.none}) +(custom-set-face! :NavicIconsField [] {:fg oxocarbon.base12 :bg oxocarbon.none}) +(custom-set-face! :NavicIconsConstructor [] {:fg oxocarbon.base10 :bg oxocarbon.none}) +(custom-set-face! :NavicIconsEnum [] {:fg oxocarbon.base09 :bg oxocarbon.none}) +(custom-set-face! :NavicIconsInterface [] {:fg oxocarbon.base08 :bg oxocarbon.none}) +(custom-set-face! :NavicIconsFunction [] {:fg oxocarbon.base11 :bg oxocarbon.none}) +(custom-set-face! :NavicIconsVariable [] {:fg oxocarbon.base14 :bg oxocarbon.none}) +(custom-set-face! :NavicIconsConstant [] {:fg oxocarbon.base10 :bg oxocarbon.none}) +(custom-set-face! :NavicIconsString [] {:fg oxocarbon.base14 :bg oxocarbon.none}) +(custom-set-face! :NavicIconsNumber [] {:fg oxocarbon.base15 :bg oxocarbon.none}) +(custom-set-face! :NavicIconsBoolean [] {:fg oxocarbon.base09 :bg oxocarbon.none}) +(custom-set-face! :NavicIconsEnumMember [] {:fg oxocarbon.base15}) +(custom-set-face! :NavicIconsStruct [] {:fg oxocarbon.base11}) +(custom-set-face! :NavicIconsOperator [] {:fg oxocarbon.base11 :bg oxocarbon.none}) +(custom-set-face! :NavicIconsTypeParameter [] {:fg oxocarbon.base04 :bg oxocarbon.none}) +(custom-set-face! :NavicIconsArray [] {}) +(custom-set-face! :NavicIconsObject [] {}) +(custom-set-face! :NavicIconsKey [] {}) +(custom-set-face! :NavicIconsNull [] {}) +(custom-set-face! :NavicText [] {}) +(custom-set-face! :NavicSeperator [] {}) +(custom-set-face! :NavicIconsPackage [] {}) +(custom-set-face! :NavicIconsEvent [] {}) + { : oxocarbon } diff --git a/lua/oxocarbon/init.lua b/lua/oxocarbon/init.lua index 5450f0d..dc4ad38 100644 --- a/lua/oxocarbon/init.lua +++ b/lua/oxocarbon/init.lua @@ -61,6 +61,15 @@ vim.api.nvim_set_hl(0, "DiagnosticUnderlineHint", {fg = oxocarbon.base04, bg = o vim.api.nvim_set_hl(0, "HealthError", {fg = oxocarbon.base10, bg = oxocarbon.none}) vim.api.nvim_set_hl(0, "HealthWarning", {fg = oxocarbon.base14, bg = oxocarbon.none}) vim.api.nvim_set_hl(0, "HealthSuccess", {fg = oxocarbon.base13, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "@comment", {link = "Comment"}) +vim.api.nvim_set_hl(0, "@text.literal.commodity", {fg = oxocarbon.base13, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "@number", {fg = oxocarbon.base09, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "@number.date", {fg = oxocarbon.base08, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "@number.date.effective", {fg = oxocarbon.base13, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "@number.interval", {fg = oxocarbon.base09, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "@number.status", {fg = oxocarbon.base12, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "@number.quantity", {fg = oxocarbon.base11, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "@number.quantity.negative", {fg = oxocarbon.base10, bg = oxocarbon.none}) vim.api.nvim_set_hl(0, "LspReferenceText", {fg = oxocarbon.none, bg = oxocarbon.base03}) vim.api.nvim_set_hl(0, "LspReferenceread", {fg = oxocarbon.none, bg = oxocarbon.base03}) vim.api.nvim_set_hl(0, "LspReferenceWrite", {fg = oxocarbon.none, bg = oxocarbon.base03}) @@ -312,4 +321,32 @@ vim.api.nvim_set_hl(0, "VimwikiHeaderChar", {link = "markdownH1"}) vim.api.nvim_set_hl(0, "VimwikiList", {link = "markdownListMarker"}) vim.api.nvim_set_hl(0, "VimwikiLink", {link = "markdownUrl"}) vim.api.nvim_set_hl(0, "VimwikiCode", {link = "markdownCode"}) +vim.api.nvim_set_hl(0, "NavicIconsFile", {fg = oxocarbon.base14, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicIconsModule", {fg = oxocarbon.base11, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicIconsNamespace", {fg = oxocarbon.base07, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicIconsClass", {fg = oxocarbon.base11, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicIconsMethod", {fg = oxocarbon.base14, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicIconsProperty", {fg = oxocarbon.base12, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicIconsField", {fg = oxocarbon.base12, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicIconsConstructor", {fg = oxocarbon.base10, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicIconsEnum", {fg = oxocarbon.base09, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicIconsInterface", {fg = oxocarbon.base08, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicIconsFunction", {fg = oxocarbon.base11, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicIconsVariable", {fg = oxocarbon.base14, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicIconsConstant", {fg = oxocarbon.base10, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicIconsString", {fg = oxocarbon.base14, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicIconsNumber", {fg = oxocarbon.base15, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicIconsBoolean", {fg = oxocarbon.base09, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicIconsEnumMember", {fg = oxocarbon.base15}) +vim.api.nvim_set_hl(0, "NavicIconsStruct", {fg = oxocarbon.base11}) +vim.api.nvim_set_hl(0, "NavicIconsOperator", {fg = oxocarbon.base11, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicIconsTypeParameter", {fg = oxocarbon.base04, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicIconsArray", {}) +vim.api.nvim_set_hl(0, "NavicIconsObject", {}) +vim.api.nvim_set_hl(0, "NavicIconsKey", {}) +vim.api.nvim_set_hl(0, "NavicIconsNull", {}) +vim.api.nvim_set_hl(0, "NavicText", {}) +vim.api.nvim_set_hl(0, "NavicSeperator", {}) +vim.api.nvim_set_hl(0, "NavicIconsPackage", {}) +vim.api.nvim_set_hl(0, "NavicIconsEvent", {}) return {oxocarbon = oxocarbon} \ No newline at end of file From e2d6f28d3d2b774743e75d414606893c4a6dfda7 Mon Sep 17 00:00:00 2001 From: vividsystem Date: Fri, 19 May 2023 23:07:06 +0200 Subject: [PATCH 2/4] chore: commented not yet implemented highlights --- fnl/oxocarbon/init.fnl | 18 ++++++++++-------- lua/oxocarbon/init.lua | 12 ++---------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/fnl/oxocarbon/init.fnl b/fnl/oxocarbon/init.fnl index 6094540..66c0e4a 100644 --- a/fnl/oxocarbon/init.fnl +++ b/fnl/oxocarbon/init.fnl @@ -612,6 +612,8 @@ (custom-set-face! :VimwikiLink [] {:link "markdownUrl"}) (custom-set-face! :VimwikiCode [] {:link "markdownCode"}) +;; nvim-navic + (custom-set-face! :NavicIconsFile [] {:fg oxocarbon.base14 :bg oxocarbon.none }) (custom-set-face! :NavicIconsModule [] {:fg oxocarbon.base11 :bg oxocarbon.none }) (custom-set-face! :NavicIconsNamespace [] {:fg oxocarbon.base07 :bg oxocarbon.none }) @@ -632,13 +634,13 @@ (custom-set-face! :NavicIconsStruct [] {:fg oxocarbon.base11}) (custom-set-face! :NavicIconsOperator [] {:fg oxocarbon.base11 :bg oxocarbon.none}) (custom-set-face! :NavicIconsTypeParameter [] {:fg oxocarbon.base04 :bg oxocarbon.none}) -(custom-set-face! :NavicIconsArray [] {}) -(custom-set-face! :NavicIconsObject [] {}) -(custom-set-face! :NavicIconsKey [] {}) -(custom-set-face! :NavicIconsNull [] {}) -(custom-set-face! :NavicText [] {}) -(custom-set-face! :NavicSeperator [] {}) -(custom-set-face! :NavicIconsPackage [] {}) -(custom-set-face! :NavicIconsEvent [] {}) +;; (custom-set-face! :NavicIconsArray [] {}) +;; (custom-set-face! :NavicIconsObject [] {}) +;; (custom-set-face! :NavicIconsKey [] {}) +;; (custom-set-face! :NavicIconsNull [] {}) +;; (custom-set-face! :NavicText [] {}) +;; (custom-set-face! :NavicSeperator [] {}) +;; (custom-set-face! :NavicIconsPackage [] {}) +;; (custom-set-face! :NavicIconsEvent [] {}) { : oxocarbon } diff --git a/lua/oxocarbon/init.lua b/lua/oxocarbon/init.lua index dc4ad38..84e5eae 100644 --- a/lua/oxocarbon/init.lua +++ b/lua/oxocarbon/init.lua @@ -138,7 +138,7 @@ vim.api.nvim_set_hl(0, "Typedef", {fg = oxocarbon.base09, bg = oxocarbon.none}) vim.api.nvim_set_hl(0, "markdownBlockquote", {fg = oxocarbon.base08, bg = oxocarbon.none}) vim.api.nvim_set_hl(0, "markdownBold", {link = "Bold"}) vim.api.nvim_set_hl(0, "markdownItalic", {link = "Italic"}) -vim.api.nvim_set_hl(0, "markdownBoldItalic", {fg = oxocarbon.none, bg = oxocarbon.none, bold = true, italic = true}) +vim.api.nvim_set_hl(0, "markdownBoldItalic", {fg = oxocarbon.none, bg = oxocarbon.none, italic = true, bold = true}) vim.api.nvim_set_hl(0, "markdownRule", {link = "Comment"}) vim.api.nvim_set_hl(0, "markdownH1", {fg = oxocarbon.base10, bg = oxocarbon.none}) vim.api.nvim_set_hl(0, "markdownH2", {link = "markdownH1"}) @@ -239,7 +239,7 @@ vim.api.nvim_set_hl(0, "TelescopePromptTitle", {fg = oxocarbon.base02, bg = oxoc vim.api.nvim_set_hl(0, "TelescopeResultsTitle", {fg = oxocarbon.blend, bg = oxocarbon.blend}) vim.api.nvim_set_hl(0, "TelescopeSelection", {fg = oxocarbon.none, bg = oxocarbon.base02}) vim.api.nvim_set_hl(0, "TelescopePreviewLine", {fg = oxocarbon.none, bg = oxocarbon.base01}) -vim.api.nvim_set_hl(0, "TelescopeMatching", {fg = oxocarbon.base08, bg = oxocarbon.none, bold = true, italic = true}) +vim.api.nvim_set_hl(0, "TelescopeMatching", {fg = oxocarbon.base08, bg = oxocarbon.none, italic = true, bold = true}) vim.api.nvim_set_hl(0, "NotifyERRORBorder", {fg = oxocarbon.base08, bg = oxocarbon.none}) vim.api.nvim_set_hl(0, "NotifyWARNBorder", {fg = oxocarbon.base14, bg = oxocarbon.none}) vim.api.nvim_set_hl(0, "NotifyINFOBorder", {fg = oxocarbon.base05, bg = oxocarbon.none}) @@ -341,12 +341,4 @@ vim.api.nvim_set_hl(0, "NavicIconsEnumMember", {fg = oxocarbon.base15}) vim.api.nvim_set_hl(0, "NavicIconsStruct", {fg = oxocarbon.base11}) vim.api.nvim_set_hl(0, "NavicIconsOperator", {fg = oxocarbon.base11, bg = oxocarbon.none}) vim.api.nvim_set_hl(0, "NavicIconsTypeParameter", {fg = oxocarbon.base04, bg = oxocarbon.none}) -vim.api.nvim_set_hl(0, "NavicIconsArray", {}) -vim.api.nvim_set_hl(0, "NavicIconsObject", {}) -vim.api.nvim_set_hl(0, "NavicIconsKey", {}) -vim.api.nvim_set_hl(0, "NavicIconsNull", {}) -vim.api.nvim_set_hl(0, "NavicText", {}) -vim.api.nvim_set_hl(0, "NavicSeperator", {}) -vim.api.nvim_set_hl(0, "NavicIconsPackage", {}) -vim.api.nvim_set_hl(0, "NavicIconsEvent", {}) return {oxocarbon = oxocarbon} \ No newline at end of file From 2c57bb9628e8863da9c20cb7d93f1495b522f7e3 Mon Sep 17 00:00:00 2001 From: vividsystem Date: Fri, 19 May 2023 23:31:11 +0200 Subject: [PATCH 3/4] feat: added navic text highlighting --- fnl/oxocarbon/init.fnl | 4 ++-- lua/oxocarbon/init.lua | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fnl/oxocarbon/init.fnl b/fnl/oxocarbon/init.fnl index 66c0e4a..00a46c0 100644 --- a/fnl/oxocarbon/init.fnl +++ b/fnl/oxocarbon/init.fnl @@ -638,9 +638,9 @@ ;; (custom-set-face! :NavicIconsObject [] {}) ;; (custom-set-face! :NavicIconsKey [] {}) ;; (custom-set-face! :NavicIconsNull [] {}) -;; (custom-set-face! :NavicText [] {}) +(custom-set-face! :NavicText [] {:fg oxocarbon.base04 :bg oxocarbon.none}) ;; (custom-set-face! :NavicSeperator [] {}) ;; (custom-set-face! :NavicIconsPackage [] {}) -;; (custom-set-face! :NavicIconsEvent [] {}) +(custom-set-face! :NavicIconsEvent [] {:fg oxocarbon.base12 :bg oxocarbon.none}) { : oxocarbon } diff --git a/lua/oxocarbon/init.lua b/lua/oxocarbon/init.lua index 84e5eae..14bb997 100644 --- a/lua/oxocarbon/init.lua +++ b/lua/oxocarbon/init.lua @@ -138,7 +138,7 @@ vim.api.nvim_set_hl(0, "Typedef", {fg = oxocarbon.base09, bg = oxocarbon.none}) vim.api.nvim_set_hl(0, "markdownBlockquote", {fg = oxocarbon.base08, bg = oxocarbon.none}) vim.api.nvim_set_hl(0, "markdownBold", {link = "Bold"}) vim.api.nvim_set_hl(0, "markdownItalic", {link = "Italic"}) -vim.api.nvim_set_hl(0, "markdownBoldItalic", {fg = oxocarbon.none, bg = oxocarbon.none, italic = true, bold = true}) +vim.api.nvim_set_hl(0, "markdownBoldItalic", {fg = oxocarbon.none, bg = oxocarbon.none, bold = true, italic = true}) vim.api.nvim_set_hl(0, "markdownRule", {link = "Comment"}) vim.api.nvim_set_hl(0, "markdownH1", {fg = oxocarbon.base10, bg = oxocarbon.none}) vim.api.nvim_set_hl(0, "markdownH2", {link = "markdownH1"}) @@ -239,7 +239,7 @@ vim.api.nvim_set_hl(0, "TelescopePromptTitle", {fg = oxocarbon.base02, bg = oxoc vim.api.nvim_set_hl(0, "TelescopeResultsTitle", {fg = oxocarbon.blend, bg = oxocarbon.blend}) vim.api.nvim_set_hl(0, "TelescopeSelection", {fg = oxocarbon.none, bg = oxocarbon.base02}) vim.api.nvim_set_hl(0, "TelescopePreviewLine", {fg = oxocarbon.none, bg = oxocarbon.base01}) -vim.api.nvim_set_hl(0, "TelescopeMatching", {fg = oxocarbon.base08, bg = oxocarbon.none, italic = true, bold = true}) +vim.api.nvim_set_hl(0, "TelescopeMatching", {fg = oxocarbon.base08, bg = oxocarbon.none, bold = true, italic = true}) vim.api.nvim_set_hl(0, "NotifyERRORBorder", {fg = oxocarbon.base08, bg = oxocarbon.none}) vim.api.nvim_set_hl(0, "NotifyWARNBorder", {fg = oxocarbon.base14, bg = oxocarbon.none}) vim.api.nvim_set_hl(0, "NotifyINFOBorder", {fg = oxocarbon.base05, bg = oxocarbon.none}) @@ -341,4 +341,6 @@ vim.api.nvim_set_hl(0, "NavicIconsEnumMember", {fg = oxocarbon.base15}) vim.api.nvim_set_hl(0, "NavicIconsStruct", {fg = oxocarbon.base11}) vim.api.nvim_set_hl(0, "NavicIconsOperator", {fg = oxocarbon.base11, bg = oxocarbon.none}) vim.api.nvim_set_hl(0, "NavicIconsTypeParameter", {fg = oxocarbon.base04, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicText", {fg = oxocarbon.base04, bg = oxocarbon.none}) +vim.api.nvim_set_hl(0, "NavicIconsEvent", {fg = oxocarbon.base12, bg = oxocarbon.none}) return {oxocarbon = oxocarbon} \ No newline at end of file From caecc7b9c7d8bdcdc4b12dbaed3a001173b3de41 Mon Sep 17 00:00:00 2001 From: vivid <64314595+vividsystem@users.noreply.github.com> Date: Fri, 22 Sep 2023 21:41:32 +0200 Subject: [PATCH 4/4] feat: added navic as supported plugin to README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 089c2f9..6408db3 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ The colorscheme explicitly adds highlights for the following plugins: - Neogit - Gitsigns - Hydra +- Navic And many others should "just work!" If you have a plugin that needs explicit highlights, feel free to open an issue or PR and I would be happy to add them.