From 8858669f93a9b66c44d5734e0b7283bfa747cc0a Mon Sep 17 00:00:00 2001 From: Simon Ho Date: Mon, 15 Jul 2024 00:15:06 -0700 Subject: [PATCH] feat(rainbow): add hl for rainbow delimiters, markdown, headlines --- lua/kanagawa-paper/highlights/plugins.lua | 26 +++++++++++------------ lua/kanagawa-paper/highlights/syntax.lua | 10 ++++++--- lua/kanagawa-paper/themes.lua | 19 +++++++++++++++++ 3 files changed, 39 insertions(+), 16 deletions(-) diff --git a/lua/kanagawa-paper/highlights/plugins.lua b/lua/kanagawa-paper/highlights/plugins.lua index 66d5555..ca6c769 100644 --- a/lua/kanagawa-paper/highlights/plugins.lua +++ b/lua/kanagawa-paper/highlights/plugins.lua @@ -216,21 +216,21 @@ function M.setup(colors, opts) TroublePos = { fg = theme.ui.special }, -- Headlines - Headline1 = { bg = palette.waveBlue1, fg = theme.ui.fg, bold = true }, - Headline2 = { bg = palette.winterRed, fg = theme.ui.fg, bold = true }, - Headline3 = { bg = palette.winterYellow, fg = theme.ui.fg, bold = true }, - Headline4 = { bg = palette.winterGreen, fg = theme.ui.fg, bold = true }, - Headline5 = { bg = palette.dragonRed, fg = theme.ui.fg, bold = true }, - Headline6 = { bg = palette.dragonGray, fg = theme.ui.fg, bold = true }, + Headline1 = { bg = theme.rainbow.rainbow1, fg = theme.ui.fg, bold = true }, + Headline2 = { bg = theme.rainbow.rainbow2, fg = theme.ui.fg, bold = true }, + Headline3 = { bg = theme.rainbow.rainbow3, fg = theme.ui.fg, bold = true }, + Headline4 = { bg = theme.rainbow.rainbow4, fg = theme.ui.fg, bold = true }, + Headline5 = { bg = theme.rainbow.rainbow5, fg = theme.ui.fg, bold = true }, + Headline6 = { bg = theme.rainbow.rainbow6, fg = theme.ui.fg, bold = true }, -- Raindow delimiters - RainbowDelimiterRed = { fg = palette.dragonRed }, - RainbowDelimiterYellow = { fg = palette.dragonYellow }, - RainbowDelimiterBlue = { fg = palette.dragonBlue }, - RainbowDelimiterOrange = { fg = palette.dragonOrange2 }, - RainbowDelimiterGreen = { fg = palette.dragonGreen }, - RainbowDelimiterViolet = { fg = palette.dragonAsh }, - RainbowDelimiterCyan = { fg = palette.dragonTeal }, + RainbowDelimiterRed = { fg = theme.rainbow.rainbow1 }, + RainbowDelimiterYellow = { fg = theme.rainbow.rainbow2 }, + RainbowDelimiterBlue = { fg = theme.rainbow.rainbow3 }, + RainbowDelimiterOrange = { fg = theme.rainbow.rainbow4 }, + RainbowDelimiterGreen = { fg = theme.rainbow.rainbow5 }, + RainbowDelimiterViolet = { fg = theme.rainbow.rainbow6 }, + RainbowDelimiterCyan = { fg = theme.rainbow.rainbow7 }, -- Bufferline BufferlineFill = { bg = theme.ui.bg_tabline }, diff --git a/lua/kanagawa-paper/highlights/syntax.lua b/lua/kanagawa-paper/highlights/syntax.lua index c6006fd..4c85c11 100644 --- a/lua/kanagawa-paper/highlights/syntax.lua +++ b/lua/kanagawa-paper/highlights/syntax.lua @@ -90,12 +90,16 @@ function M.setup(colors, opts) -- mkdLink = {}, -- markdownHeadingDelimiter = {}, + -- markdownLinkText = {}, markdownCode = { fg = theme.syn.string }, markdownCodeBlock = { fg = theme.syn.string }, markdownEscape = { fg = "NONE" }, - -- markdownH1 = {}, - -- markdownH2 = {}, - -- markdownLinkText = {}, + markdownH1 = { fg = theme.rainbow.rainbow1 }, + markdownH2 = { fg = theme.rainbow.rainbow2 }, + markdownH3 = { fg = theme.rainbow.rainbow3 }, + markdownH4 = { fg = theme.rainbow.rainbow4 }, + markdownH5 = { fg = theme.rainbow.rainbow5 }, + markdownH6 = { fg = theme.rainbow.rainbow6 }, } end diff --git a/lua/kanagawa-paper/themes.lua b/lua/kanagawa-paper/themes.lua index 9669bb3..ca41b48 100644 --- a/lua/kanagawa-paper/themes.lua +++ b/lua/kanagawa-paper/themes.lua @@ -86,6 +86,15 @@ ---@field bg_sbar ColorSpec ---@field bg_thumb ColorSpec +---@class RainbowColors +---@field rainbow1 ColorSpec +---@field rainbow2 ColorSpec +---@field rainbow3 ColorSpec +---@field rainbow4 ColorSpec +---@field rainbow5 ColorSpec +---@field rainbow6 ColorSpec +---@field rainbow7 ColorSpec + ---@class ThemeColors ---@field syn SyntaxElements ---@field diag DiagnosticsElements @@ -93,6 +102,7 @@ ---@field diff DiffElements ---@field ui UiElements ---@field modes ModeElements +---@field rainbow RainbowColors ---@field term ColorSpec[] ---@param palette PaletteColors @@ -149,6 +159,15 @@ return function(palette) bg_border = "none", }, }, + rainbow = { + rainbow1 = palette.dragonRed, + rainbow2 = palette.dragonYellow, + rainbow3 = palette.dragonBlue, + rainbow4 = palette.dragonOrange2, + rainbow5 = palette.dragonGreen, + rainbow6 = palette.dragonAsh, + rainbow7 = palette.dragonTeal, + }, syn = { string = palette.dragonGreen2, variable = "none",