From 48270006c47364812efe14f5dde5861bf4ace6a4 Mon Sep 17 00:00:00 2001
From: Price Hiller <price@orion-technologies.io>
Date: Sun, 21 Jan 2024 14:17:25 -0600
Subject: [PATCH] refactor(nvim): update to support new TS highlight groups

---
 .../nvim/lua/plugins/configs/alpha.lua        |  4 +-
 .../nvim/lua/plugins/configs/kanagawa.lua     | 45 +------------------
 2 files changed, 3 insertions(+), 46 deletions(-)

diff --git a/dots/.config/nvim/lua/plugins/configs/alpha.lua b/dots/.config/nvim/lua/plugins/configs/alpha.lua
index 22113ffc..f8fc41bd 100644
--- a/dots/.config/nvim/lua/plugins/configs/alpha.lua
+++ b/dots/.config/nvim/lua/plugins/configs/alpha.lua
@@ -70,7 +70,7 @@ return {
                         .. "ms"
                 end,
 
-                opts = { hl = "@conditional", position = "center" },
+                opts = { hl = "@keyword.conditional", position = "center" },
             }
 
             vim.api.nvim_set_hl(0, "AlphaPluginUpdate", { link = "@string" })
@@ -97,7 +97,7 @@ return {
                 val = function()
                     return vim.fn.strftime("%c")
                 end,
-                opts = { hl = "@field", position = "center" },
+                opts = { hl = "@variable.member", position = "center" },
             }
 
             -- Menu
diff --git a/dots/.config/nvim/lua/plugins/configs/kanagawa.lua b/dots/.config/nvim/lua/plugins/configs/kanagawa.lua
index 99658a41..63651097 100644
--- a/dots/.config/nvim/lua/plugins/configs/kanagawa.lua
+++ b/dots/.config/nvim/lua/plugins/configs/kanagawa.lua
@@ -39,50 +39,6 @@ return {
                     vim.api.nvim_set_hl(0, "NvimNotifyTrace", { fg = colors.oniViolet })
 
                     local overrides = {
-                        -- HACK: Temporarily set these overrides to support new Neovim Treesitter
-                        -- and Neovim core highlight groups
-                        ["@variable.parameter"] = { link = "@parameter" },
-                        ["@variable.member"] = { link = "@field" },
-                        ["@module"] = { link = "@namespace" },
-                        ["@number.float"] = { link = "@float" },
-                        ["@string.special.symbol"] = { link = "@symbol" },
-                        ["@string.regexp"] = { link = "@string.regex" },
-                        ["@markup.strong"] = { link = "@text.strong" },
-                        ["@markup.italic"] = { link = "@text.emphasis" },
-                        ["@markup.underline"] = { link = "@text.underline" },
-                        ["@markup.strikethrough"] = { link = "@text.strike" },
-                        ["@markup.heading"] = { link = "@text.title" },
-                        ["@markup.quote"] = { link = "@text.quote" },
-                        ["@markup.link.url"] = { link = "@text.uri" },
-                        ["@markup.math"] = { link = "@text.math" },
-                        ["@markup.environment"] = { link = "@text.environment" },
-                        ["@markup.environment.name"] = { link = "@text.environment.name" },
-                        ["@markup.link"] = { link = "@text.reference" },
-                        ["@markup.raw"] = { link = "@text.literal" },
-                        ["@markup.raw.block"] = { link = "@text.literal.block" },
-                        ["@markup.link.label"] = { link = "@string.special" },
-                        ["@markup.list"] = { link = "@punctuation.special" },
-                        ["@function.method"] = { link = "@method" },
-                        ["@function.method.call"] = { link = "@method.call" },
-                        ["@comment.todo"] = { link = "@text.todo" },
-                        ["@comment.error"] = { link = "@text.danger" },
-                        ["@comment.warning"] = { link = "@text.warning" },
-                        ["@comment.hint"] = { link = "@text.note" },
-                        ["@comment.info"] = { link = "@text.note" },
-                        ["@comment.note"] = { link = "@text.note" },
-                        ["@comment.ok"] = { link = "@text.note" },
-                        ["@diff.plus"] = { link = "@text.diff.add" },
-                        ["@diff.minus"] = { link = "@text.diff.delete" },
-                        ["@diff.delta"] = { link = "@text.diff.change" },
-                        ["@string.special.url"] = { link = "@text.uri" },
-                        ["@keyword.storage"] = { link = "@storageclass" },
-                        ["@keyword.directive"] = { link = "@define" },
-                        ["@keyword.conditional"] = { link = "@conditional" },
-                        ["@keyword.debug"] = { link = "@debug" },
-                        ["@keyword.exception"] = { link = "@exception" },
-                        ["@keyword.import"] = { link = "@include" },
-                        ["@keyword.repeat"] = { link = "@repeat" },
-
                         CursorLineNr = { fg = colors.roninYellow, bg = palette.theme.ui.bg_p1 },
                         CursorLineFold = { fg = colors.crystalBlue, bg = palette.theme.ui.bg_p1 },
                         CursorLineSign = { bg = palette.theme.ui.bg_p1 },
@@ -218,6 +174,7 @@ return {
                         Headline = { bg = colors.sumiInk2 },
                         HeadlineReversed = { bg = colors.sumiInk1 },
                         LspInlayHint = { fg = colors.springViolet2, bg = colors.winterBlue },
+                        ["@text"] = { fg = colors.fujiWhite },
                         ["@text.title.1.marker.markdown"] = { fg = colors.surimiOrange },
                         ["@text.title.2.marker.markdown"] = { fg = colors.surimiOrange },
                         ["@text.title.3.marker.markdown"] = { fg = colors.surimiOrange },