From 90ab10ee2737ce8492134139383c5dfd550b59da Mon Sep 17 00:00:00 2001 From: Miroslav Lincovschi Date: Wed, 18 Dec 2024 02:42:59 +0300 Subject: [PATCH 01/18] feat: move plugins to separate files --- lua/solarized-osaka/groups/alpha.lua | 13 ++ lua/solarized-osaka/groups/barbar.lua | 53 +++++++ lua/solarized-osaka/groups/bufferline.lua | 9 ++ lua/solarized-osaka/groups/cmp.lua | 50 +++++++ lua/solarized-osaka/groups/dashboard.lua | 15 ++ lua/solarized-osaka/groups/editor.lua | 112 ++++++++++++++ lua/solarized-osaka/groups/fern.lua | 9 ++ lua/solarized-osaka/groups/flash.lua | 10 ++ lua/solarized-osaka/groups/gitgutter.lua | 14 ++ lua/solarized-osaka/groups/gitsigns.lua | 11 ++ lua/solarized-osaka/groups/glyph-pallete.lua | 15 ++ lua/solarized-osaka/groups/hop.lua | 12 ++ lua/solarized-osaka/groups/illuminate.lua | 13 ++ .../groups/indent-blankline.lua | 11 ++ lua/solarized-osaka/groups/lazy.lua | 10 ++ lua/solarized-osaka/groups/leap.lua | 11 ++ lua/solarized-osaka/groups/lightspeed.lua | 21 +++ lua/solarized-osaka/groups/lspsaga.lua | 26 ++++ lua/solarized-osaka/groups/mini_animate.lua | 10 ++ lua/solarized-osaka/groups/mini_clue.lua | 15 ++ .../groups/mini_completion.lua | 9 ++ .../groups/mini_cursorword.lua | 10 ++ lua/solarized-osaka/groups/mini_deps.lua | 18 +++ lua/solarized-osaka/groups/mini_diff.lua | 15 ++ lua/solarized-osaka/groups/mini_files.lua | 16 ++ .../groups/mini_hipatterns.lua | 12 ++ lua/solarized-osaka/groups/mini_icons.lua | 17 +++ .../groups/mini_indentscope.lua | 10 ++ lua/solarized-osaka/groups/mini_jump.lua | 13 ++ lua/solarized-osaka/groups/mini_map.lua | 12 ++ lua/solarized-osaka/groups/mini_notify.lua | 11 ++ lua/solarized-osaka/groups/mini_operators.lua | 9 ++ lua/solarized-osaka/groups/mini_pick.lua | 21 +++ lua/solarized-osaka/groups/mini_starter.lua | 17 +++ .../groups/mini_statusline.lua | 18 +++ lua/solarized-osaka/groups/mini_surround.lua | 9 ++ lua/solarized-osaka/groups/mini_tabline.lua | 16 ++ lua/solarized-osaka/groups/mini_test.lua | 11 ++ .../groups/mini_trailspace.lua | 9 ++ lua/solarized-osaka/groups/navic.lua | 37 +++++ lua/solarized-osaka/groups/neo-tree.lua | 12 ++ lua/solarized-osaka/groups/neogit.lua | 15 ++ lua/solarized-osaka/groups/neotest.lua | 25 ++++ lua/solarized-osaka/groups/noice.lua | 9 ++ lua/solarized-osaka/groups/notify.lua | 35 +++++ lua/solarized-osaka/groups/nvim-tree.lua | 25 ++++ .../groups/nvim-ts-rainbow.lua | 15 ++ .../groups/nvim-ts-rainbow2.lua | 12 ++ .../groups/rainbow-delimiters.lua | 12 ++ lua/solarized-osaka/groups/scrollbar.lua | 27 ++++ .../groups/semantic_tokens.lua | 51 +++++++ lua/solarized-osaka/groups/snacks.lua | 19 +++ lua/solarized-osaka/groups/sneak.lua | 10 ++ lua/solarized-osaka/groups/syntax.lua | 60 ++++++++ lua/solarized-osaka/groups/telescope.lua | 10 ++ .../groups/treesitter-context.lua | 9 ++ lua/solarized-osaka/groups/treesitter.lua | 140 ++++++++++++++++++ lua/solarized-osaka/groups/trouble.lua | 11 ++ lua/solarized-osaka/groups/ts-node-action.lua | 10 ++ lua/solarized-osaka/groups/which-key.lua | 15 ++ lua/solarized-osaka/groups/yanky.lua | 10 ++ 61 files changed, 1262 insertions(+) create mode 100644 lua/solarized-osaka/groups/alpha.lua create mode 100644 lua/solarized-osaka/groups/barbar.lua create mode 100644 lua/solarized-osaka/groups/bufferline.lua create mode 100644 lua/solarized-osaka/groups/cmp.lua create mode 100644 lua/solarized-osaka/groups/dashboard.lua create mode 100644 lua/solarized-osaka/groups/editor.lua create mode 100644 lua/solarized-osaka/groups/fern.lua create mode 100644 lua/solarized-osaka/groups/flash.lua create mode 100644 lua/solarized-osaka/groups/gitgutter.lua create mode 100644 lua/solarized-osaka/groups/gitsigns.lua create mode 100644 lua/solarized-osaka/groups/glyph-pallete.lua create mode 100644 lua/solarized-osaka/groups/hop.lua create mode 100644 lua/solarized-osaka/groups/illuminate.lua create mode 100644 lua/solarized-osaka/groups/indent-blankline.lua create mode 100644 lua/solarized-osaka/groups/lazy.lua create mode 100644 lua/solarized-osaka/groups/leap.lua create mode 100644 lua/solarized-osaka/groups/lightspeed.lua create mode 100644 lua/solarized-osaka/groups/lspsaga.lua create mode 100644 lua/solarized-osaka/groups/mini_animate.lua create mode 100644 lua/solarized-osaka/groups/mini_clue.lua create mode 100644 lua/solarized-osaka/groups/mini_completion.lua create mode 100644 lua/solarized-osaka/groups/mini_cursorword.lua create mode 100644 lua/solarized-osaka/groups/mini_deps.lua create mode 100644 lua/solarized-osaka/groups/mini_diff.lua create mode 100644 lua/solarized-osaka/groups/mini_files.lua create mode 100644 lua/solarized-osaka/groups/mini_hipatterns.lua create mode 100644 lua/solarized-osaka/groups/mini_icons.lua create mode 100644 lua/solarized-osaka/groups/mini_indentscope.lua create mode 100644 lua/solarized-osaka/groups/mini_jump.lua create mode 100644 lua/solarized-osaka/groups/mini_map.lua create mode 100644 lua/solarized-osaka/groups/mini_notify.lua create mode 100644 lua/solarized-osaka/groups/mini_operators.lua create mode 100644 lua/solarized-osaka/groups/mini_pick.lua create mode 100644 lua/solarized-osaka/groups/mini_starter.lua create mode 100644 lua/solarized-osaka/groups/mini_statusline.lua create mode 100644 lua/solarized-osaka/groups/mini_surround.lua create mode 100644 lua/solarized-osaka/groups/mini_tabline.lua create mode 100644 lua/solarized-osaka/groups/mini_test.lua create mode 100644 lua/solarized-osaka/groups/mini_trailspace.lua create mode 100644 lua/solarized-osaka/groups/navic.lua create mode 100644 lua/solarized-osaka/groups/neo-tree.lua create mode 100644 lua/solarized-osaka/groups/neogit.lua create mode 100644 lua/solarized-osaka/groups/neotest.lua create mode 100644 lua/solarized-osaka/groups/noice.lua create mode 100644 lua/solarized-osaka/groups/notify.lua create mode 100644 lua/solarized-osaka/groups/nvim-tree.lua create mode 100644 lua/solarized-osaka/groups/nvim-ts-rainbow.lua create mode 100644 lua/solarized-osaka/groups/nvim-ts-rainbow2.lua create mode 100644 lua/solarized-osaka/groups/rainbow-delimiters.lua create mode 100644 lua/solarized-osaka/groups/scrollbar.lua create mode 100644 lua/solarized-osaka/groups/semantic_tokens.lua create mode 100644 lua/solarized-osaka/groups/snacks.lua create mode 100644 lua/solarized-osaka/groups/sneak.lua create mode 100644 lua/solarized-osaka/groups/syntax.lua create mode 100644 lua/solarized-osaka/groups/telescope.lua create mode 100644 lua/solarized-osaka/groups/treesitter-context.lua create mode 100644 lua/solarized-osaka/groups/treesitter.lua create mode 100644 lua/solarized-osaka/groups/trouble.lua create mode 100644 lua/solarized-osaka/groups/ts-node-action.lua create mode 100644 lua/solarized-osaka/groups/which-key.lua create mode 100644 lua/solarized-osaka/groups/yanky.lua diff --git a/lua/solarized-osaka/groups/alpha.lua b/lua/solarized-osaka/groups/alpha.lua new file mode 100644 index 0000000..676fefa --- /dev/null +++ b/lua/solarized-osaka/groups/alpha.lua @@ -0,0 +1,13 @@ +local M = {} + +function M.get(c) + return { + AlphaShortcut = { fg = c.orange }, + AlphaHeader = { fg = c.blue }, + AlphaHeaderLabel = { fg = c.orange }, + AlphaFooter = { fg = c.cyan }, + AlphaButtons = { fg = c.cyan }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/barbar.lua b/lua/solarized-osaka/groups/barbar.lua new file mode 100644 index 0000000..1d32183 --- /dev/null +++ b/lua/solarized-osaka/groups/barbar.lua @@ -0,0 +1,53 @@ +local Util = require("solarized-osaka.util") + +local M = {} + +function M.get(c, opts) + return { + BufferCurrent = { bg = c.bg, fg = c.fg }, + BufferCurrentERROR = { bg = c.bg, fg = c.error }, + BufferCurrentHINT = { bg = c.bg, fg = c.hint }, + -- BufferCurrentIcon = { bg = c.bg, fg = c.}, + BufferCurrentINFO = { bg = c.bg, fg = c.info }, + BufferCurrentWARN = { bg = c.bg, fg = c.warning }, + BufferCurrentIndex = { bg = c.bg, fg = c.info }, + BufferCurrentMod = { bg = c.bg, fg = c.warning }, + BufferCurrentSign = { bg = c.bg, fg = c.bg }, + BufferCurrentTarget = { bg = c.bg, fg = c.red }, + BufferAlternate = { bg = c.base01, fg = c.fg }, + BufferAlternateERROR = { bg = c.base01, fg = c.error }, + BufferAlternateHINT = { bg = c.base01, fg = c.hint }, + -- BufferAlternateIcon = { bg = c.base01, fg = c. }, + BufferAlternateIndex = { bg = c.base01, fg = c.info }, + BufferAlternateINFO = { bg = c.base01, fg = c.info }, + BufferAlternateMod = { bg = c.base01, fg = c.warning }, + BufferAlternateSign = { bg = c.base01, fg = c.info }, + BufferAlternateTarget = { bg = c.base01, fg = c.red }, + BufferAlternateWARN = { bg = c.base01, fg = c.warning }, + BufferVisible = { bg = c.bg_statusline, fg = c.fg }, + BufferVisibleERROR = { bg = c.bg_statusline, fg = c.error }, + BufferVisibleHINT = { bg = c.bg_statusline, fg = c.hint }, + -- BufferVisibleIcon = { bg = c.bg_statusline, fg = c. }, + BufferVisibleINFO = { bg = c.bg_statusline, fg = c.info }, + BufferVisibleWARN = { bg = c.bg_statusline, fg = c.warning }, + BufferVisibleIndex = { bg = c.bg_statusline, fg = c.info }, + BufferVisibleMod = { bg = c.bg_statusline, fg = c.warning }, + BufferVisibleSign = { bg = c.bg_statusline, fg = c.info }, + BufferVisibleTarget = { bg = c.bg_statusline, fg = c.red }, + BufferInactive = { bg = Util.darken(c.bg_highlight, 0.4), fg = Util.darken(c.violet500, 0.8) }, + BufferInactiveERROR = { bg = Util.darken(c.bg_highlight, 0.4), fg = Util.darken(c.error, 0.8) }, + BufferInactiveHINT = { bg = Util.darken(c.bg_highlight, 0.4), fg = Util.darken(c.hint, 0.8) }, + -- BufferInactiveIcon = { bg = c.bg_statusline, fg = util.darken(c., 0.1) }, + BufferInactiveINFO = { bg = Util.darken(c.bg_highlight, 0.4), fg = Util.darken(c.info, 0.8) }, + BufferInactiveWARN = { bg = Util.darken(c.bg_highlight, 0.4), fg = Util.darken(c.warning, 0.8) }, + BufferInactiveIndex = { bg = Util.darken(c.bg_highlight, 0.4), fg = c.violet500 }, + BufferInactiveMod = { bg = Util.darken(c.bg_highlight, 0.4), fg = Util.darken(c.warning, 0.8) }, + BufferInactiveSign = { bg = Util.darken(c.bg_highlight, 0.4), fg = c.bg }, + BufferInactiveTarget = { bg = Util.darken(c.bg_highlight, 0.4), fg = c.red }, + BufferOffset = { bg = c.bg_statusline, fg = c.violet500 }, + BufferTabpageFill = { bg = Util.darken(c.bg_highlight, 0.8), fg = c.violet500 }, + BufferTabpages = { bg = c.bg_statusline, fg = c.none }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/bufferline.lua b/lua/solarized-osaka/groups/bufferline.lua new file mode 100644 index 0000000..728bbab --- /dev/null +++ b/lua/solarized-osaka/groups/bufferline.lua @@ -0,0 +1,9 @@ +local M = {} + +function M.get(c, opts) + return { + BufferLineIndicatorSelected = { fg = c.yellow500 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/cmp.lua b/lua/solarized-osaka/groups/cmp.lua new file mode 100644 index 0000000..4b8acd1 --- /dev/null +++ b/lua/solarized-osaka/groups/cmp.lua @@ -0,0 +1,50 @@ +local M = {} + +function M.get(c, opts) + return { + CmpDocumentation = { fg = c.fg, bg = c.bg_float }, + CmpDocumentationBorder = { fg = c.base02, bg = c.bg_float }, + CmpGhostText = { fg = c.base01 }, + + CmpItemAbbr = { fg = c.fg, bg = c.none }, + CmpItemAbbrDeprecated = { fg = c.base01, bg = c.none, strikethrough = true }, + CmpItemAbbrMatch = { fg = c.violet500, bg = c.none }, + CmpItemAbbrMatchFuzzy = { fg = c.violet500, bg = c.none }, + + CmpItemMenu = { fg = c.base01, bg = c.none }, + + CmpItemKindDefault = { fg = c.base01, bg = c.none }, + + CmpItemKindCodeium = { fg = c.cyan500, bg = c.none }, + CmpItemKindCopilot = { fg = c.cyan500, bg = c.none }, + CmpItemKindTabNine = { fg = c.cyan500, bg = c.none }, + + CmpItemKindKeyword = { fg = c.cyan, bg = c.none }, + CmpItemKindVariable = { fg = c.magenta, bg = c.none }, + CmpItemKindConstant = { fg = c.magenta, bg = c.none }, + CmpItemKindReference = { fg = c.magenta, bg = c.none }, + CmpItemKindValue = { fg = c.magenta, bg = c.none }, + + CmpItemKindFunction = { fg = c.blue, bg = c.none }, + CmpItemKindMethod = { fg = c.blue, bg = c.none }, + CmpItemKindConstructor = { fg = c.blue, bg = c.none }, + + CmpItemKindClass = { fg = c.orange, bg = c.none }, + CmpItemKindInterface = { fg = c.orange, bg = c.none }, + CmpItemKindStruct = { fg = c.orange, bg = c.none }, + CmpItemKindEvent = { fg = c.orange, bg = c.none }, + CmpItemKindEnum = { fg = c.orange, bg = c.none }, + CmpItemKindUnit = { fg = c.orange, bg = c.none }, + + CmpItemKindModule = { fg = c.yellow, bg = c.none }, + + CmpItemKindProperty = { fg = c.cyan, bg = c.none }, + CmpItemKindField = { fg = c.cyan, bg = c.none }, + CmpItemKindTypeParameter = { fg = c.cyan, bg = c.none }, + CmpItemKindEnumMember = { fg = c.cyan, bg = c.none }, + CmpItemKindOperator = { fg = c.cyan, bg = c.none }, + CmpItemKindSnippet = { fg = c.violet500, bg = c.none }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/dashboard.lua b/lua/solarized-osaka/groups/dashboard.lua new file mode 100644 index 0000000..613009a --- /dev/null +++ b/lua/solarized-osaka/groups/dashboard.lua @@ -0,0 +1,15 @@ +local M = {} + +function M.get(c, opts) + return { + DashboardShortCut = { fg = c.cyan }, + DashboardHeader = { fg = c.blue }, + DashboardCenter = { fg = c.magenta }, + DashboardFooter = { fg = c.yellow, italic = true }, + DashboardKey = { fg = c.orange500 }, + DashboardDesc = { fg = c.cyan500 }, + DashboardIcon = { fg = c.cyan500, bold = true }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/editor.lua b/lua/solarized-osaka/groups/editor.lua new file mode 100644 index 0000000..21c5676 --- /dev/null +++ b/lua/solarized-osaka/groups/editor.lua @@ -0,0 +1,112 @@ +local M = {} + +function M.get(c, options) + return { + ColorColumn = { bg = c.base02 }, -- used for the columns set with 'colorcolumn' + Conceal = { fg = c.blue500 }, -- placeholder characters substituted for concealed text (see 'conceallevel') + Cursor = { fg = c.base03, bg = c.base0 }, -- character under the cursor + lCursor = { fg = c.base03, bg = c.base00 }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') + CursorIM = { fg = c.base03, bg = c.base0 }, -- like Cursor, but used when in IME mode |CursorIM| + CursorColumn = { bg = c.base02 }, -- Screen-column at the cursor, when 'cursorcolumn' is set. + CursorLine = { bg = c.base03, sp = c.base1 }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. + Directory = { fg = c.blue500 }, -- directory names (and other special names in listings) + DiffAdd = { fg = c.green500, bg = c.base02, bold = true }, -- diff mode: Added line |diff.txt| + DiffChange = { fg = c.yellow500, bg = c.base02, bold = true }, -- diff mode: Changed line |diff.txt| + DiffDelete = { fg = c.red500, bg = c.base02, bold = true }, -- diff mode: Deleted line |diff.txt| + DiffText = { fg = c.blue500, bg = c.base02, bold = true }, -- diff mode: Changed text within a changed line |diff.txt| + EndOfBuffer = { fg = c.base01 }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. + -- TermCursor = { }, -- cursor in a focused terminal + -- TermCursorNC= { }, -- cursor in an unfocused terminal + ErrorMsg = { fg = c.red500, reverse = true }, -- error messages on the command line + VertSplit = { fg = c.base00 }, -- the column separating vertically split windows + WinSeparator = { fg = c.base02, bold = true }, -- the column separating vertically split windows + Folded = { fg = c.base0, bg = c.base02, bold = true }, -- line used for closed folds + FoldColumn = { fg = c.base0 }, -- 'foldcolumn' + SignColumn = { fg = c.base0 }, -- column where |signs| are displayed + SignColumnSB = { fg = c.base0 }, -- column where |signs| are displayed + Substitute = { fg = c.base04, bg = c.red500 }, -- |:substitute| replacement text highlighting + LineNr = { fg = c.yellow700, bg = options.transparent and c.none or c.bg }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. + CursorLineNr = { fg = c.orange500, sp = c.base1 }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. + MatchParen = { fg = c.red100, bg = c.red500, bold = true }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| + ModeMsg = { fg = c.blue500 }, -- 'showmode' message (e.g., "-- INSERT -- ") + MsgArea = { fg = c.base01 }, -- Area for messages and cmdline + -- MsgSeparator= { }, -- Separator for scrolled messages, `msgsep` flag of 'display' + MoreMsg = { fg = c.blue500 }, -- |more-prompt| + NonText = { fg = c.base00, bold = true }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|. + Normal = { fg = c.base0, bg = options.transparent and c.none or c.bg }, -- normal text + NormalNC = { fg = c.base00, bg = options.transparent and c.none or options.dim_inactive and c.base04 or c.bg }, -- normal text in non-current windows + NormalSB = { fg = c.base01, bg = c.bg_sidebar }, -- normal text in sidebar + NormalFloat = { fg = c.base0, bg = c.bg_float }, -- Normal text in floating windows. + FloatBorder = { fg = c.yellow700, bg = c.bg_float }, + FloatTitle = { fg = c.base2, bg = c.bg_float }, + Pmenu = { fg = c.base0, bg = c.base02 }, -- Popup menu: normal item. + PmenuSel = { fg = c.base01, bg = c.base2, reverse = true }, -- Popup menu: selected item. + PmenuSbar = { fg = c.base02, reverse = true }, -- Popup menu: scrollbar. + PmenuThumb = { fg = c.base0, reverse = true }, -- Popup menu: Thumb of the scrollbar. + Question = { fg = c.cyan500, bold = true }, -- |hit-enter| prompt and yes/no questions + QuickFixLine = { bg = c.blue700, bold = true }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. + Search = { fg = c.yellow500, reverse = true }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. + IncSearch = { fg = c.orange500, standout = true }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" + CurSearch = "IncSearch", + SpecialKey = { fg = c.base00 }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| + SpellBad = { sp = c.red500, undercurl = true }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. + SpellCap = { sp = c.violet500, undercurl = true }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. + SpellLocal = { sp = c.cyan500, undercurl = true }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. + SpellRare = { sp = c.yellow500, undercurl = true }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. + StatusLine = { fg = c.base1, bg = c.base03 }, -- status line of current window + StatusLineNC = { fg = c.base0, bg = c.base04 }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. + TabLine = { fg = c.base0, bg = c.base02, sp = c.base0 }, -- tab pages line, not active tab page label + TabLineFill = { fg = c.base0, bg = c.base02 }, -- tab pages line, where there are no labels + TabLineSel = { fg = c.yellow500, bg = c.bg }, -- tab pages line, active tab page label + Title = { fg = c.orange500, bold = true }, -- titles for output from ":set all", ":autocmd" etc. + Visual = { bg = c.base03, reverse = true }, -- Visual mode selection + VisualNOS = { bg = c.base03, reverse = true }, -- Visual mode selection when vim is "Not Owning the Selection". + WarningMsg = { fg = c.orange500, bold = true }, -- warning messages + Whitespace = { fg = c.base01 }, -- "nbsp", "space", "tab" and "trail" in 'listchars' + WildMenu = { fg = c.base2, bg = c.base02, reverse = true }, -- current match in 'wildmenu' completion + WinBar = "StatusLine", -- window bar + WinBarNC = "StatusLineNC", -- window bar in inactive windows + + -- These groups are for the native LSP client. Some other LSP clients may + -- use these groups, or use their own. Consult your LSP client's + -- documentation. + LspReferenceText = { bg = c.magenta900 }, -- used for highlighting "text" references + LspReferenceRead = { bg = c.magenta900 }, -- used for highlighting "read" references + LspReferenceWrite = { bg = c.magenta900 }, -- used for highlighting "write" references + LspSignatureActiveParameter = { bg = c.base03, bold = true }, + LspCodeLens = { fg = c.base01 }, + LspInlayHint = { bg = c.violet900, fg = c.violet500 }, + LspInfoBorder = { fg = c.base02, bg = c.bg_float }, + + DiagnosticError = { fg = c.error }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticWarn = { fg = c.warning }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticInfo = { fg = c.info }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticHint = { fg = c.hint }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticUnnecessary = { fg = c.base00 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + + DiagnosticVirtualTextError = { bg = c.red900, fg = c.red500 }, -- Used for "Error" diagnostic virtual text + DiagnosticVirtualTextWarn = { bg = c.yellow900, fg = c.yellow500 }, -- Used for "Warning" diagnostic virtual text + DiagnosticVirtualTextInfo = { bg = c.blue900, fg = c.blue500 }, -- Used for "Information" diagnostic virtual text + DiagnosticVirtualTextHint = { bg = c.cyan900, fg = c.cyan500 }, -- Used for "Hint" diagnostic virtual text + + DiagnosticUnderlineError = { undercurl = true, sp = c.error }, -- Used to underline "Error" diagnostics + DiagnosticUnderlineWarn = { undercurl = true, sp = c.warning }, -- Used to underline "Warning" diagnostics + DiagnosticUnderlineInfo = { undercurl = true, sp = c.info }, -- Used to underline "Information" diagnostics + DiagnosticUnderlineHint = { undercurl = true, sp = c.hint }, -- Used to underline "Hint" diagnostics + + healthError = { fg = c.error }, + healthSuccess = { fg = c.cyan }, + healthWarning = { fg = c.warning }, + + diffAdded = { fg = c.green500 }, + diffRemoved = { fg = c.red500 }, + diffChanged = { fg = c.yellow500 }, + diffOldFile = { fg = c.violet500 }, + diffNewFile = { fg = c.orange500 }, + diffFile = { fg = c.blue500 }, + diffLine = { fg = c.base01 }, + diffIndexLine = { fg = c.magenta500 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/fern.lua b/lua/solarized-osaka/groups/fern.lua new file mode 100644 index 0000000..0da1fed --- /dev/null +++ b/lua/solarized-osaka/groups/fern.lua @@ -0,0 +1,9 @@ +local M = {} + +function M.get(c, opts) + return { + FernBranchText = { fg = c.blue }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/flash.lua b/lua/solarized-osaka/groups/flash.lua new file mode 100644 index 0000000..9ada6ea --- /dev/null +++ b/lua/solarized-osaka/groups/flash.lua @@ -0,0 +1,10 @@ +local M = {} + +function M.get(c) + return { + FlashBackdrop = { fg = c.base01 }, + FlashLabel = { bg = c.magenta500, bold = true, fg = c.bg }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/gitgutter.lua b/lua/solarized-osaka/groups/gitgutter.lua new file mode 100644 index 0000000..ea7d2cd --- /dev/null +++ b/lua/solarized-osaka/groups/gitgutter.lua @@ -0,0 +1,14 @@ +local M = {} + +function M.get(c, opts) + return { + GitGutterAdd = { fg = c.green500 }, -- diff mode: Added line |diff.txt| + GitGutterChange = { fg = c.yellow500 }, -- diff mode: Changed line |diff.txt| + GitGutterDelete = { fg = c.red500 }, -- diff mode: Deleted line |diff.txt| + GitGutterAddLineNr = { fg = c.green500 }, + GitGutterChangeLineNr = { fg = c.yellow500 }, + GitGutterDeleteLineNr = { fg = c.red500 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/gitsigns.lua b/lua/solarized-osaka/groups/gitsigns.lua new file mode 100644 index 0000000..9f20158 --- /dev/null +++ b/lua/solarized-osaka/groups/gitsigns.lua @@ -0,0 +1,11 @@ +local M = {} + +function M.get(c, opts) + return { + GitSignsAdd = { fg = c.green500 }, -- diff mode: Added line |diff.txt| + GitSignsChange = { fg = c.yellow500 }, -- diff mode: Changed line |diff.txt| + GitSignsDelete = { fg = c.red500 }, -- diff mode: Deleted line |diff.txt| + } +end + +return M diff --git a/lua/solarized-osaka/groups/glyph-pallete.lua b/lua/solarized-osaka/groups/glyph-pallete.lua new file mode 100644 index 0000000..87d6ae7 --- /dev/null +++ b/lua/solarized-osaka/groups/glyph-pallete.lua @@ -0,0 +1,15 @@ +local M = {} + +function M.get(c, opts) + return { + GlyphPalette1 = { fg = c.red500 }, + GlyphPalette2 = { fg = c.green }, + GlyphPalette3 = { fg = c.yellow }, + GlyphPalette4 = { fg = c.blue }, + GlyphPalette6 = { fg = c.cyan }, + GlyphPalette7 = { fg = c.fg }, + GlyphPalette9 = { fg = c.red }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/hop.lua b/lua/solarized-osaka/groups/hop.lua new file mode 100644 index 0000000..8671e95 --- /dev/null +++ b/lua/solarized-osaka/groups/hop.lua @@ -0,0 +1,12 @@ +local M = {} + +function M.get(c, opts) + return { + HopNextKey = { fg = c.magenta500, bold = true }, + HopNextKey1 = { fg = c.violet500, bold = true }, + HopNextKey2 = { fg = c.violet700 }, + HopUnmatched = { fg = c.base01 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/illuminate.lua b/lua/solarized-osaka/groups/illuminate.lua new file mode 100644 index 0000000..ab89cdb --- /dev/null +++ b/lua/solarized-osaka/groups/illuminate.lua @@ -0,0 +1,13 @@ +local M = {} + +function M.get(c, opts) + return { + illuminatedWord = { bg = c.violet900 }, + illuminatedCurWord = { bg = c.violet900 }, + IlluminatedWordText = { bg = c.violet900 }, + IlluminatedWordRead = { bg = c.magenta900 }, + IlluminatedWordWrite = { bg = c.magenta900 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/indent-blankline.lua b/lua/solarized-osaka/groups/indent-blankline.lua new file mode 100644 index 0000000..c0ae02a --- /dev/null +++ b/lua/solarized-osaka/groups/indent-blankline.lua @@ -0,0 +1,11 @@ +local M = {} + +function M.get(c, opts) + return { + IblIndent = { fg = c.base03, nocombine = true }, + IndentBlanklineChar = { fg = c.base03, nocombine = true }, + IndentBlanklineContextChar = { fg = c.orange500, nocombine = true }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/lazy.lua b/lua/solarized-osaka/groups/lazy.lua new file mode 100644 index 0000000..c432d56 --- /dev/null +++ b/lua/solarized-osaka/groups/lazy.lua @@ -0,0 +1,10 @@ +local M = {} + +function M.get(c, opts) + return { + LazyProgressDone = { bold = true, fg = c.magenta500 }, + LazyProgressTodo = { bold = true, fg = c.base01 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/leap.lua b/lua/solarized-osaka/groups/leap.lua new file mode 100644 index 0000000..25ed1f3 --- /dev/null +++ b/lua/solarized-osaka/groups/leap.lua @@ -0,0 +1,11 @@ +local M = {} + +function M.get(c, opts) + return { + LeapMatch = { bg = c.magenta500, fg = c.fg, bold = true }, + LeapLabel = { fg = c.magenta500, bold = true }, + LeapBackdrop = { fg = c.base01 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/lightspeed.lua b/lua/solarized-osaka/groups/lightspeed.lua new file mode 100644 index 0000000..df2d5ce --- /dev/null +++ b/lua/solarized-osaka/groups/lightspeed.lua @@ -0,0 +1,21 @@ +local M = {} + +function M.get(c, opts) + return { + LightspeedGreyWash = { fg = c.base01 }, + -- LightspeedCursor = { link = "Cursor" }, + LightspeedLabel = { fg = c.magenta500, bold = true, underline = true }, + LightspeedLabelDistant = { fg = c.cyan, bold = true, underline = true }, + LightspeedLabelDistantOverlapped = { fg = c.cyan500, underline = true }, + LightspeedLabelOverlapped = { fg = c.magenta500, underline = true }, + LightspeedMaskedChar = { fg = c.orange }, + LightspeedOneCharMatch = { bg = c.magenta500, fg = c.fg, bold = true }, + LightspeedPendingOpArea = { bg = c.magenta500, fg = c.fg }, + LightspeedShortcut = { bg = c.magenta500, fg = c.fg, bold = true, underline = true }, + -- LightspeedShortcutOverlapped = { link = "LightspeedShortcut" }, + -- LightspeedUniqueChar = { link = "LightspeedUnlabeledMatch" }, + LightspeedUnlabeledMatch = { fg = c.violet500, bold = true }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/lspsaga.lua b/lua/solarized-osaka/groups/lspsaga.lua new file mode 100644 index 0000000..ed4ce0b --- /dev/null +++ b/lua/solarized-osaka/groups/lspsaga.lua @@ -0,0 +1,26 @@ +local M = {} + +function M.get(c, opts) + return { + DiagnosticWarning = { link = "DiagnosticWarn" }, + DiagnosticInformation = { link = "DiagnosticInfo" }, + LspFloatWinNormal = { bg = c.bg_float }, + LspFloatWinBorder = { fg = c.base02 }, + LspSagaBorderTitle = { fg = c.cyan }, + LspSagaHoverBorder = { fg = c.blue }, + LspSagaRenameBorder = { fg = c.green }, + LspSagaDefPreviewBorder = { fg = c.green }, + LspSagaCodeActionBorder = { fg = c.blue }, + LspSagaFinderSelection = { fg = c.base03 }, + LspSagaCodeActionTitle = { fg = c.cyan }, + LspSagaCodeActionContent = { fg = c.violet500 }, + LspSagaSignatureHelpBorder = { fg = c.red }, + ReferencesCount = { fg = c.violet500 }, + DefinitionCount = { fg = c.violet500 }, + DefinitionIcon = { fg = c.blue }, + ReferencesIcon = { fg = c.blue }, + TargetWord = { fg = c.cyan500 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_animate.lua b/lua/solarized-osaka/groups/mini_animate.lua new file mode 100644 index 0000000..31cca8a --- /dev/null +++ b/lua/solarized-osaka/groups/mini_animate.lua @@ -0,0 +1,10 @@ +local M = {} + +function M.get(c, opts) + return { + MiniAnimateCursor = { reverse = true, nocombine = true }, + MiniAnimateNormalFloat = "NormalFloat", + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_clue.lua b/lua/solarized-osaka/groups/mini_clue.lua new file mode 100644 index 0000000..00f02f1 --- /dev/null +++ b/lua/solarized-osaka/groups/mini_clue.lua @@ -0,0 +1,15 @@ +local M = {} + +function M.get(c, opts) + return { + MiniClueBorder = "FloatBorder", + MiniClueDescGroup = "DiagnosticFloatingWarn", + MiniClueDescSingle = "NormalFloat", + MiniClueNextKey = "DiagnosticFloatingHint", + MiniClueNextKeyWithPostkeys = "DiagnosticFloatingError", + MiniClueSeparator = "DiagnosticFloatingInfo", + MiniClueTitle = "FloatTitle", + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_completion.lua b/lua/solarized-osaka/groups/mini_completion.lua new file mode 100644 index 0000000..cf8b470 --- /dev/null +++ b/lua/solarized-osaka/groups/mini_completion.lua @@ -0,0 +1,9 @@ +local M = {} + +function M.get(c, opts) + return { + MiniCompletionActiveParameter = "LspSignatureActiveParameter", + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_cursorword.lua b/lua/solarized-osaka/groups/mini_cursorword.lua new file mode 100644 index 0000000..9a2fb0d --- /dev/null +++ b/lua/solarized-osaka/groups/mini_cursorword.lua @@ -0,0 +1,10 @@ +local M = {} + +function M.get(c, opts) + return { + MiniCursorword = { underline = true }, + MiniCursorwordCurrent = { underline = true }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_deps.lua b/lua/solarized-osaka/groups/mini_deps.lua new file mode 100644 index 0000000..a8e89c5 --- /dev/null +++ b/lua/solarized-osaka/groups/mini_deps.lua @@ -0,0 +1,18 @@ +local M = {} + +function M.get(c, opts) + return { + MiniDepsChangeAdded = "diffAdded", + MiniDepsChangeRemoved = "diffRemoved", + MiniDepsHint = "DiagnosticHint", + MiniDepsInfo = "DiagnosticInfo", + MiniDepsMsgBreaking = "DiagnosticWarn", + MiniDepsPlaceholder = "Comment", + MiniDepsTitle = "Title", + MiniDepsTitleError = "DiffDelete", + MiniDepsTitleSame = "DiffText", + MiniDepsTitleUpdate = "DiffAdd", + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_diff.lua b/lua/solarized-osaka/groups/mini_diff.lua new file mode 100644 index 0000000..2cffe44 --- /dev/null +++ b/lua/solarized-osaka/groups/mini_diff.lua @@ -0,0 +1,15 @@ +local M = {} + +function M.get(c, opts) + return { + MiniDiffOverAdd = "DiffAdd", + MiniDiffOverChange = "DiffText", + MiniDiffOverContext = "DiffChange", + MiniDiffOverDelete = "DiffDelete", + MiniDiffSignAdd = { fg = c.green500 }, + MiniDiffSignChange = { fg = c.yellow500 }, + MiniDiffSignDelete = { fg = c.red500 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_files.lua b/lua/solarized-osaka/groups/mini_files.lua new file mode 100644 index 0000000..2d87625 --- /dev/null +++ b/lua/solarized-osaka/groups/mini_files.lua @@ -0,0 +1,16 @@ +local M = {} + +function M.get(c, opts) + return { + MiniFilesBorder = "FloatBorder", + MiniFilesBorderModified = "DiagnosticFloatingWarn", + MiniFilesCursorLine = "CursorLine", + MiniFilesDirectory = "Directory", + MiniFilesFile = { fg = c.fg }, + MiniFilesNormal = "NormalFloat", + MiniFilesTitle = "FloatTitle", + MiniFilesTitleFocused = { fg = c.hint, bg = c.bg_float }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_hipatterns.lua b/lua/solarized-osaka/groups/mini_hipatterns.lua new file mode 100644 index 0000000..18a2e68 --- /dev/null +++ b/lua/solarized-osaka/groups/mini_hipatterns.lua @@ -0,0 +1,12 @@ +local M = {} + +function M.get(c, opts) + return { + MiniHipatternsFixme = { fg = c.bg, bg = c.error, bold = true }, + MiniHipatternsHack = { fg = c.bg, bg = c.warning, bold = true }, + MiniHipatternsNote = { fg = c.bg, bg = c.info, bold = true }, + MiniHipatternsTodo = { fg = c.bg, bg = c.hint, bold = true }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_icons.lua b/lua/solarized-osaka/groups/mini_icons.lua new file mode 100644 index 0000000..dd4db19 --- /dev/null +++ b/lua/solarized-osaka/groups/mini_icons.lua @@ -0,0 +1,17 @@ +local M = {} + +function M.get(c, opts) + return { + MiniIconsAzure = { fg = c.blue300 }, + MiniIconsBlue = { fg = c.blue }, + MiniIconsCyan = { fg = c.cyan }, + MiniIconsGreen = { fg = c.green }, + MiniIconsGrey = { fg = c.base2 }, + MiniIconsOrange = { fg = c.orange }, + MiniIconsPurple = { fg = c.violet }, + MiniIconsRed = { fg = c.red }, + MiniIconsYellow = { fg = c.yellow }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_indentscope.lua b/lua/solarized-osaka/groups/mini_indentscope.lua new file mode 100644 index 0000000..55cdf95 --- /dev/null +++ b/lua/solarized-osaka/groups/mini_indentscope.lua @@ -0,0 +1,10 @@ +local M = {} + +function M.get(c, opts) + return { + MiniIndentscopeSymbol = { fg = c.violet700, nocombine = true }, + MiniIndentscopeSymbolOff = { fg = c.warning, nocombine = true }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_jump.lua b/lua/solarized-osaka/groups/mini_jump.lua new file mode 100644 index 0000000..3c0dd81 --- /dev/null +++ b/lua/solarized-osaka/groups/mini_jump.lua @@ -0,0 +1,13 @@ +local M = {} + +function M.get(c, opts) + return { + MiniJump = { bg = c.magenta500, fg = c.base4 }, + MiniJump2dDim = { fg = c.base01 }, + MiniJump2dSpot = { fg = c.magenta500, bold = true, nocombine = true }, + MiniJump2dSpotAhead = { fg = c.cyan500, bg = c.black, nocombine = true }, + MiniJump2dSpotUnique = { fg = c.yellow500, bold = true, nocombine = true }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_map.lua b/lua/solarized-osaka/groups/mini_map.lua new file mode 100644 index 0000000..dc7cc0c --- /dev/null +++ b/lua/solarized-osaka/groups/mini_map.lua @@ -0,0 +1,12 @@ +local M = {} + +function M.get(c, opts) + return { + MiniMapNormal = "NormalFloat", + MiniMapSymbolCount = "Special", + MiniMapSymbolLine = "Title", + MiniMapSymbolView = "Delimiter", + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_notify.lua b/lua/solarized-osaka/groups/mini_notify.lua new file mode 100644 index 0000000..970be12 --- /dev/null +++ b/lua/solarized-osaka/groups/mini_notify.lua @@ -0,0 +1,11 @@ +local M = {} + +function M.get(c, opts) + return { + MiniNotifyBorder = "FloatBorder", + MiniNotifyNormal = "NormalFloat", + MiniNotifyTitle = "FloatTitle", + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_operators.lua b/lua/solarized-osaka/groups/mini_operators.lua new file mode 100644 index 0000000..21bc7e4 --- /dev/null +++ b/lua/solarized-osaka/groups/mini_operators.lua @@ -0,0 +1,9 @@ +local M = {} + +function M.get(c, opts) + return { + MiniOperatorsExchangeFrom = "IncSearch", + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_pick.lua b/lua/solarized-osaka/groups/mini_pick.lua new file mode 100644 index 0000000..5448dfd --- /dev/null +++ b/lua/solarized-osaka/groups/mini_pick.lua @@ -0,0 +1,21 @@ +local M = {} + +function M.get(c, opts) + return { + MiniPickBorder = "FloatBorder", + MiniPickBorderBusy = "DiagnosticFloatingWarn", + MiniPickBorderText = "FloatTitle", + MiniPickHeader = "DiagnosticFloatingHint", + MiniPickIconDirectory = "Directory", + MiniPickIconFile = "MiniPickNormal", + MiniPickMatchCurrent = "CursorLine", + MiniPickMatchMarked = "Visual", + MiniPickMatchRanges = "DiagnosticFloatingHint", + MiniPickNormal = "NormalFloat", + MiniPickPreviewLine = "CursorLine", + MiniPickPreviewRegion = "IncSearch", + MiniPickPrompt = "DiagnosticFloatingInfo", + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_starter.lua b/lua/solarized-osaka/groups/mini_starter.lua new file mode 100644 index 0000000..a6a42a9 --- /dev/null +++ b/lua/solarized-osaka/groups/mini_starter.lua @@ -0,0 +1,17 @@ +local M = {} + +function M.get(c, opts) + return { + MiniStarterCurrent = { nocombine = true }, + MiniStarterFooter = { fg = c.yellow, italic = true }, + MiniStarterHeader = { fg = c.blue }, + MiniStarterInactive = { fg = c.base01, style = opts.styles.comments }, + MiniStarterItem = { fg = c.fg, bg = opts.transparent and c.none or c.bg }, + MiniStarterItemBullet = { fg = c.base01 }, + MiniStarterItemPrefix = { fg = c.warning }, + MiniStarterSection = { fg = c.violet500 }, + MiniStarterQuery = { fg = c.info }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_statusline.lua b/lua/solarized-osaka/groups/mini_statusline.lua new file mode 100644 index 0000000..ce5b9a1 --- /dev/null +++ b/lua/solarized-osaka/groups/mini_statusline.lua @@ -0,0 +1,18 @@ +local M = {} + +function M.get(c, opts) + return { + MiniStatuslineDevinfo = { fg = c.base01, bg = c.bg_highlight }, + MiniStatuslineFileinfo = { fg = c.base01, bg = c.bg_highlight }, + MiniStatuslineFilename = { fg = c.base01, bg = c.bg_highlight }, + MiniStatuslineInactive = { fg = c.blue, bg = c.bg_statusline }, + MiniStatuslineModeCommand = { fg = c.black, bg = c.yellow, bold = true }, + MiniStatuslineModeInsert = { fg = c.black, bg = c.green, bold = true }, + MiniStatuslineModeNormal = { fg = c.black, bg = c.blue, bold = true }, + MiniStatuslineModeOther = { fg = c.black, bg = c.cyan500, bold = true }, + MiniStatuslineModeReplace = { fg = c.black, bg = c.red, bold = true }, + MiniStatuslineModeVisual = { fg = c.black, bg = c.magenta, bold = true }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_surround.lua b/lua/solarized-osaka/groups/mini_surround.lua new file mode 100644 index 0000000..89ded01 --- /dev/null +++ b/lua/solarized-osaka/groups/mini_surround.lua @@ -0,0 +1,9 @@ +local M = {} + +function M.get(c, opts) + return { + MiniSurround = { bg = c.orange, fg = c.black }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_tabline.lua b/lua/solarized-osaka/groups/mini_tabline.lua new file mode 100644 index 0000000..90e0e26 --- /dev/null +++ b/lua/solarized-osaka/groups/mini_tabline.lua @@ -0,0 +1,16 @@ +local M = {} + +function M.get(c, opts) + return { + MiniTablineCurrent = { fg = c.fg, bg = c.base02, bold = true }, + MiniTablineFill = { bg = c.black }, + MiniTablineHidden = { fg = c.violet500, bg = c.bg_statusline }, + MiniTablineModifiedCurrent = { fg = c.base02, bg = c.fg, bold = true }, + MiniTablineModifiedHidden = { fg = c.bg_statusline, bg = c.violet500 }, + MiniTablineModifiedVisible = { fg = c.bg_statusline, bg = c.fg }, + MiniTablineTabpagesection = { bg = c.bg_statusline, fg = c.none }, + MiniTablineVisible = { fg = c.fg, bg = c.bg_statusline }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_test.lua b/lua/solarized-osaka/groups/mini_test.lua new file mode 100644 index 0000000..4147b62 --- /dev/null +++ b/lua/solarized-osaka/groups/mini_test.lua @@ -0,0 +1,11 @@ +local M = {} + +function M.get(c, opts) + return { + MiniTestEmphasis = { bold = true }, + MiniTestFail = { fg = c.red, bold = true }, + MiniTestPass = { fg = c.green, bold = true }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/mini_trailspace.lua b/lua/solarized-osaka/groups/mini_trailspace.lua new file mode 100644 index 0000000..5a30195 --- /dev/null +++ b/lua/solarized-osaka/groups/mini_trailspace.lua @@ -0,0 +1,9 @@ +local M = {} + +function M.get(c, opts) + return { + MiniTrailspace = { bg = c.red }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/navic.lua b/lua/solarized-osaka/groups/navic.lua new file mode 100644 index 0000000..0b6ae0c --- /dev/null +++ b/lua/solarized-osaka/groups/navic.lua @@ -0,0 +1,37 @@ +local M = {} + +function M.get(c, opts) + return { + NavicIconsFile = { fg = c.fg, bg = c.bg_statusline }, + NavicIconsModule = { fg = c.yellow, bg = c.bg_statusline }, + NavicIconsNamespace = { fg = c.fg, bg = c.bg_statusline }, + NavicIconsPackage = { fg = c.fg, bg = c.bg_statusline }, + NavicIconsClass = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsMethod = { fg = c.blue, bg = c.bg_statusline }, + NavicIconsProperty = { fg = c.cyan, bg = c.bg_statusline }, + NavicIconsField = { fg = c.cyan, bg = c.bg_statusline }, + NavicIconsConstructor = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsEnum = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsInterface = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsFunction = { fg = c.blue, bg = c.bg_statusline }, + NavicIconsVariable = { fg = c.magenta, bg = c.bg_statusline }, + NavicIconsConstant = { fg = c.magenta, bg = c.bg_statusline }, + NavicIconsString = { fg = c.green, bg = c.bg_statusline }, + NavicIconsNumber = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsBoolean = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsArray = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsObject = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsKey = { fg = c.violet500, bg = c.bg_statusline }, + NavicIconsKeyword = { fg = c.violet500, bg = c.bg_statusline }, + NavicIconsNull = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsEnumMember = { fg = c.cyan, bg = c.bg_statusline }, + NavicIconsStruct = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsEvent = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsOperator = { fg = c.fg, bg = c.bg_statusline }, + NavicIconsTypeParameter = { fg = c.cyan, bg = c.bg_statusline }, + NavicText = { fg = c.fg, bg = c.bg_statusline }, + NavicSeparator = { fg = c.fg, bg = c.bg_statusline }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/neo-tree.lua b/lua/solarized-osaka/groups/neo-tree.lua new file mode 100644 index 0000000..71adfab --- /dev/null +++ b/lua/solarized-osaka/groups/neo-tree.lua @@ -0,0 +1,12 @@ +local M = {} + +function M.get(c, opts) + return { + NeoTreeNormal = { fg = c.base00, bg = c.bg_sidebar }, + NeoTreeNormalNC = { fg = c.base00, bg = c.bg_sidebar }, + NeoTreeDimText = { fg = c.base01 }, + NeoTreeMessage = { fg = c.base01 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/neogit.lua b/lua/solarized-osaka/groups/neogit.lua new file mode 100644 index 0000000..4a8e15e --- /dev/null +++ b/lua/solarized-osaka/groups/neogit.lua @@ -0,0 +1,15 @@ +local M = {} + +function M.get(c, opts) + return { + NeogitBranch = { fg = c.magenta500 }, + NeogitRemote = { fg = c.violet500 }, + NeogitHunkHeader = { fg = c.base0, bg = c.base02 }, + NeogitHunkHeaderHighlight = { fg = c.blue500, bg = c.base02 }, + NeogitDiffContextHighlight = { fg = c.base00, bg = c.base02 }, + NeogitDiffDeleteHighlight = { fg = c.red500, bg = c.red900 }, + NeogitDiffAddHighlight = { fg = c.green500, bg = c.green900 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/neotest.lua b/lua/solarized-osaka/groups/neotest.lua new file mode 100644 index 0000000..f4d5138 --- /dev/null +++ b/lua/solarized-osaka/groups/neotest.lua @@ -0,0 +1,25 @@ +local M = {} + +function M.get(c, opts) + return { + NeotestPassed = { fg = c.green500 }, + NeotestRunning = { fg = c.yellow500 }, + NeotestFailed = { fg = c.red500 }, + NeotestSkipped = { fg = c.blue500 }, + NeotestTest = { fg = c.base00 }, + NeotestNamespace = { fg = c.cyan500 }, + NeotestFocused = { fg = c.yellow500 }, + NeotestFile = { fg = c.cyan500 }, + NeotestDir = { fg = c.blue500 }, + NeotestBorder = { fg = c.blue500 }, + NeotestIndent = { fg = c.base00 }, + NeotestExpandMarker = { fg = c.base0 }, + NeotestAdapterName = { fg = c.violet500, bold = true }, + NeotestWinSelect = { fg = c.blue500 }, + NeotestMarked = { fg = c.blue500 }, + NeotestTarget = { fg = c.blue500 }, + --[[ NeotestUnknown = {}, ]] + } +end + +return M diff --git a/lua/solarized-osaka/groups/noice.lua b/lua/solarized-osaka/groups/noice.lua new file mode 100644 index 0000000..7ca5c7b --- /dev/null +++ b/lua/solarized-osaka/groups/noice.lua @@ -0,0 +1,9 @@ +local M = {} + +function M.get(c, opts) + return { + NoiceCompletionItemKindDefault = { fg = c.base01, bg = c.none }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/notify.lua b/lua/solarized-osaka/groups/notify.lua new file mode 100644 index 0000000..bcc86ab --- /dev/null +++ b/lua/solarized-osaka/groups/notify.lua @@ -0,0 +1,35 @@ +local Util = require("solarized-osaka.util") + +local M = {} + +function M.get(c, opts) + return { + NotifyBackground = { fg = c.fg, bg = c.bg }, + --- Border + NotifyERRORBorder = { fg = Util.darken(c.error, 0.3), bg = opts.transparent and c.none or c.bg }, + NotifyWARNBorder = { fg = Util.darken(c.warning, 0.3), bg = opts.transparent and c.none or c.bg }, + NotifyINFOBorder = { fg = Util.darken(c.info, 0.3), bg = opts.transparent and c.none or c.bg }, + NotifyDEBUGBorder = { fg = Util.darken(c.base01, 0.3), bg = opts.transparent and c.none or c.bg }, + NotifyTRACEBorder = { fg = Util.darken(c.violet500, 0.3), bg = opts.transparent and c.none or c.bg }, + --- Icons + NotifyERRORIcon = { fg = c.error }, + NotifyWARNIcon = { fg = c.warning }, + NotifyINFOIcon = { fg = c.info }, + NotifyDEBUGIcon = { fg = c.base01 }, + NotifyTRACEIcon = { fg = c.violet500 }, + --- Title + NotifyERRORTitle = { fg = c.error }, + NotifyWARNTitle = { fg = c.warning }, + NotifyINFOTitle = { fg = c.info }, + NotifyDEBUGTitle = { fg = c.base01 }, + NotifyTRACETitle = { fg = c.violet500 }, + --- Body + NotifyERRORBody = { fg = c.fg, bg = opts.transparent and c.none or c.bg }, + NotifyWARNBody = { fg = c.fg, bg = opts.transparent and c.none or c.bg }, + NotifyINFOBody = { fg = c.fg, bg = opts.transparent and c.none or c.bg }, + NotifyDEBUGBody = { fg = c.fg, bg = opts.transparent and c.none or c.bg }, + NotifyTRACEBody = { fg = c.fg, bg = opts.transparent and c.none or c.bg }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/nvim-tree.lua b/lua/solarized-osaka/groups/nvim-tree.lua new file mode 100644 index 0000000..ef790e6 --- /dev/null +++ b/lua/solarized-osaka/groups/nvim-tree.lua @@ -0,0 +1,25 @@ +local M = {} + +function M.get(c, opts) + return { + NvimTreeNormal = { fg = c.base00, bg = c.bg_sidebar }, + NvimTreeWinSeparator = { + fg = opts.styles.sidebars == "transparent" and c.border or c.bg_sidebar, + bg = c.bg_sidebar, + }, + NvimTreeNormalNC = { fg = c.base00, bg = c.bg_sidebar }, + NvimTreeRootFolder = { fg = c.blue, bold = true }, + NvimTreeGitDirty = { fg = c.yellow500 }, + NvimTreeGitNew = { fg = c.green500 }, + NvimTreeGitDeleted = { fg = c.red500 }, + NvimTreeOpenedFile = { bg = c.bg_highlight }, + NvimTreeSpecialFile = { fg = c.violet500, underline = true }, + NvimTreeIndentMarker = { fg = c.base02 }, + NvimTreeImageFile = { fg = c.base00 }, + NvimTreeSymlink = { fg = c.blue }, + NvimTreeFolderIcon = { bg = c.none, fg = c.blue }, + -- NvimTreeFolderName= { fg = c.fg_float }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/nvim-ts-rainbow.lua b/lua/solarized-osaka/groups/nvim-ts-rainbow.lua new file mode 100644 index 0000000..6982839 --- /dev/null +++ b/lua/solarized-osaka/groups/nvim-ts-rainbow.lua @@ -0,0 +1,15 @@ +local M = {} + +function M.get(c, opts) + return { + rainbowcol1 = { fg = c.red500 }, + rainbowcol2 = { fg = c.orange500 }, + rainbowcol3 = { fg = c.yellow500 }, + rainbowcol4 = { fg = c.green500 }, + rainbowcol5 = { fg = c.cyan500 }, + rainbowcol6 = { fg = c.blue500 }, + rainbowcol7 = { fg = c.magenta500 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/nvim-ts-rainbow2.lua b/lua/solarized-osaka/groups/nvim-ts-rainbow2.lua new file mode 100644 index 0000000..71adfab --- /dev/null +++ b/lua/solarized-osaka/groups/nvim-ts-rainbow2.lua @@ -0,0 +1,12 @@ +local M = {} + +function M.get(c, opts) + return { + NeoTreeNormal = { fg = c.base00, bg = c.bg_sidebar }, + NeoTreeNormalNC = { fg = c.base00, bg = c.bg_sidebar }, + NeoTreeDimText = { fg = c.base01 }, + NeoTreeMessage = { fg = c.base01 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/rainbow-delimiters.lua b/lua/solarized-osaka/groups/rainbow-delimiters.lua new file mode 100644 index 0000000..71adfab --- /dev/null +++ b/lua/solarized-osaka/groups/rainbow-delimiters.lua @@ -0,0 +1,12 @@ +local M = {} + +function M.get(c, opts) + return { + NeoTreeNormal = { fg = c.base00, bg = c.bg_sidebar }, + NeoTreeNormalNC = { fg = c.base00, bg = c.bg_sidebar }, + NeoTreeDimText = { fg = c.base01 }, + NeoTreeMessage = { fg = c.base01 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/scrollbar.lua b/lua/solarized-osaka/groups/scrollbar.lua new file mode 100644 index 0000000..400d372 --- /dev/null +++ b/lua/solarized-osaka/groups/scrollbar.lua @@ -0,0 +1,27 @@ +local M = {} + +function M.get(c, opts) + return { + ScrollbarHandle = { fg = c.none, bg = c.bg_highlight }, + + ScrollbarSearchHandle = { fg = c.orange, bg = c.bg_highlight }, + ScrollbarSearch = { fg = c.orange, bg = c.none }, + + ScrollbarErrorHandle = { fg = c.error, bg = c.bg_highlight }, + ScrollbarError = { fg = c.error, bg = c.none }, + + ScrollbarWarnHandle = { fg = c.warning, bg = c.bg_highlight }, + ScrollbarWarn = { fg = c.warning, bg = c.none }, + + ScrollbarInfoHandle = { fg = c.info, bg = c.bg_highlight }, + ScrollbarInfo = { fg = c.info, bg = c.none }, + + ScrollbarHintHandle = { fg = c.hint, bg = c.bg_highlight }, + ScrollbarHint = { fg = c.hint, bg = c.none }, + + ScrollbarMiscHandle = { fg = c.violet500, bg = c.bg_highlight }, + ScrollbarMisc = { fg = c.violet500, bg = c.none }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/semantic_tokens.lua b/lua/solarized-osaka/groups/semantic_tokens.lua new file mode 100644 index 0000000..91281f3 --- /dev/null +++ b/lua/solarized-osaka/groups/semantic_tokens.lua @@ -0,0 +1,51 @@ +local M = {} + +function M.get(c) + return { + ["@lsp.type.boolean"] = "@boolean", + ["@lsp.type.builtinType"] = "@type.builtin", + ["@lsp.type.comment"] = "@comment", + ["@lsp.type.decorator"] = "@attribute", + ["@lsp.type.deriveHelper"] = "@attribute", + ["@lsp.type.enum"] = "@type", + ["@lsp.type.enumMember"] = "@constant", + ["@lsp.type.escapeSequence"] = "@string.escape", + ["@lsp.type.formatSpecifier"] = "@markup.list", + ["@lsp.type.generic"] = "@variable", + ["@lsp.type.interface"] = { fg = c.blue500 }, + ["@lsp.type.keyword"] = "@keyword", + ["@lsp.type.lifetime"] = "@keyword.storage", + ["@lsp.type.namespace"] = "@module", + ["@lsp.type.number"] = "@number", + ["@lsp.type.operator"] = "@operator", + ["@lsp.type.parameter"] = "@variable.parameter", + ["@lsp.type.property"] = "@property", + ["@lsp.type.selfKeyword"] = "@variable.builtin", + ["@lsp.type.selfTypeKeyword"] = "@variable.builtin", + ["@lsp.type.string"] = "@string", + ["@lsp.type.typeAlias"] = "@type.definition", + ["@lsp.type.unresolvedReference"] = { undercurl = true, sp = c.error }, + ["@lsp.type.variable"] = {}, -- use treesitter styles for regular variables + ["@lsp.typemod.class.defaultLibrary"] = "@type.builtin", + ["@lsp.typemod.enum.defaultLibrary"] = "@type.builtin", + ["@lsp.typemod.enumMember.defaultLibrary"] = "@constant.builtin", + ["@lsp.typemod.function.defaultLibrary"] = "@function.builtin", + ["@lsp.typemod.keyword.async"] = "@keyword.coroutine", + ["@lsp.typemod.keyword.injected"] = "@keyword", + ["@lsp.typemod.macro.defaultLibrary"] = "@function.builtin", + ["@lsp.typemod.method.defaultLibrary"] = "@function.builtin", + ["@lsp.typemod.operator.injected"] = "@operator", + ["@lsp.typemod.string.injected"] = "@string", + ["@lsp.typemod.struct.defaultLibrary"] = "@type.builtin", + ["@lsp.typemod.type.defaultLibrary"] = { fg = c.blue500 }, + ["@lsp.typemod.typeAlias.defaultLibrary"] = { fg = c.blue500 }, + ["@lsp.typemod.variable.callable"] = "@function", + ["@lsp.typemod.variable.defaultLibrary"] = "@variable.builtin", + ["@lsp.typemod.variable.injected"] = "@variable", + ["@lsp.typemod.variable.static"] = "@constant", + -- NOTE: maybe add these with distinct highlights? + -- ["@lsp.typemod.variable.globalScope"] (global variables) + } +end + +return M diff --git a/lua/solarized-osaka/groups/snacks.lua b/lua/solarized-osaka/groups/snacks.lua new file mode 100644 index 0000000..7da134b --- /dev/null +++ b/lua/solarized-osaka/groups/snacks.lua @@ -0,0 +1,19 @@ +local M = {} + +function M.get(c, opts) + return { + SnacksDashboardDesc = { fg = c.cyan500 }, + SnacksDashboardKey = { fg = c.orange500 }, + SnacksDashboardFooter = { fg = c.yellow, italic = true }, + SnacksDashboardSpecial = { fg = c.yellow500 }, + SnacksDashboardHeader = { fg = c.blue }, + SnacksDashboardIcon = { fg = c.cyan500, bold = true }, + SnacksNotifierBorderTrace = { fg = c.magenta500 }, + SnacksNotifierIconTrace = { fg = c.magenta500 }, + SnacksNotifierTitleTrace = { fg = c.magenta500 }, + SnacksIndentScope = { fg = c.violet700, nocombine = true }, + SnacksIndent = { fg = c.base03, nocombine = true }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/sneak.lua b/lua/solarized-osaka/groups/sneak.lua new file mode 100644 index 0000000..d56b9e8 --- /dev/null +++ b/lua/solarized-osaka/groups/sneak.lua @@ -0,0 +1,10 @@ +local M = {} + +function M.get(c, opts) + return { + Sneak = { fg = c.bg_highlight, bg = c.magenta }, + SneakScope = { bg = c.base03 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/syntax.lua b/lua/solarized-osaka/groups/syntax.lua new file mode 100644 index 0000000..7000230 --- /dev/null +++ b/lua/solarized-osaka/groups/syntax.lua @@ -0,0 +1,60 @@ +local M = {} + +function M.get(c, opts) + return { + Comment = { fg = c.base01, style = opts.styles.comments }, -- any comment + Constant = { fg = c.cyan500 }, -- (preferred) any constant + String = { fg = c.cyan500 }, -- a string constant: "this is a string" + Character = "Constant", -- a character constant: 'c', '\n' + -- Number = { }, -- a number constant: 234, 0xff + -- Boolean = { }, -- a boolean constant: TRUE, false + -- Float = { }, -- a floating point constant: 2.3e10 + + Identifier = { fg = c.blue500, style = opts.styles.variables }, -- (preferred) any variable name + Function = { fg = c.blue500, style = opts.styles.functions }, -- function name (also: methods for classes) + + Statement = { fg = c.green500 }, -- (preferred) any statement + -- Conditional = { }, -- if, then, else, endif, switch, etc. + -- Repeat = { }, -- for, do, while, etc. + -- Label = { }, -- case, default, etc. + Operator = { fg = c.green500 }, -- "sizeof", "+", "*", etc. + Keyword = { fg = c.green500, style = opts.styles.keywords }, -- any other keyword + -- Exception = { }, -- try, catch, throw + + PreProc = { fg = c.red500 }, -- (preferred) generic Preprocessor + -- Include = { }, -- preprocessor #include + -- Define = { }, -- preprocessor #define + -- Macro = { }, -- same as Define + -- PreCondit = { }, -- preprocessor #if, #else, #endif, etc. + + Type = { fg = c.yellow500 }, -- (preferred) int, long, char, etc. + -- StorageClass = { }, -- static, register, volatile, etc. + -- Structure = { }, -- struct, union, enum, etc. + -- Typedef = { }, -- A typedef + + Special = { fg = c.orange500 }, -- (preferred) any special symbol + -- SpecialChar = { }, -- special character in a constant + -- Tag = { }, -- you can use CTRL-] on this + -- Delimiter = { }, -- character that needs attention + -- SpecialComment= { }, -- special things inside a comment + Debug = { fg = c.orange500 }, -- debugging statements + htmlH1 = { fg = c.magenta500, bold = true }, + htmlH2 = { fg = c.blue500, bold = true }, + + -- mkdHeading = { fg = c.orange, bold = true }, + mkdCode = { bg = c.green900 }, + mkdCodeDelimiter = { fg = c.base0, bg = c.green700 }, + mkdCodeStart = { fg = c.orange500, bold = true }, + mkdCodeEnd = { fg = c.orange500, bold = true }, + -- mkdLink = { fg = c.blue, underline = true }, + + markdownHeadingDelimiter = { fg = c.orange500, bold = true }, + markdownCode = { fg = c.yellow500, bg = c.green900 }, + markdownCodeBlock = { fg = c.yellow500, bg = c.green900 }, + markdownH1 = { fg = c.magenta500, bold = true }, + markdownH2 = { fg = c.violet500, bold = true }, + markdownLinkText = { fg = c.blue500, underline = true }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/telescope.lua b/lua/solarized-osaka/groups/telescope.lua new file mode 100644 index 0000000..e96f6e8 --- /dev/null +++ b/lua/solarized-osaka/groups/telescope.lua @@ -0,0 +1,10 @@ +local M = {} + +function M.get(c) + return { + TelescopeBorder = { fg = c.base02, bg = c.bg_float }, + TelescopeNormal = { fg = c.base0, bg = c.bg_float }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/treesitter-context.lua b/lua/solarized-osaka/groups/treesitter-context.lua new file mode 100644 index 0000000..5e41e13 --- /dev/null +++ b/lua/solarized-osaka/groups/treesitter-context.lua @@ -0,0 +1,9 @@ +local M = {} + +function M.get(c, opts) + return { + TreesitterContext = { bg = c.violet900 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/treesitter.lua b/lua/solarized-osaka/groups/treesitter.lua new file mode 100644 index 0000000..329d967 --- /dev/null +++ b/lua/solarized-osaka/groups/treesitter.lua @@ -0,0 +1,140 @@ +local M = {} + +function M.get(c, opts) + return { + ["@annotation"] = "PreProc", + ["@attribute"] = "PreProc", + ["@boolean"] = "Boolean", + ["@character"] = "Character", + ["@character.special"] = "SpecialChar", + ["@comment"] = "Comment", + ["@keyword.conditional"] = "Conditional", + ["@constant"] = "Constant", + ["@constant.builtin"] = "Special", + ["@constant.macro"] = "Define", + ["@keyword.debug"] = "Debug", + ["@keyword.directive.define"] = "Define", + ["@keyword.exception"] = "Exception", + ["@number.float"] = "Float", + ["@function"] = "Function", + ["@function.builtin"] = "Special", + ["@function.call"] = "@function", + ["@function.macro"] = "Macro", + ["@keyword.import"] = "Include", + ["@keyword.coroutine"] = "@keyword", + ["@keyword.operator"] = "@operator", + ["@keyword.return"] = "@keyword", + ["@function.method"] = "Function", + ["@function.method.call"] = "@function.method", + ["@namespace.builtin"] = "@variable.builtin", + ["@none"] = {}, + ["@number"] = "Number", + ["@keyword.directive"] = "PreProc", + ["@keyword.repeat"] = "Repeat", + ["@keyword.storage"] = "StorageClass", + ["@string"] = "String", + ["@markup.link.label"] = "SpecialChar", + ["@markup.link.label.symbol"] = "Identifier", + ["@tag"] = "Label", + ["@tag.attribute"] = "@property", + ["@tag.delimiter"] = "Delimiter", + ["@markup"] = "@none", + ["@markup.environment"] = "Macro", + ["@markup.environment.name"] = "Type", + ["@markup.raw"] = "String", + ["@markup.math"] = "Special", + ["@markup.strong"] = { bold = true }, + ["@markup.italic"] = { italic = true }, + ["@markup.strikethrough"] = { strikethrough = true }, + ["@markup.underline"] = { underline = true }, + ["@markup.heading"] = "Title", + ["@comment.note"] = { fg = c.hint }, + ["@comment.error"] = { fg = c.error }, + ["@comment.hint"] = { fg = c.hint }, + ["@comment.info"] = { fg = c.info }, + ["@comment.warning"] = { fg = c.warning }, + ["@comment.todo"] = { fg = c.todo }, + ["@markup.link.url"] = "Underlined", + ["@type"] = "Type", + ["@type.definition"] = "Typedef", + ["@type.qualifier"] = "@keyword", + + -- Misc + -- TODO: + -- ["@comment.documentation"] = { }, + -- ["@operator"] = { fg = c.green500 }, -- For any operator: `+`, but also `->` and `*` in C. + + -- Punctuation + ["@punctuation.delimiter"] = { fg = c.green500 }, -- For delimiters ie: `.` + ["@punctuation.bracket"] = { fg = c.orange500 }, -- For brackets and parens. + ["@punctuation.special"] = { fg = c.orange500 }, -- For special punctutation that does not fall in the catagories before. + ["@punctuation.special.markdown"] = { fg = c.orange500, bold = true }, + ["@markup.list"] = { fg = c.blue500 }, -- For special punctutation that does not fall in the catagories before. + ["@markup.list.markdown"] = { fg = c.orange500, bold = true }, + + -- Literals + ["@string.documentation"] = { fg = c.cyan500 }, + ["@string.regexp"] = { fg = c.cyan300 }, -- For regexes. + ["@string.escape"] = { fg = c.orange700 }, -- For escape characters within a string. + + -- Functions + ["@constructor"] = { fg = c.orange500 }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. + ["@variable.parameter"] = { fg = c.orange500 }, -- For parameters of a function. + ["@variable.parameter.builtin"] = { fg = c.yellow300 }, -- For builtin parameters of a function, e.g. "..." or Smali's p[1-99] + + -- Keywords + ["@keyword"] = { fg = c.green500, style = opts.styles.keywords }, -- For keywords that don't fall in previous categories. + ["@keyword.function"] = { fg = c.green500, style = opts.styles.functions }, -- For keywords used to define a fuction. + + ["@label"] = { fg = c.green500 }, -- For labels: `label:` in C and `:label:` in Lua. + + -- Types + ["@type.builtin"] = "Type", + ["@variable.member"] = { fg = c.cyan500 }, -- For fields. + ["@property"] = "Identifier", + + -- Identifiers + ["@variable"] = { fg = c.base0, style = opts.styles.variables }, -- Any variable name that does not have another highlight. + ["@variable.builtin"] = { fg = c.orange500 }, -- Variable names that are defined by the languages, like `this` or `self`. + ["@module.builtin"] = { fg = c.orange500 }, -- Variable names that are defined by the languages, like `this` or `self`. + + -- Text + ["@markup.raw.markdown"] = { fg = c.blue }, + ["@markup.raw.markdown_inline"] = { fg = c.yellow500, bg = c.green900 }, + ["@markup.link"] = { fg = c.blue500, underline = true }, + + ["@markup.list.unchecked"] = { fg = c.yellow500 }, -- For brackets and parens. + ["@markup.list.checked"] = { fg = c.green500 }, -- For brackets and parens. + + ["@diff.plus"] = "DiffAdd", + ["@diff.minus"] = "DiffDelete", + ["@diff.delta"] = "DiffChange", + + ["@module"] = "Include", + + -- tsx + ["@constructor.tsx"] = { fg = c.blue500 }, + ["@tag.delimiter.tsx"] = { fg = c.orange500 }, + ["@tag.tsx"] = { fg = c.yellow500 }, + ["@keyword.return.tsx"] = { fg = c.green500, italic = true }, + ["@keyword.tsx"] = { fg = c.green500, italic = true }, + + -- typescript + ["@variable.typescript"] = { fg = c.yellow500 }, + + -- Vue + ["@tag.delimiter.vue"] = { fg = c.orange500 }, + + -- html + ["@tag.delimiter.html"] = { fg = c.orange500 }, + + -- javascriptreact + ["@keyword.javascript"] = { fg = c.green500, italic = true }, + ["@keyword.return.javascript"] = { fg = c.green500, italic = true }, + ["@tag.delimiter.javascript"] = { fg = c.orange500 }, + ["@tag.javascript"] = { fg = c.yellow500 }, + ["@variable.javascript"] = { fg = c.yellow500 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/trouble.lua b/lua/solarized-osaka/groups/trouble.lua new file mode 100644 index 0000000..5f9fb7b --- /dev/null +++ b/lua/solarized-osaka/groups/trouble.lua @@ -0,0 +1,11 @@ +local M = {} + +function M.get(c, opts) + return { + TroubleText = { fg = c.base0 }, + TroubleCount = { fg = c.magenta500 }, + TroubleNormal = { fg = c.base0 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/ts-node-action.lua b/lua/solarized-osaka/groups/ts-node-action.lua new file mode 100644 index 0000000..ee22173 --- /dev/null +++ b/lua/solarized-osaka/groups/ts-node-action.lua @@ -0,0 +1,10 @@ +local M = {} + +function M.get(c, opts) + return { + TSNodeKey = { fg = c.magenta500, bold = true }, + TSNodeUnmatched = { fg = c.base01 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/which-key.lua b/lua/solarized-osaka/groups/which-key.lua new file mode 100644 index 0000000..498491b --- /dev/null +++ b/lua/solarized-osaka/groups/which-key.lua @@ -0,0 +1,15 @@ +local M = {} + +function M.get(c, opts) + return { + WhichKey = { fg = c.cyan }, + WhichKeyGroup = { fg = c.blue }, + WhichKeyDesc = { fg = c.magenta }, + WhichKeySeperator = { fg = c.base01 }, + WhichKeySeparator = { fg = c.base01 }, + WhichKeyFloat = { bg = c.bg_sidebar }, + WhichKeyValue = { fg = c.violet500 }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/yanky.lua b/lua/solarized-osaka/groups/yanky.lua new file mode 100644 index 0000000..10420d1 --- /dev/null +++ b/lua/solarized-osaka/groups/yanky.lua @@ -0,0 +1,10 @@ +local M = {} + +function M.get(c, opts) + return { + YankyPut = "IncSearch", + YankyYanked = "IncSearch", + } +end + +return M From dbfd92eba51452683f8f2bea7a37a6f29309accc Mon Sep 17 00:00:00 2001 From: Miroslav Lincovschi Date: Wed, 18 Dec 2024 02:47:52 +0300 Subject: [PATCH 02/18] feat: add `index.lua` file in groups folder --- lua/solarized-osaka/groups/init.lua | 133 ++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 lua/solarized-osaka/groups/init.lua diff --git a/lua/solarized-osaka/groups/init.lua b/lua/solarized-osaka/groups/init.lua new file mode 100644 index 0000000..e0d4b19 --- /dev/null +++ b/lua/solarized-osaka/groups/init.lua @@ -0,0 +1,133 @@ +local Util = require("solarized-osaka.util") + +local M = {} + +-- stylua: ignore +M.plugins = { + ["alpha-nvim"] = "alpha", + ["barbar.nvim"] = "barbar", + ["bufferline.nvim"] = "bufferline", + ["dashboard-nvim"] = "dashboard", + ["flash.nvim"] = "flash", + ["vim-fern"] = "fern", + ["gitsigns.nvim"] = "gitsigns", + ["hop.nvim"] = "hop", + ["indent-blankline.nvim"] = "indent-blankline", + ["leap.nvim"] = "leap", + ["lspsaga.nvim"] = "lspsaga", + ["lightspeed"] = "lightspeed", + ["mini.animate"] = "mini_animate", + ["mini.clue"] = "mini_clue", + ["mini.completion"] = "mini_completion", + ["mini.cursorword"] = "mini_cursorword", + ["mini.deps"] = "mini_deps", + ["mini.diff"] = "mini_diff", + ["mini.files"] = "mini_files", + ["mini.hipatterns"] = "mini_hipatterns", + ["mini.icons"] = "mini_icons", + ["mini.indentscope"] = "mini_indentscope", + ["mini.jump"] = "mini_jump", + ["mini.map"] = "mini_map", + ["mini.notify"] = "mini_notify", + ["mini.operators"] = "mini_operators", + ["mini.pick"] = "mini_pick", + ["mini.starter"] = "mini_starter", + ["mini.statusline"] = "mini_statusline", + ["mini.surround"] = "mini_surround", + ["mini.tabline"] = "mini_tabline", + ["mini.test"] = "mini_test", + ["mini.trailspace"] = "mini_trailspace", + ["neo-tree.nvim"] = "neo-tree", + ["neogit"] = "neogit", + ["neotest"] = "neotest", + ["noice.nvim"] = "noice", + ["nvim-cmp"] = "cmp", + ["nvim-navic"] = "navic", + ["nvim-notify"] = "notify", + ["nvim-scrollbar"] = "scrollbar", + ["nvim-tree.lua"] = "nvim-tree", + ["nvim-treesitter-context"] = "treesitter-context", + ["nvim-ts-rainbow"] = "nvim-ts-rainbow", + ["nvim-ts-rainbow2"] = "nvim-ts-rainbow2", + ["ts-node-action"] = "ts-node-action", + ["rainbow-delimiters.nvim"] = "rainbow", + ["snacks.nvim"] = "snacks", + ["telescope.nvim"] = "telescope", + ["trouble.nvim"] = "trouble", + ["vim-gitgutter"] = "gitgutter", + ["vim-glyph-palette"] = "glyph-palette", + ["vim-illuminate"] = "illuminate", + ["vim-sneak"] = "sneak", + ["which-key.nvim"] = "which-key", + ["yanky.nvim"] = "yanky" +} + +function M.get_group(name) + return Util.mod("solarized-osaka.groups." .. name) +end + +function M.get(name, colors, opts) + local mod = M.get_group(name) + return mod.get(colors, opts) +end + +function M.setup(colors, opts) + local groups = { + editor = true, + syntax = true, + semantic_tokens = true, + treesitter = true, + } + if opts.plugins.all then + for _, group in pairs(M.plugins) do + groups[group] = true + end + elseif opts.plugins.auto and package.loaded.lazy then + local plugins = require("lazy.core.config").plugins + for plugin, group in pairs(M.plugins) do + if plugins[plugin] then + groups[group] = true + end + end + + -- special case for mini.nvim + if plugins["mini.nvim"] then + for _, group in pairs(M.plugins) do + if group:find("^mini_") then + groups[group] = true + end + end + end + end + + -- manually enable/disable plugins + for plugin, group in pairs(M.plugins) do + local use = opts.plugins[group] + use = use == nil and opts.plugins[plugin] or use + if use ~= nil then + if type(use) == "table" then + use = use.enabled + end + groups[group] = use or nil + end + end + + local names = vim.tbl_keys(groups) + table.sort(names) + + local ret = {} + + for group in pairs(groups) do + for k, v in pairs(M.get(group, colors, opts)) do + ret[k] = v + end + end + + Util.resolve(ret) + + opts.on_highlights(ret, colors) + + return ret, groups +end + +return M From e14e5af69068ca47e6252014ff5c26e57ed9f435 Mon Sep 17 00:00:00 2001 From: Miroslav Lincovschi Date: Wed, 18 Dec 2024 02:49:20 +0300 Subject: [PATCH 03/18] refactor: refactor `theme.lua` and `util.lua` --- lua/solarized-osaka/theme.lua | 997 ++-------------------------------- lua/solarized-osaka/util.lua | 105 +--- 2 files changed, 55 insertions(+), 1047 deletions(-) diff --git a/lua/solarized-osaka/theme.lua b/lua/solarized-osaka/theme.lua index a562016..9766878 100644 --- a/lua/solarized-osaka/theme.lua +++ b/lua/solarized-osaka/theme.lua @@ -1,980 +1,59 @@ local util = require("solarized-osaka.util") -local colors = require("solarized-osaka.colors") local M = {} --- ----@class Highlight ----@field fg string|nil ----@field bg string|nil ----@field sp string|nil ----@field style string|nil|Highlight ----@alias Highlights table - ----@return Theme function M.setup() - local config = require("solarized-osaka.config") - local options = config.options - ---@class Theme - ---@field highlights Highlights - local theme = { - config = options, - colors = colors.setup(), - } - - local c = theme.colors - - theme.highlights = { - Comment = { fg = c.base01, style = options.styles.comments }, -- any comment - ColorColumn = { bg = c.base02 }, -- used for the columns set with 'colorcolumn' - Conceal = { fg = c.blue500 }, -- placeholder characters substituted for concealed text (see 'conceallevel') - Cursor = { fg = c.base03, bg = c.base0 }, -- character under the cursor - lCursor = { fg = c.base03, bg = c.base00 }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') - CursorIM = { fg = c.base03, bg = c.base0 }, -- like Cursor, but used when in IME mode |CursorIM| - CursorColumn = { bg = c.base02 }, -- Screen-column at the cursor, when 'cursorcolumn' is set. - CursorLine = { bg = c.base03, sp = c.base1 }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. - Directory = { fg = c.blue500 }, -- directory names (and other special names in listings) - DiffAdd = { fg = c.green500, bg = c.base02, bold = true }, -- diff mode: Added line |diff.txt| - DiffChange = { fg = c.yellow500, bg = c.base02, bold = true }, -- diff mode: Changed line |diff.txt| - DiffDelete = { fg = c.red500, bg = c.base02, bold = true }, -- diff mode: Deleted line |diff.txt| - DiffText = { fg = c.blue500, bg = c.base02, bold = true }, -- diff mode: Changed text within a changed line |diff.txt| - EndOfBuffer = { fg = c.base01 }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. - -- TermCursor = { }, -- cursor in a focused terminal - -- TermCursorNC= { }, -- cursor in an unfocused terminal - ErrorMsg = { fg = c.red500, reverse = true }, -- error messages on the command line - VertSplit = { fg = c.base00 }, -- the column separating vertically split windows - WinSeparator = { fg = c.base02, bold = true }, -- the column separating vertically split windows - Folded = { fg = c.base0, bg = c.base02, bold = true }, -- line used for closed folds - FoldColumn = { fg = c.base0 }, -- 'foldcolumn' - SignColumn = { fg = c.base0 }, -- column where |signs| are displayed - SignColumnSB = { fg = c.base0 }, -- column where |signs| are displayed - Substitute = { fg = c.base04, bg = c.red500 }, -- |:substitute| replacement text highlighting - LineNr = { fg = c.yellow700, bg = options.transparent and c.none or c.bg }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. - CursorLineNr = { fg = c.orange500, sp = c.base1 }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. - MatchParen = { fg = c.red100, bg = c.red500, bold = true }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| - ModeMsg = { fg = c.blue500 }, -- 'showmode' message (e.g., "-- INSERT -- ") - MsgArea = { fg = c.base01 }, -- Area for messages and cmdline - -- MsgSeparator= { }, -- Separator for scrolled messages, `msgsep` flag of 'display' - MoreMsg = { fg = c.blue500 }, -- |more-prompt| - NonText = { fg = c.base00, bold = true }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|. - Normal = { fg = c.base0, bg = options.transparent and c.none or c.bg }, -- normal text - NormalNC = { fg = c.base00, bg = options.transparent and c.none or options.dim_inactive and c.base04 or c.bg }, -- normal text in non-current windows - NormalSB = { fg = c.base01, bg = c.bg_sidebar }, -- normal text in sidebar - NormalFloat = { fg = c.base0, bg = c.bg_float }, -- Normal text in floating windows. - FloatBorder = { fg = c.yellow700, bg = c.bg_float }, - FloatTitle = { fg = c.base2, bg = c.bg_float }, - Pmenu = { fg = c.base0, bg = c.base02 }, -- Popup menu: normal item. - PmenuSel = { fg = c.base01, bg = c.base2, reverse = true }, -- Popup menu: selected item. - PmenuSbar = { fg = c.base02, reverse = true }, -- Popup menu: scrollbar. - PmenuThumb = { fg = c.base0, reverse = true }, -- Popup menu: Thumb of the scrollbar. - Question = { fg = c.cyan500, bold = true }, -- |hit-enter| prompt and yes/no questions - QuickFixLine = { bg = c.blue700, bold = true }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. - Search = { fg = c.yellow500, reverse = true }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. - IncSearch = { fg = c.orange500, standout = true }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" - CurSearch = { link = "IncSearch" }, - SpecialKey = { fg = c.base00 }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| - SpellBad = { sp = c.red500, undercurl = true }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. - SpellCap = { sp = c.violet500, undercurl = true }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. - SpellLocal = { sp = c.cyan500, undercurl = true }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. - SpellRare = { sp = c.yellow500, undercurl = true }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. - StatusLine = { fg = c.base1, bg = c.base03 }, -- status line of current window - StatusLineNC = { fg = c.base0, bg = c.base04 }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. - TabLine = { fg = c.base0, bg = c.base02, sp = c.base0 }, -- tab pages line, not active tab page label - TabLineFill = { fg = c.base0, bg = c.base02 }, -- tab pages line, where there are no labels - TabLineSel = { fg = c.yellow500, bg = c.bg }, -- tab pages line, active tab page label - Title = { fg = c.orange500, bold = true }, -- titles for output from ":set all", ":autocmd" etc. - Visual = { bg = c.base03, reverse = true }, -- Visual mode selection - VisualNOS = { bg = c.base03, reverse = true }, -- Visual mode selection when vim is "Not Owning the Selection". - WarningMsg = { fg = c.orange500, bold = true }, -- warning messages - Whitespace = { fg = c.base01 }, -- "nbsp", "space", "tab" and "trail" in 'listchars' - WildMenu = { fg = c.base2, bg = c.base02, reverse = true }, -- current match in 'wildmenu' completion - WinBar = { link = "StatusLine" }, -- window bar - WinBarNC = { link = "StatusLineNC" }, -- window bar in inactive windows - - -- These groups are not listed as default vim groups, - -- but they are defacto standard group names for syntax highlighting. - -- commented out groups should chain up to their "preferred" group by - -- default, - -- Uncomment and edit if you want more specific syntax highlighting. - - Constant = { fg = c.cyan500 }, -- (preferred) any constant - String = { fg = c.cyan500 }, -- a string constant: "this is a string" - Character = { link = "Constant" }, -- a character constant: 'c', '\n' - -- Number = { }, -- a number constant: 234, 0xff - -- Boolean = { }, -- a boolean constant: TRUE, false - -- Float = { }, -- a floating point constant: 2.3e10 - - Identifier = { fg = c.blue500, style = options.styles.variables }, -- (preferred) any variable name - Function = { fg = c.blue500, style = options.styles.functions }, -- function name (also: methods for classes) - - Statement = { fg = c.green500 }, -- (preferred) any statement - -- Conditional = { }, -- if, then, else, endif, switch, etc. - -- Repeat = { }, -- for, do, while, etc. - -- Label = { }, -- case, default, etc. - Operator = { fg = c.green500 }, -- "sizeof", "+", "*", etc. - Keyword = { fg = c.green500, style = options.styles.keywords }, -- any other keyword - -- Exception = { }, -- try, catch, throw - - PreProc = { fg = c.red500 }, -- (preferred) generic Preprocessor - -- Include = { }, -- preprocessor #include - -- Define = { }, -- preprocessor #define - -- Macro = { }, -- same as Define - -- PreCondit = { }, -- preprocessor #if, #else, #endif, etc. - - Type = { fg = c.yellow500 }, -- (preferred) int, long, char, etc. - -- StorageClass = { }, -- static, register, volatile, etc. - -- Structure = { }, -- struct, union, enum, etc. - -- Typedef = { }, -- A typedef - - Special = { fg = c.orange500 }, -- (preferred) any special symbol - -- SpecialChar = { }, -- special character in a constant - -- Tag = { }, -- you can use CTRL-] on this - -- Delimiter = { }, -- character that needs attention - -- SpecialComment= { }, -- special things inside a comment - Debug = { fg = c.orange500 }, -- debugging statements - - Underlined = { underline = true }, -- (preferred) text that stands out, HTML links - Bold = { bold = true }, - Italic = { italic = true }, - - -- ("Ignore", below, may be invisible...) - -- Ignore = { }, -- (preferred) left blank, hidden |hl-Ignore| - - Error = { fg = c.red500 }, -- (preferred) any erroneous construct - Todo = { fg = c.magenta500, bold = true }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX - - qfLineNr = { fg = c.base0 }, - qfFileName = { fg = c.violet500 }, - - htmlH1 = { fg = c.magenta500, bold = true }, - htmlH2 = { fg = c.blue500, bold = true }, - - -- mkdHeading = { fg = c.orange, bold = true }, - mkdCode = { bg = c.green900 }, - mkdCodeDelimiter = { fg = c.base0, bg = c.green700 }, - mkdCodeStart = { fg = c.orange500, bold = true }, - mkdCodeEnd = { fg = c.orange500, bold = true }, - -- mkdLink = { fg = c.blue, underline = true }, - - markdownHeadingDelimiter = { fg = c.orange500, bold = true }, - markdownCode = { fg = c.yellow500, bg = c.green900 }, - markdownCodeBlock = { fg = c.yellow500, bg = c.green900 }, - markdownH1 = { fg = c.magenta500, bold = true }, - markdownH2 = { fg = c.violet500, bold = true }, - markdownLinkText = { fg = c.blue500, underline = true }, - - ["helpCommand"] = { fg = c.blue500, bg = c.blue900 }, - - debugPC = { bg = c.bg_sidebar }, -- used for highlighting the current line in terminal-debug - debugBreakpoint = { fg = c.blue300, bg = c.blue700 }, -- used for breakpoint colors in terminal-debug - - dosIniLabel = { link = "@property" }, - - -- These groups are for the native LSP client. Some other LSP clients may - -- use these groups, or use their own. Consult your LSP client's - -- documentation. - LspReferenceText = { bg = c.magenta900 }, -- used for highlighting "text" references - LspReferenceRead = { bg = c.magenta900 }, -- used for highlighting "read" references - LspReferenceWrite = { bg = c.magenta900 }, -- used for highlighting "write" references - - DiagnosticError = { fg = c.error }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticWarn = { fg = c.warning }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticInfo = { fg = c.info }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticHint = { fg = c.hint }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticUnnecessary = { fg = c.base00 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - - DiagnosticVirtualTextError = { bg = c.red900, fg = c.red500 }, -- Used for "Error" diagnostic virtual text - DiagnosticVirtualTextWarn = { bg = c.yellow900, fg = c.yellow500 }, -- Used for "Warning" diagnostic virtual text - DiagnosticVirtualTextInfo = { bg = c.blue900, fg = c.blue500 }, -- Used for "Information" diagnostic virtual text - DiagnosticVirtualTextHint = { bg = c.cyan900, fg = c.cyan500 }, -- Used for "Hint" diagnostic virtual text - - DiagnosticUnderlineError = { undercurl = true, sp = c.error }, -- Used to underline "Error" diagnostics - DiagnosticUnderlineWarn = { undercurl = true, sp = c.warning }, -- Used to underline "Warning" diagnostics - DiagnosticUnderlineInfo = { undercurl = true, sp = c.info }, -- Used to underline "Information" diagnostics - DiagnosticUnderlineHint = { undercurl = true, sp = c.hint }, -- Used to underline "Hint" diagnostics - - LspSignatureActiveParameter = { bg = c.base03, bold = true }, - LspCodeLens = { fg = c.base01 }, - LspInlayHint = { bg = c.violet900, fg = c.violet500 }, - - LspInfoBorder = { fg = c.base02, bg = c.bg_float }, - - DapStoppedLine = { bg = c.yellow700 }, -- Used for "Warning" diagnostic virtual text - - -- These groups are for the Neovim tree-sitter highlights. - ["@annotation"] = { link = "PreProc" }, - ["@attribute"] = { link = "PreProc" }, - ["@boolean"] = { link = "Boolean" }, - ["@character"] = { link = "Character" }, - ["@character.special"] = { link = "SpecialChar" }, - ["@comment"] = { link = "Comment" }, - ["@keyword.conditional"] = { link = "Conditional" }, - ["@constant"] = { link = "Constant" }, - ["@constant.builtin"] = { link = "Special" }, - ["@constant.macro"] = { link = "Define" }, - ["@keyword.debug"] = { link = "Debug" }, - ["@keyword.directive.define"] = { link = "Define" }, - ["@keyword.exception"] = { link = "Exception" }, - ["@number.float"] = { link = "Float" }, - ["@function"] = { link = "Function" }, - ["@function.builtin"] = { link = "Special" }, - ["@function.call"] = { link = "@function" }, - ["@function.macro"] = { link = "Macro" }, - ["@keyword.import"] = { link = "Include" }, - ["@keyword.coroutine"] = { link = "@keyword" }, - ["@keyword.operator"] = { link = "@operator" }, - ["@keyword.return"] = { link = "@keyword" }, - ["@function.method"] = { link = "Function" }, - ["@function.method.call"] = { link = "@function.method" }, - ["@namespace.builtin"] = { link = "@variable.builtin" }, - ["@none"] = {}, - ["@number"] = { link = "Number" }, - ["@keyword.directive"] = { link = "PreProc" }, - ["@keyword.repeat"] = { link = "Repeat" }, - ["@keyword.storage"] = { link = "StorageClass" }, - ["@string"] = { link = "String" }, - ["@markup.link.label"] = { link = "SpecialChar" }, - ["@markup.link.label.symbol"] = { link = "Identifier" }, - ["@tag"] = { link = "Label" }, - ["@tag.attribute"] = { link = "@property" }, - ["@tag.delimiter"] = { link = "Delimiter" }, - ["@markup"] = { link = "@none" }, - ["@markup.environment"] = { link = "Macro" }, - ["@markup.environment.name"] = { link = "Type" }, - ["@markup.raw"] = { link = "String" }, - ["@markup.math"] = { link = "Special" }, - ["@markup.strong"] = { bold = true }, - ["@markup.italic"] = { italic = true }, - ["@markup.strikethrough"] = { strikethrough = true }, - ["@markup.underline"] = { underline = true }, - ["@markup.heading"] = { link = "Title" }, - ["@comment.note"] = { fg = c.hint }, - ["@comment.error"] = { fg = c.error }, - ["@comment.hint"] = { fg = c.hint }, - ["@comment.info"] = { fg = c.info }, - ["@comment.warning"] = { fg = c.warning }, - ["@comment.todo"] = { fg = c.todo }, - ["@markup.link.url"] = { link = "Underlined" }, - ["@type"] = { link = "Type" }, - ["@type.definition"] = { link = "Typedef" }, - ["@type.qualifier"] = { link = "@keyword" }, - - --- Misc - -- TODO: - -- ["@comment.documentation"] = { }, - ["@operator"] = { fg = c.green500 }, -- For any operator: `+`, but also `->` and `*` in C. - - --- Punctuation - ["@punctuation.delimiter"] = { fg = c.green500 }, -- For delimiters ie: `.` - ["@punctuation.bracket"] = { fg = c.orange500 }, -- For brackets and parens. - ["@punctuation.special"] = { fg = c.orange500 }, -- For special punctutation that does not fall in the catagories before. - ["@punctuation.special.markdown"] = { fg = c.orange500, bold = true }, - ["@markup.list"] = { fg = c.blue500 }, -- For special punctutation that does not fall in the catagories before. - ["@markup.list.markdown"] = { fg = c.orange500, bold = true }, - - --- Literals - ["@string.documentation"] = { fg = c.cyan500 }, - ["@string.regexp"] = { fg = c.cyan300 }, -- For regexes. - ["@string.escape"] = { fg = c.orange700 }, -- For escape characters within a string. - - --- Functions - ["@constructor"] = { fg = c.orange500 }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. - ["@variable.parameter"] = { fg = c.orange500 }, -- For parameters of a function. - ["@variable.parameter.builtin"] = { fg = c.yellow300 }, -- For builtin parameters of a function, e.g. "..." or Smali's p[1-99] - - --- Keywords - ["@keyword"] = { fg = c.green500, style = options.styles.keywords }, -- For keywords that don't fall in previous categories. - ["@keyword.function"] = { fg = c.green500, style = options.styles.functions }, -- For keywords used to define a fuction. - - ["@label"] = { fg = c.green500 }, -- For labels: `label:` in C and `:label:` in Lua. - - --- Types - ["@type.builtin"] = { link = "Type" }, - ["@variable.member"] = { fg = c.cyan500 }, -- For fields. - ["@property"] = { link = "Identifier" }, - - --- Identifiers - ["@variable"] = { fg = c.base0, style = options.styles.variables }, -- Any variable name that does not have another highlight. - ["@variable.builtin"] = { fg = c.orange500 }, -- Variable names that are defined by the languages, like `this` or `self`. - ["@module.builtin"] = { fg = c.orange500 }, -- Variable names that are defined by the languages, like `this` or `self`. - - --- Text - -- ["@markup.raw.markdown"] = { fg = c.blue }, - ["@markup.raw.markdown_inline"] = { fg = c.yellow500, bg = c.green900 }, - ["@markup.link"] = { fg = c.blue500, underline = true }, - - ["@markup.list.unchecked"] = { fg = c.yellow500 }, -- For brackets and parens. - ["@markup.list.checked"] = { fg = c.green500 }, -- For brackets and parens. - - ["@diff.plus"] = { link = "DiffAdd" }, - ["@diff.minus"] = { link = "DiffDelete" }, - ["@diff.delta"] = { link = "DiffChange" }, - - ["@module"] = { link = "Include" }, - - -- tsx - ["@constructor.tsx"] = { fg = c.blue500 }, - ["@tag.delimiter.tsx"] = { fg = c.orange500 }, - ["@tag.tsx"] = { fg = c.yellow500 }, - ["@keyword.return.tsx"] = { fg = c.green500, style = "italic" }, - ["@keyword.tsx"] = { fg = c.green500, style = "italic" }, - - -- typescript - ["@variable.typescript"] = { fg = c.yellow500 }, - - -- Vue - ["@tag.delimiter.vue"] = { fg = c.orange500 }, - - -- html - ["@tag.delimiter.html"] = { fg = c.orange500 }, - - -- javascriptreact - ["@keyword.javascript"] = { fg = c.green500, style = "italic" }, - ["@keyword.return.javascript"] = { fg = c.green500, style = "italic" }, - ["@tag.delimiter.javascript"] = { fg = c.orange500 }, - ["@tag.javascript"] = { fg = c.yellow500 }, - ["@variable.javascript"] = { fg = c.yellow500 }, - - -- LSP Semantic Token Groups - ["@lsp.type.boolean"] = { link = "@boolean" }, - ["@lsp.type.builtinType"] = { link = "@type.builtin" }, - ["@lsp.type.comment"] = { link = "@comment" }, - ["@lsp.type.decorator"] = { link = "@attribute" }, - ["@lsp.type.deriveHelper"] = { link = "@attribute" }, - ["@lsp.type.enum"] = { link = "@type" }, - ["@lsp.type.enumMember"] = { link = "@constant" }, - ["@lsp.type.escapeSequence"] = { link = "@string.escape" }, - ["@lsp.type.formatSpecifier"] = { link = "@markup.list" }, - ["@lsp.type.generic"] = { link = "@variable" }, - ["@lsp.type.interface"] = { fg = c.blue500 }, - ["@lsp.type.keyword"] = { link = "@keyword" }, - ["@lsp.type.lifetime"] = { link = "@keyword.storage" }, - ["@lsp.type.namespace"] = { link = "@module" }, - ["@lsp.type.number"] = { link = "@number" }, - ["@lsp.type.operator"] = { link = "@operator" }, - ["@lsp.type.parameter"] = { link = "@variable.parameter" }, - ["@lsp.type.property"] = { link = "@property" }, - ["@lsp.type.selfKeyword"] = { link = "@variable.builtin" }, - ["@lsp.type.selfTypeKeyword"] = { link = "@variable.builtin" }, - ["@lsp.type.string"] = { link = "@string" }, - ["@lsp.type.typeAlias"] = { link = "@type.definition" }, - ["@lsp.type.unresolvedReference"] = { undercurl = true, sp = c.error }, - ["@lsp.type.variable"] = {}, -- use treesitter styles for regular variables - ["@lsp.typemod.class.defaultLibrary"] = { link = "@type.builtin" }, - ["@lsp.typemod.enum.defaultLibrary"] = { link = "@type.builtin" }, - ["@lsp.typemod.enumMember.defaultLibrary"] = { link = "@constant.builtin" }, - ["@lsp.typemod.function.defaultLibrary"] = { link = "@function.builtin" }, - ["@lsp.typemod.keyword.async"] = { link = "@keyword.coroutine" }, - ["@lsp.typemod.keyword.injected"] = { link = "@keyword" }, - ["@lsp.typemod.macro.defaultLibrary"] = { link = "@function.builtin" }, - ["@lsp.typemod.method.defaultLibrary"] = { link = "@function.builtin" }, - ["@lsp.typemod.operator.injected"] = { link = "@operator" }, - ["@lsp.typemod.string.injected"] = { link = "@string" }, - ["@lsp.typemod.struct.defaultLibrary"] = { link = "@type.builtin" }, - ["@lsp.typemod.type.defaultLibrary"] = { fg = c.blue500 }, - ["@lsp.typemod.typeAlias.defaultLibrary"] = { fg = c.blue500 }, - ["@lsp.typemod.variable.callable"] = { link = "@function" }, - ["@lsp.typemod.variable.defaultLibrary"] = { link = "@variable.builtin" }, - ["@lsp.typemod.variable.injected"] = { link = "@variable" }, - ["@lsp.typemod.variable.static"] = { link = "@constant" }, - -- NOTE: maybe add these with distinct highlights? - -- ["@lsp.typemod.variable.globalScope"] (global variables) - - -- ts-rainbow - rainbowcol1 = { fg = c.red500 }, - rainbowcol2 = { fg = c.orange500 }, - rainbowcol3 = { fg = c.yellow500 }, - rainbowcol4 = { fg = c.green500 }, - rainbowcol5 = { fg = c.cyan500 }, - rainbowcol6 = { fg = c.blue500 }, - rainbowcol7 = { fg = c.magenta500 }, - - -- ts-rainbow2 (maintained fork) - TSRainbowRed = { fg = c.red }, - TSRainbowOrange = { fg = c.orange }, - TSRainbowYellow = { fg = c.yellow }, - TSRainbowGreen = { fg = c.green }, - TSRainbowBlue = { fg = c.blue }, - TSRainbowViolet = { fg = c.violet500 }, - TSRainbowCyan = { fg = c.cyan }, - - -- rainbow-delimiters - RainbowDelimiterRed = { fg = c.red }, - RainbowDelimiterOrange = { fg = c.orange }, - RainbowDelimiterYellow = { fg = c.yellow }, - RainbowDelimiterGreen = { fg = c.green }, - RainbowDelimiterBlue = { fg = c.blue }, - RainbowDelimiterViolet = { fg = c.violet }, - RainbowDelimiterCyan = { fg = c.cyan }, - - -- LspTrouble - TroubleText = { fg = c.base0 }, - TroubleCount = { fg = c.magenta500 }, - TroubleNormal = { fg = c.base0 }, - - -- Illuminate - illuminatedWord = { bg = c.violet900 }, - illuminatedCurWord = { bg = c.violet900 }, - IlluminatedWordText = { bg = c.violet900 }, - IlluminatedWordRead = { bg = c.magenta900 }, - IlluminatedWordWrite = { bg = c.magenta900 }, - - -- diff - diffAdded = { fg = c.green500 }, - diffRemoved = { fg = c.red500 }, - diffChanged = { fg = c.yellow500 }, - diffOldFile = { fg = c.violet500 }, - diffNewFile = { fg = c.orange500 }, - diffFile = { fg = c.blue500 }, - diffLine = { fg = c.base01 }, - diffIndexLine = { fg = c.magenta500 }, - - -- Neogit - NeogitBranch = { fg = c.magenta500 }, - NeogitRemote = { fg = c.violet500 }, - NeogitHunkHeader = { fg = c.base0, bg = c.base02 }, - NeogitHunkHeaderHighlight = { fg = c.blue500, bg = c.base02 }, - NeogitDiffContextHighlight = { fg = c.base00, bg = c.base02 }, - NeogitDiffDeleteHighlight = { fg = c.red500, bg = c.red900 }, - NeogitDiffAddHighlight = { fg = c.green500, bg = c.green900 }, - - -- Neotest - NeotestPassed = { fg = c.green500 }, - NeotestRunning = { fg = c.yellow500 }, - NeotestFailed = { fg = c.red500 }, - NeotestSkipped = { fg = c.blue500 }, - NeotestTest = { fg = c.base00 }, - NeotestNamespace = { fg = c.cyan500 }, - NeotestFocused = { fg = c.yellow500 }, - NeotestFile = { fg = c.cyan500 }, - NeotestDir = { fg = c.blue500 }, - NeotestBorder = { fg = c.blue500 }, - NeotestIndent = { fg = c.base00 }, - NeotestExpandMarker = { fg = c.base0 }, - NeotestAdapterName = { fg = c.violet500, bold = true }, - NeotestWinSelect = { fg = c.blue500 }, - NeotestMarked = { fg = c.blue500 }, - NeotestTarget = { fg = c.blue500 }, - --[[ NeotestUnknown = {}, ]] - - -- GitGutter - GitGutterAdd = { fg = c.green500 }, -- diff mode: Added line |diff.txt| - GitGutterChange = { fg = c.yellow500 }, -- diff mode: Changed line |diff.txt| - GitGutterDelete = { fg = c.red500 }, -- diff mode: Deleted line |diff.txt| - GitGutterAddLineNr = { fg = c.green500 }, - GitGutterChangeLineNr = { fg = c.yellow500 }, - GitGutterDeleteLineNr = { fg = c.red500 }, - - -- GitSigns - GitSignsAdd = { fg = c.green500 }, -- diff mode: Added line |diff.txt| - GitSignsChange = { fg = c.yellow500 }, -- diff mode: Changed line |diff.txt| - GitSignsDelete = { fg = c.red500 }, -- diff mode: Deleted line |diff.txt| - - -- Telescope - TelescopeBorder = { fg = c.base02, bg = c.bg_float }, - TelescopeNormal = { fg = c.base0, bg = c.bg_float }, - - -- NvimTree - NvimTreeNormal = { fg = c.base00, bg = c.bg_sidebar }, - NvimTreeWinSeparator = { - fg = options.styles.sidebars == "transparent" and c.border or c.bg_sidebar, - bg = c.bg_sidebar, - }, - NvimTreeNormalNC = { fg = c.base00, bg = c.bg_sidebar }, - NvimTreeRootFolder = { fg = c.blue, bold = true }, - NvimTreeGitDirty = { fg = c.yellow500 }, - NvimTreeGitNew = { fg = c.green500 }, - NvimTreeGitDeleted = { fg = c.red500 }, - NvimTreeOpenedFile = { bg = c.bg_highlight }, - NvimTreeSpecialFile = { fg = c.violet500, underline = true }, - NvimTreeIndentMarker = { fg = c.base02 }, - NvimTreeImageFile = { fg = c.base00 }, - NvimTreeSymlink = { fg = c.blue }, - NvimTreeFolderIcon = { bg = c.none, fg = c.blue }, - -- NvimTreeFolderName= { fg = c.fg_float }, - - NeoTreeNormal = { fg = c.base00, bg = c.bg_sidebar }, - NeoTreeNormalNC = { fg = c.base00, bg = c.bg_sidebar }, - NeoTreeDimText = { fg = c.base01 }, - NeoTreeMessage = { fg = c.base01 }, - - -- Fern - FernBranchText = { fg = c.blue }, - - -- glyph palette - GlyphPalette1 = { fg = c.red500 }, - GlyphPalette2 = { fg = c.green }, - GlyphPalette3 = { fg = c.yellow }, - GlyphPalette4 = { fg = c.blue }, - GlyphPalette6 = { fg = c.cyan }, - GlyphPalette7 = { fg = c.fg }, - GlyphPalette9 = { fg = c.red }, - - -- Dashboard - DashboardShortCut = { fg = c.cyan }, - DashboardHeader = { fg = c.blue }, - DashboardCenter = { fg = c.magenta }, - DashboardFooter = { fg = c.yellow, italic = true }, - DashboardKey = { fg = c.orange500 }, - DashboardDesc = { fg = c.cyan500 }, - DashboardIcon = { fg = c.cyan500, bold = true }, - - -- Snacks - SnacksDashboardDesc = { fg = c.cyan500 }, - SnacksDashboardKey = { fg = c.orange500 }, - SnacksDashboardFooter = { fg = c.yellow, italic = true }, - SnacksDashboardSpecial = { fg = c.yellow500 }, - SnacksDashboardHeader = { fg = c.blue }, - SnacksDashboardIcon = { fg = c.cyan500, bold = true }, - SnacksNotifierBorderTrace = { fg = c.magenta500 }, - SnacksNotifierIconTrace = { fg = c.magenta500 }, - SnacksNotifierTitleTrace = { fg = c.magenta500 }, - SnacksIndentScope = { fg = c.violet700, nocombine = true }, - SnacksIndent = { fg = c.base03, nocombine = true }, + local colors = require("solarized-osaka.colors").setup() + local opts = require("solarized-osaka.config").options + local groups = require("solarized-osaka.groups").setup(colors, opts) - -- Alpha - AlphaShortcut = { fg = c.orange }, - AlphaHeader = { fg = c.blue }, - AlphaHeaderLabel = { fg = c.orange }, - AlphaFooter = { fg = c.cyan }, - AlphaButtons = { fg = c.cyan }, - - -- WhichKey - WhichKey = { fg = c.cyan }, - WhichKeyGroup = { fg = c.blue }, - WhichKeyDesc = { fg = c.magenta }, - WhichKeySeperator = { fg = c.base01 }, - WhichKeySeparator = { fg = c.base01 }, - WhichKeyFloat = { bg = c.bg_sidebar }, - WhichKeyValue = { fg = c.violet500 }, - - -- LspSaga - DiagnosticWarning = { link = "DiagnosticWarn" }, - DiagnosticInformation = { link = "DiagnosticInfo" }, - - LspFloatWinNormal = { bg = c.bg_float }, - LspFloatWinBorder = { fg = c.base02 }, - LspSagaBorderTitle = { fg = c.cyan }, - LspSagaHoverBorder = { fg = c.blue }, - LspSagaRenameBorder = { fg = c.green }, - LspSagaDefPreviewBorder = { fg = c.green }, - LspSagaCodeActionBorder = { fg = c.blue }, - LspSagaFinderSelection = { fg = c.base03 }, - LspSagaCodeActionTitle = { fg = c.cyan }, - LspSagaCodeActionContent = { fg = c.violet500 }, - LspSagaSignatureHelpBorder = { fg = c.red }, - ReferencesCount = { fg = c.violet500 }, - DefinitionCount = { fg = c.violet500 }, - DefinitionIcon = { fg = c.blue }, - ReferencesIcon = { fg = c.blue }, - TargetWord = { fg = c.cyan500 }, - - -- NeoVim - healthError = { fg = c.error }, - healthSuccess = { fg = c.cyan }, - healthWarning = { fg = c.warning }, - - -- BufferLine - BufferLineIndicatorSelected = { fg = c.yellow500 }, - - -- Barbar - BufferCurrent = { bg = c.bg, fg = c.fg }, - BufferCurrentERROR = { bg = c.bg, fg = c.error }, - BufferCurrentHINT = { bg = c.bg, fg = c.hint }, - -- BufferCurrentIcon = { bg = c.bg, fg = c.}, - BufferCurrentINFO = { bg = c.bg, fg = c.info }, - BufferCurrentWARN = { bg = c.bg, fg = c.warning }, - BufferCurrentIndex = { bg = c.bg, fg = c.info }, - BufferCurrentMod = { bg = c.bg, fg = c.warning }, - BufferCurrentSign = { bg = c.bg, fg = c.bg }, - BufferCurrentTarget = { bg = c.bg, fg = c.red }, - BufferAlternate = { bg = c.base01, fg = c.fg }, - BufferAlternateERROR = { bg = c.base01, fg = c.error }, - BufferAlternateHINT = { bg = c.base01, fg = c.hint }, - -- BufferAlternateIcon = { bg = c.base01, fg = c. }, - BufferAlternateIndex = { bg = c.base01, fg = c.info }, - BufferAlternateINFO = { bg = c.base01, fg = c.info }, - BufferAlternateMod = { bg = c.base01, fg = c.warning }, - BufferAlternateSign = { bg = c.base01, fg = c.info }, - BufferAlternateTarget = { bg = c.base01, fg = c.red }, - BufferAlternateWARN = { bg = c.base01, fg = c.warning }, - BufferVisible = { bg = c.bg_statusline, fg = c.fg }, - BufferVisibleERROR = { bg = c.bg_statusline, fg = c.error }, - BufferVisibleHINT = { bg = c.bg_statusline, fg = c.hint }, - -- BufferVisibleIcon = { bg = c.bg_statusline, fg = c. }, - BufferVisibleINFO = { bg = c.bg_statusline, fg = c.info }, - BufferVisibleWARN = { bg = c.bg_statusline, fg = c.warning }, - BufferVisibleIndex = { bg = c.bg_statusline, fg = c.info }, - BufferVisibleMod = { bg = c.bg_statusline, fg = c.warning }, - BufferVisibleSign = { bg = c.bg_statusline, fg = c.info }, - BufferVisibleTarget = { bg = c.bg_statusline, fg = c.red }, - BufferInactive = { bg = util.darken(c.bg_highlight, 0.4), fg = util.darken(c.violet500, 0.8) }, - BufferInactiveERROR = { bg = util.darken(c.bg_highlight, 0.4), fg = util.darken(c.error, 0.8) }, - BufferInactiveHINT = { bg = util.darken(c.bg_highlight, 0.4), fg = util.darken(c.hint, 0.8) }, - -- BufferInactiveIcon = { bg = c.bg_statusline, fg = util.darken(c., 0.1) }, - BufferInactiveINFO = { bg = util.darken(c.bg_highlight, 0.4), fg = util.darken(c.info, 0.8) }, - BufferInactiveWARN = { bg = util.darken(c.bg_highlight, 0.4), fg = util.darken(c.warning, 0.8) }, - BufferInactiveIndex = { bg = util.darken(c.bg_highlight, 0.4), fg = c.violet500 }, - BufferInactiveMod = { bg = util.darken(c.bg_highlight, 0.4), fg = util.darken(c.warning, 0.8) }, - BufferInactiveSign = { bg = util.darken(c.bg_highlight, 0.4), fg = c.bg }, - BufferInactiveTarget = { bg = util.darken(c.bg_highlight, 0.4), fg = c.red }, - BufferOffset = { bg = c.bg_statusline, fg = c.violet500 }, - BufferTabpageFill = { bg = util.darken(c.bg_highlight, 0.8), fg = c.violet500 }, - BufferTabpages = { bg = c.bg_statusline, fg = c.none }, - - -- Sneak - Sneak = { fg = c.bg_highlight, bg = c.magenta }, - SneakScope = { bg = c.base03 }, - - -- Hop - HopNextKey = { fg = c.magenta500, bold = true }, - HopNextKey1 = { fg = c.violet500, bold = true }, - HopNextKey2 = { fg = c.violet700 }, - HopUnmatched = { fg = c.base01 }, - - TSNodeKey = { fg = c.magenta500, bold = true }, - TSNodeUnmatched = { fg = c.base01 }, - - LeapMatch = { bg = c.magenta500, fg = c.fg, bold = true }, - LeapLabel = { fg = c.magenta500, bold = true }, - LeapBackdrop = { fg = c.base01 }, - - FlashBackdrop = { fg = c.base01 }, - FlashLabel = { bg = c.magenta500, bold = true, fg = c.bg }, - - LightspeedGreyWash = { fg = c.base01 }, - -- LightspeedCursor = { link = "Cursor" }, - LightspeedLabel = { fg = c.magenta500, bold = true, underline = true }, - LightspeedLabelDistant = { fg = c.cyan, bold = true, underline = true }, - LightspeedLabelDistantOverlapped = { fg = c.cyan500, underline = true }, - LightspeedLabelOverlapped = { fg = c.magenta500, underline = true }, - LightspeedMaskedChar = { fg = c.orange }, - LightspeedOneCharMatch = { bg = c.magenta500, fg = c.fg, bold = true }, - LightspeedPendingOpArea = { bg = c.magenta500, fg = c.fg }, - LightspeedShortcut = { bg = c.magenta500, fg = c.fg, bold = true, underline = true }, - -- LightspeedShortcutOverlapped = { link = "LightspeedShortcut" }, - -- LightspeedUniqueChar = { link = "LightspeedUnlabeledMatch" }, - LightspeedUnlabeledMatch = { fg = c.violet500, bold = true }, - - -- Cmp - CmpDocumentation = { fg = c.fg, bg = c.bg_float }, - CmpDocumentationBorder = { fg = c.base02, bg = c.bg_float }, - CmpGhostText = { fg = c.base01 }, - - CmpItemAbbr = { fg = c.fg, bg = c.none }, - CmpItemAbbrDeprecated = { fg = c.base01, bg = c.none, strikethrough = true }, - CmpItemAbbrMatch = { fg = c.violet500, bg = c.none }, - CmpItemAbbrMatchFuzzy = { fg = c.violet500, bg = c.none }, - - CmpItemMenu = { fg = c.base01, bg = c.none }, - - CmpItemKindDefault = { fg = c.base01, bg = c.none }, - - CmpItemKindCodeium = { fg = c.cyan500, bg = c.none }, - CmpItemKindCopilot = { fg = c.cyan500, bg = c.none }, - CmpItemKindTabNine = { fg = c.cyan500, bg = c.none }, - - CmpItemKindKeyword = { fg = c.cyan, bg = c.none }, - CmpItemKindVariable = { fg = c.magenta, bg = c.none }, - CmpItemKindConstant = { fg = c.magenta, bg = c.none }, - CmpItemKindReference = { fg = c.magenta, bg = c.none }, - CmpItemKindValue = { fg = c.magenta, bg = c.none }, - - CmpItemKindFunction = { fg = c.blue, bg = c.none }, - CmpItemKindMethod = { fg = c.blue, bg = c.none }, - CmpItemKindConstructor = { fg = c.blue, bg = c.none }, - - CmpItemKindClass = { fg = c.orange, bg = c.none }, - CmpItemKindInterface = { fg = c.orange, bg = c.none }, - CmpItemKindStruct = { fg = c.orange, bg = c.none }, - CmpItemKindEvent = { fg = c.orange, bg = c.none }, - CmpItemKindEnum = { fg = c.orange, bg = c.none }, - CmpItemKindUnit = { fg = c.orange, bg = c.none }, - - CmpItemKindModule = { fg = c.yellow, bg = c.none }, - - CmpItemKindProperty = { fg = c.cyan, bg = c.none }, - CmpItemKindField = { fg = c.cyan, bg = c.none }, - CmpItemKindTypeParameter = { fg = c.cyan, bg = c.none }, - CmpItemKindEnumMember = { fg = c.cyan, bg = c.none }, - CmpItemKindOperator = { fg = c.cyan, bg = c.none }, - CmpItemKindSnippet = { fg = c.violet500, bg = c.none }, - - -- navic - NavicIconsFile = { fg = c.fg, bg = c.bg_statusline }, - NavicIconsModule = { fg = c.yellow, bg = c.bg_statusline }, - NavicIconsNamespace = { fg = c.fg, bg = c.bg_statusline }, - NavicIconsPackage = { fg = c.fg, bg = c.bg_statusline }, - NavicIconsClass = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsMethod = { fg = c.blue, bg = c.bg_statusline }, - NavicIconsProperty = { fg = c.cyan, bg = c.bg_statusline }, - NavicIconsField = { fg = c.cyan, bg = c.bg_statusline }, - NavicIconsConstructor = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsEnum = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsInterface = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsFunction = { fg = c.blue, bg = c.bg_statusline }, - NavicIconsVariable = { fg = c.magenta, bg = c.bg_statusline }, - NavicIconsConstant = { fg = c.magenta, bg = c.bg_statusline }, - NavicIconsString = { fg = c.green, bg = c.bg_statusline }, - NavicIconsNumber = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsBoolean = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsArray = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsObject = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsKey = { fg = c.violet500, bg = c.bg_statusline }, - NavicIconsKeyword = { fg = c.violet500, bg = c.bg_statusline }, - NavicIconsNull = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsEnumMember = { fg = c.cyan, bg = c.bg_statusline }, - NavicIconsStruct = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsEvent = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsOperator = { fg = c.fg, bg = c.bg_statusline }, - NavicIconsTypeParameter = { fg = c.cyan, bg = c.bg_statusline }, - NavicText = { fg = c.fg, bg = c.bg_statusline }, - NavicSeparator = { fg = c.fg, bg = c.bg_statusline }, - - IblIndent = { fg = c.base03, nocombine = true }, - IndentBlanklineChar = { fg = c.base03, nocombine = true }, - IndentBlanklineContextChar = { fg = c.orange500, nocombine = true }, - - -- Scrollbar - ScrollbarHandle = { fg = c.none, bg = c.bg_highlight }, - - ScrollbarSearchHandle = { fg = c.orange, bg = c.bg_highlight }, - ScrollbarSearch = { fg = c.orange, bg = c.none }, - - ScrollbarErrorHandle = { fg = c.error, bg = c.bg_highlight }, - ScrollbarError = { fg = c.error, bg = c.none }, - - ScrollbarWarnHandle = { fg = c.warning, bg = c.bg_highlight }, - ScrollbarWarn = { fg = c.warning, bg = c.none }, - - ScrollbarInfoHandle = { fg = c.info, bg = c.bg_highlight }, - ScrollbarInfo = { fg = c.info, bg = c.none }, - - ScrollbarHintHandle = { fg = c.hint, bg = c.bg_highlight }, - ScrollbarHint = { fg = c.hint, bg = c.none }, - - ScrollbarMiscHandle = { fg = c.violet500, bg = c.bg_highlight }, - ScrollbarMisc = { fg = c.violet500, bg = c.none }, - - -- Yanky - YankyPut = { link = "IncSearch" }, - YankyYanked = { link = "IncSearch" }, - - -- Lazy - LazyProgressDone = { bold = true, fg = c.magenta500 }, - LazyProgressTodo = { bold = true, fg = c.base01 }, - - -- Notify - NotifyBackground = { fg = c.fg, bg = c.bg }, - --- Border - NotifyERRORBorder = { fg = util.darken(c.error, 0.3), bg = options.transparent and c.none or c.bg }, - NotifyWARNBorder = { fg = util.darken(c.warning, 0.3), bg = options.transparent and c.none or c.bg }, - NotifyINFOBorder = { fg = util.darken(c.info, 0.3), bg = options.transparent and c.none or c.bg }, - NotifyDEBUGBorder = { fg = util.darken(c.base01, 0.3), bg = options.transparent and c.none or c.bg }, - NotifyTRACEBorder = { fg = util.darken(c.violet500, 0.3), bg = options.transparent and c.none or c.bg }, - --- Icons - NotifyERRORIcon = { fg = c.error }, - NotifyWARNIcon = { fg = c.warning }, - NotifyINFOIcon = { fg = c.info }, - NotifyDEBUGIcon = { fg = c.base01 }, - NotifyTRACEIcon = { fg = c.violet500 }, - --- Title - NotifyERRORTitle = { fg = c.error }, - NotifyWARNTitle = { fg = c.warning }, - NotifyINFOTitle = { fg = c.info }, - NotifyDEBUGTitle = { fg = c.base01 }, - NotifyTRACETitle = { fg = c.violet500 }, - --- Body - NotifyERRORBody = { fg = c.fg, bg = options.transparent and c.none or c.bg }, - NotifyWARNBody = { fg = c.fg, bg = options.transparent and c.none or c.bg }, - NotifyINFOBody = { fg = c.fg, bg = options.transparent and c.none or c.bg }, - NotifyDEBUGBody = { fg = c.fg, bg = options.transparent and c.none or c.bg }, - NotifyTRACEBody = { fg = c.fg, bg = options.transparent and c.none or c.bg }, - - -- Mini - MiniAnimateCursor = { reverse = true, nocombine = true }, - MiniAnimateNormalFloat = { link = "NormalFloat" }, - - MiniClueBorder = { link = "FloatBorder" }, - MiniClueDescGroup = { link = "DiagnosticFloatingWarn" }, - MiniClueDescSingle = { link = "NormalFloat" }, - MiniClueNextKey = { link = "DiagnosticFloatingHint" }, - MiniClueNextKeyWithPostkeys = { link = "DiagnosticFloatingError" }, - MiniClueSeparator = { link = "DiagnosticFloatingInfo" }, - MiniClueTitle = { link = "FloatTitle" }, - - MiniCompletionActiveParameter = { link = "LspSignatureActiveParameter" }, - - MiniCursorword = { underline = true }, - MiniCursorwordCurrent = { underline = true }, - - MiniDepsChangeAdded = { link = "diffAdded" }, - MiniDepsChangeRemoved = { link = "diffRemoved" }, - MiniDepsHint = { link = "DiagnosticHint" }, - MiniDepsInfo = { link = "DiagnosticInfo" }, - MiniDepsMsgBreaking = { link = "DiagnosticWarn" }, - MiniDepsPlaceholder = { link = "Comment" }, - MiniDepsTitle = { link = "Title" }, - MiniDepsTitleError = { link = "DiffDelete" }, - MiniDepsTitleSame = { link = "DiffText" }, - MiniDepsTitleUpdate = { link = "DiffAdd" }, - - MiniDiffOverAdd = { link = "DiffAdd" }, - MiniDiffOverChange = { link = "DiffText" }, - MiniDiffOverContext = { link = "DiffChange" }, - MiniDiffOverDelete = { link = "DiffDelete" }, - MiniDiffSignAdd = { fg = c.green500 }, - MiniDiffSignChange = { fg = c.yellow500 }, - MiniDiffSignDelete = { fg = c.red500 }, - - MiniFilesBorder = { link = "FloatBorder" }, - MiniFilesBorderModified = { link = "DiagnosticFloatingWarn" }, - MiniFilesCursorLine = { link = "CursorLine" }, - MiniFilesDirectory = { link = "Directory" }, - MiniFilesFile = { fg = c.fg }, - MiniFilesNormal = { link = "NormalFloat" }, - MiniFilesTitle = { link = "FloatTitle" }, - MiniFilesTitleFocused = { fg = c.hint, bg = c.bg_float }, - - MiniHipatternsFixme = { fg = c.bg, bg = c.error, bold = true }, - MiniHipatternsHack = { fg = c.bg, bg = c.warning, bold = true }, - MiniHipatternsNote = { fg = c.bg, bg = c.info, bold = true }, - MiniHipatternsTodo = { fg = c.bg, bg = c.hint, bold = true }, - - MiniIconsAzure = { fg = c.blue300 }, - MiniIconsBlue = { fg = c.blue }, - MiniIconsCyan = { fg = c.cyan }, - MiniIconsGreen = { fg = c.green }, - MiniIconsGrey = { fg = c.base2 }, - MiniIconsOrange = { fg = c.orange }, - MiniIconsPurple = { fg = c.violet }, - MiniIconsRed = { fg = c.red }, - MiniIconsYellow = { fg = c.yellow }, - - MiniIndentscopeSymbol = { fg = c.violet700, nocombine = true }, - MiniIndentscopeSymbolOff = { fg = c.warning, nocombine = true }, - - MiniJump = { bg = c.magenta500, fg = c.base4 }, - - MiniJump2dDim = { fg = c.base01 }, - MiniJump2dSpot = { fg = c.magenta500, bold = true, nocombine = true }, - MiniJump2dSpotAhead = { fg = c.cyan500, bg = c.black, nocombine = true }, - MiniJump2dSpotUnique = { fg = c.yellow500, bold = true, nocombine = true }, - - MiniMapNormal = { link = "NormalFloat" }, - MiniMapSymbolCount = { link = "Special" }, - MiniMapSymbolLine = { link = "Title" }, - MiniMapSymbolView = { link = "Delimiter" }, - - MiniNotifyBorder = { link = "FloatBorder" }, - MiniNotifyNormal = { link = "NormalFloat" }, - MiniNotifyTitle = { link = "FloatTitle" }, - - MiniOperatorsExchangeFrom = { link = "IncSearch" }, - - MiniPickBorder = { link = "FloatBorder" }, - MiniPickBorderBusy = { link = "DiagnosticFloatingWarn" }, - MiniPickBorderText = { link = "FloatTitle" }, - MiniPickHeader = { link = "DiagnosticFloatingHint" }, - MiniPickIconDirectory = { link = "Directory" }, - MiniPickIconFile = { link = "MiniPickNormal" }, - MiniPickMatchCurrent = { link = "CursorLine" }, - MiniPickMatchMarked = { link = "Visual" }, - MiniPickMatchRanges = { link = "DiagnosticFloatingHint" }, - MiniPickNormal = { link = "NormalFloat" }, - MiniPickPreviewLine = { link = "CursorLine" }, - MiniPickPreviewRegion = { link = "IncSearch" }, - MiniPickPrompt = { link = "DiagnosticFloatingInfo" }, - - MiniStarterCurrent = { nocombine = true }, - MiniStarterFooter = { fg = c.yellow, italic = true }, - MiniStarterHeader = { fg = c.blue }, - MiniStarterInactive = { fg = c.base01, style = options.styles.comments }, - MiniStarterItem = { fg = c.fg, bg = options.transparent and c.none or c.bg }, - MiniStarterItemBullet = { fg = c.base01 }, - MiniStarterItemPrefix = { fg = c.warning }, - MiniStarterSection = { fg = c.violet500 }, - MiniStarterQuery = { fg = c.info }, - - MiniStatuslineDevinfo = { fg = c.base01, bg = c.bg_highlight }, - MiniStatuslineFileinfo = { fg = c.base01, bg = c.bg_highlight }, - MiniStatuslineFilename = { fg = c.base01, bg = c.bg_highlight }, - MiniStatuslineInactive = { fg = c.blue, bg = c.bg_statusline }, - MiniStatuslineModeCommand = { fg = c.black, bg = c.yellow, bold = true }, - MiniStatuslineModeInsert = { fg = c.black, bg = c.green, bold = true }, - MiniStatuslineModeNormal = { fg = c.black, bg = c.blue, bold = true }, - MiniStatuslineModeOther = { fg = c.black, bg = c.cyan500, bold = true }, - MiniStatuslineModeReplace = { fg = c.black, bg = c.red, bold = true }, - MiniStatuslineModeVisual = { fg = c.black, bg = c.magenta, bold = true }, - - MiniSurround = { bg = c.orange, fg = c.black }, - - MiniTablineCurrent = { fg = c.fg, bg = c.base02, bold = true }, - MiniTablineFill = { bg = c.black }, - MiniTablineHidden = { fg = c.violet500, bg = c.bg_statusline }, - MiniTablineModifiedCurrent = { fg = c.base02, bg = c.fg, bold = true }, - MiniTablineModifiedHidden = { fg = c.bg_statusline, bg = c.violet500 }, - MiniTablineModifiedVisible = { fg = c.bg_statusline, bg = c.fg }, - MiniTablineTabpagesection = { bg = c.bg_statusline, fg = c.none }, - MiniTablineVisible = { fg = c.fg, bg = c.bg_statusline }, - - MiniTestEmphasis = { bold = true }, - MiniTestFail = { fg = c.red, bold = true }, - MiniTestPass = { fg = c.green, bold = true }, - - MiniTrailspace = { bg = c.red }, - - -- Noice + if vim.g.colors_name then + vim.cmd("hi clear") + end - NoiceCompletionItemKindDefault = { fg = c.base01, bg = c.none }, + vim.o.termguicolors = true + vim.g.colors_name = "solarized-osaka" - TreesitterContext = { bg = c.violet900 }, - Hlargs = { fg = c.yellow }, - } + for group, hl in pairs(groups) do + hl = type(hl) == "string" and { link = hl } or hl + vim.api.nvim_set_hl(0, group, hl) + end - if not vim.diagnostic then - local severity_map = { - Error = "Error", - Warn = "Warning", - Info = "Information", - Hint = "Hint", - } - local types = { "Default", "VirtualText", "Underline" } - for _, type in ipairs(types) do - for snew, sold in pairs(severity_map) do - theme.highlights["LspDiagnostics" .. type .. sold] = { - link = "Diagnostic" .. (type == "Default" and "" or type) .. snew, - } - end - end + if opts.terminal_colors then + M.terminal(colors) end - ---@type table - theme.defer = {} + return colors, groups, opts +end - if options.hide_inactive_statusline then - local inactive = { underline = true, bg = c.none, fg = c.bg, sp = c.border } +---@param colors ColorScheme +function M.terminal(colors) + -- dark + vim.g.terminal_color_0 = colors.black + vim.g.terminal_color_8 = colors.terminal_black - -- StatusLineNC - theme.highlights.StatusLineNC = inactive + -- light + vim.g.terminal_color_7 = colors.fg_dark + vim.g.terminal_color_15 = colors.fg - -- LuaLine - for _, section in ipairs({ "a", "b", "c" }) do - theme.defer["lualine_" .. section .. "_inactive"] = inactive - end + -- colors + vim.g.terminal_color_1 = colors.red + vim.g.terminal_color_9 = colors.red - -- mini.statusline - theme.highlights.MiniStatuslineInactive = inactive - end + vim.g.terminal_color_2 = colors.green + vim.g.terminal_color_10 = colors.green - options.on_highlights(theme.highlights, theme.colors) + vim.g.terminal_color_3 = colors.yellow + vim.g.terminal_color_11 = colors.yellow - if config.is_day() then - util.invert_colors(theme.colors) - util.invert_highlights(theme.highlights) - end + vim.g.terminal_color_4 = colors.blue + vim.g.terminal_color_12 = colors.blue + + vim.g.terminal_color_5 = colors.magenta + vim.g.terminal_color_13 = colors.magenta - return theme + vim.g.terminal_color_6 = colors.cyan + vim.g.terminal_color_14 = colors.cyan end return M diff --git a/lua/solarized-osaka/util.lua b/lua/solarized-osaka/util.lua index b6174e0..d1f5db9 100644 --- a/lua/solarized-osaka/util.lua +++ b/lua/solarized-osaka/util.lua @@ -69,39 +69,6 @@ function M.highlight(group, hl) vim.api.nvim_set_hl(0, group, hl) end ----@param config Config -function M.autocmds(config) - local group = vim.api.nvim_create_augroup("solarized-osaka", { clear = true }) - - vim.api.nvim_create_autocmd("ColorSchemePre", { - group = group, - callback = function() - vim.api.nvim_del_augroup_by_id(group) - end, - }) - local function set_whl() - local win = vim.api.nvim_get_current_win() - local whl = vim.split(vim.wo[win].winhighlight, ",") - vim.list_extend(whl, { "Normal:NormalSB", "SignColumn:SignColumnSB" }) - whl = vim.tbl_filter(function(hl) - return hl ~= "" - end, whl) - vim.opt_local.winhighlight = table.concat(whl, ",") - end - - vim.api.nvim_create_autocmd("FileType", { - group = group, - pattern = table.concat(config.sidebars, ","), - callback = set_whl, - }) - if vim.tbl_contains(config.sidebars, "terminal") then - vim.api.nvim_create_autocmd("TermOpen", { - group = group, - callback = set_whl, - }) - end -end - -- Simple string interpolation. -- -- Example template: "${name} is ${value}" @@ -122,36 +89,6 @@ function M.syntax(syntax) end end ----@param colors ColorScheme -function M.terminal(colors) - -- dark - vim.g.terminal_color_0 = colors.black - vim.g.terminal_color_8 = colors.terminal_black - - -- light - vim.g.terminal_color_7 = colors.fg_dark - vim.g.terminal_color_15 = colors.fg - - -- colors - vim.g.terminal_color_1 = colors.red - vim.g.terminal_color_9 = colors.red - - vim.g.terminal_color_2 = colors.green - vim.g.terminal_color_10 = colors.green - - vim.g.terminal_color_3 = colors.yellow - vim.g.terminal_color_11 = colors.yellow - - vim.g.terminal_color_4 = colors.blue - vim.g.terminal_color_12 = colors.blue - - vim.g.terminal_color_5 = colors.magenta - vim.g.terminal_color_13 = colors.magenta - - vim.g.terminal_color_6 = colors.cyan - vim.g.terminal_color_14 = colors.cyan -end - ---@param colors ColorScheme function M.invert_colors(colors) if type(colors) == "string" then @@ -179,36 +116,28 @@ function M.invert_highlights(hls) end end ----@param theme Theme -function M.load(theme) - -- only needed to clear when not the default colorscheme - if vim.g.colors_name then - vim.cmd("hi clear") - end +local me = debug.getinfo(1, "S").source:sub(2) +me = vim.fn.fnamemodify(me, ":h:h") - vim.o.termguicolors = true - vim.g.colors_name = "solarized-osaka" +function M.mod(modname) + if package.loaded[modname] then + return package.loaded[modname] + end + local ret = loadfile(me .. "/" .. modname:gsub("%.", "/") .. ".lua")() + package.loaded[modname] = ret + return ret +end - if ts.new_style() then - for group, colors in pairs(ts.defaults) do - if not theme.highlights[group] then - M.highlight(group, colors) +function M.resolve(groups) + for _, hl in pairs(groups) do + if type(hl.style) == "table" then + for k, v in pairs(hl.style) do + hl[k] = v end + hl.style = nil end end - - M.syntax(theme.highlights) - - -- vim.api.nvim_set_hl_ns(M.ns) - if theme.config.terminal_colors then - M.terminal(theme.colors) - end - - M.autocmds(theme.config) - - vim.defer_fn(function() - M.syntax(theme.defer) - end, 100) + return groups end return M From 71e05aa291b0966d79bf2e4892f327433d39de44 Mon Sep 17 00:00:00 2001 From: Miroslav Lincovschi Date: Wed, 18 Dec 2024 02:50:39 +0300 Subject: [PATCH 04/18] feat: add new option to control plugins integration --- lua/solarized-osaka/config.lua | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lua/solarized-osaka/config.lua b/lua/solarized-osaka/config.lua index 0816530..98af67d 100644 --- a/lua/solarized-osaka/config.lua +++ b/lua/solarized-osaka/config.lua @@ -36,6 +36,19 @@ local defaults = { ---@param colors ColorScheme on_highlights = function(highlights, colors) end, use_background = true, -- can be light/dark/auto. When auto, background will be set to vim.o.background + ---@type table + plugins = { + -- enable all plugins when not using lazy.nvim + -- set to false to manually enable/disable plugins + all = package.loaded.lazy == nil, + -- uses your plugin manager to automatically enable needed plugins + -- currently only lazy.nvim is supported + auto = true, + -- add any plugins here that you want to enable + -- for all possible plugins, see: + -- * https://github.com/craftzdog/solarized-osaka.nvim/tree/main/lua/solarized-osaka/groups + -- flash = true, + }, } ---@type Config From aad7008e23ca5f044ab6208c9a9d1c724f6f342a Mon Sep 17 00:00:00 2001 From: Miroslav Lincovschi Date: Wed, 18 Dec 2024 02:51:43 +0300 Subject: [PATCH 05/18] refactor: remove unused require to `util.lua` --- lua/solarized-osaka/init.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lua/solarized-osaka/init.lua b/lua/solarized-osaka/init.lua index 950dded..5e9ff85 100644 --- a/lua/solarized-osaka/init.lua +++ b/lua/solarized-osaka/init.lua @@ -1,4 +1,3 @@ -local util = require("solarized-osaka.util") local theme = require("solarized-osaka.theme") local config = require("solarized-osaka.config") @@ -20,7 +19,7 @@ function M.load(opts) if opts then require("solarized-osaka.config").extend(opts) end - util.load(theme.setup()) + theme.setup() end M.setup = config.setup From c854ecd5df6f8ce235a50d825a7f335fc232f6ed Mon Sep 17 00:00:00 2001 From: Miroslav Lincovschi Date: Wed, 18 Dec 2024 12:06:54 +0300 Subject: [PATCH 06/18] feat: add missing color switching --- lua/solarized-osaka/theme.lua | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lua/solarized-osaka/theme.lua b/lua/solarized-osaka/theme.lua index 9766878..c36c9cb 100644 --- a/lua/solarized-osaka/theme.lua +++ b/lua/solarized-osaka/theme.lua @@ -1,11 +1,11 @@ -local util = require("solarized-osaka.util") +local Util = require("solarized-osaka.util") local M = {} function M.setup() local colors = require("solarized-osaka.colors").setup() - local opts = require("solarized-osaka.config").options - local groups = require("solarized-osaka.groups").setup(colors, opts) + local opts = require("solarized-osaka.config") + local groups = require("solarized-osaka.groups").setup(colors, opts.options) if vim.g.colors_name then vim.cmd("hi clear") @@ -14,6 +14,11 @@ function M.setup() vim.o.termguicolors = true vim.g.colors_name = "solarized-osaka" + if opts.is_day() then + Util.invert_colors(colors) + Util.invert_highlights(groups) + end + for group, hl in pairs(groups) do hl = type(hl) == "string" and { link = hl } or hl vim.api.nvim_set_hl(0, group, hl) From 49bf743bf008aeafbd6c294239de3f6a591ab6b8 Mon Sep 17 00:00:00 2001 From: Miroslav Lincovschi Date: Mon, 23 Dec 2024 17:42:41 +0300 Subject: [PATCH 07/18] fix: add missing option `hide_inactive_statusline` --- lua/lualine/themes/solarized-osaka.lua | 22 ++++++++++++++++--- lua/solarized-osaka/groups/editor.lua | 7 +++++- .../groups/mini_statusline.lua | 7 +++++- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/lua/lualine/themes/solarized-osaka.lua b/lua/lualine/themes/solarized-osaka.lua index 4c1f51c..fd09d28 100644 --- a/lua/lualine/themes/solarized-osaka.lua +++ b/lua/lualine/themes/solarized-osaka.lua @@ -30,9 +30,25 @@ solarized_osaka.terminal = { } solarized_osaka.inactive = { - a = { bg = colors.bg_statusline, fg = colors.blue }, - b = { bg = colors.bg_statusline, fg = colors.fg, gui = "bold" }, - c = { bg = colors.bg_statusline, fg = colors.fg }, + a = { + bg = config.hide_inactive_statusline and colors.none or colors.bg_statusline, + fg = config.hide_inactive_statusline and colors.bg or colors.blue, + sp = config.hide_inactive_statusline and colors.border or colors.none, + underline = config.hide_inactive_statusline, + }, + b = { + bg = config.hide_inactive_statusline and colors.none or colors.bg_statusline, + fg = config.hide_inactive_statusline and colors.bg or colors.fg, + sp = config.hide_inactive_statusline and colors.border or colors.none, + underline = config.hide_inactive_statusline, + gui = "bold", + }, + c = { + bg = config.hide_inactive_statusline and colors.none or colors.bg_statusline, + fg = config.hide_inactive_statusline and colors.bg or colors.fg, + sp = config.hide_inactive_statusline and colors.border or colors.none, + underline = config.hide_inactive_statusline, + }, } if config.lualine_bold then diff --git a/lua/solarized-osaka/groups/editor.lua b/lua/solarized-osaka/groups/editor.lua index 21c5676..d98abfa 100644 --- a/lua/solarized-osaka/groups/editor.lua +++ b/lua/solarized-osaka/groups/editor.lua @@ -54,7 +54,12 @@ function M.get(c, options) SpellLocal = { sp = c.cyan500, undercurl = true }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. SpellRare = { sp = c.yellow500, undercurl = true }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. StatusLine = { fg = c.base1, bg = c.base03 }, -- status line of current window - StatusLineNC = { fg = c.base0, bg = c.base04 }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. + StatusLineNC = { + fg = options.hide_inactive_statusline and c.bg or c.base0, + bg = options.hide_inactive_statusline and c.none or c.base04, + sp = options.hide_inactive_statusline and c.border or c.none, + underline = options.hide_inactive_statusline and true or false, + }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. TabLine = { fg = c.base0, bg = c.base02, sp = c.base0 }, -- tab pages line, not active tab page label TabLineFill = { fg = c.base0, bg = c.base02 }, -- tab pages line, where there are no labels TabLineSel = { fg = c.yellow500, bg = c.bg }, -- tab pages line, active tab page label diff --git a/lua/solarized-osaka/groups/mini_statusline.lua b/lua/solarized-osaka/groups/mini_statusline.lua index ce5b9a1..c78bf89 100644 --- a/lua/solarized-osaka/groups/mini_statusline.lua +++ b/lua/solarized-osaka/groups/mini_statusline.lua @@ -5,7 +5,12 @@ function M.get(c, opts) MiniStatuslineDevinfo = { fg = c.base01, bg = c.bg_highlight }, MiniStatuslineFileinfo = { fg = c.base01, bg = c.bg_highlight }, MiniStatuslineFilename = { fg = c.base01, bg = c.bg_highlight }, - MiniStatuslineInactive = { fg = c.blue, bg = c.bg_statusline }, + MiniStatuslineInactive = { + fg = opts.hide_inactive_statusline and c.bg or c.blue, + bg = opts.hide_inactive_statusline and c.none or c.bg_statusline, + sp = opts.hide_inactive_statusline and c.border or c.none, + underline = opts.hide_inactive_statusline, + }, MiniStatuslineModeCommand = { fg = c.black, bg = c.yellow, bold = true }, MiniStatuslineModeInsert = { fg = c.black, bg = c.green, bold = true }, MiniStatuslineModeNormal = { fg = c.black, bg = c.blue, bold = true }, From 78b1327c10a396420d64243442d7e1a71ba2af0d Mon Sep 17 00:00:00 2001 From: Miroslav Lincovschi Date: Mon, 23 Dec 2024 18:29:24 +0300 Subject: [PATCH 08/18] style: format highlight groups to more readable style --- lua/solarized-osaka/groups/alpha.lua | 9 +- lua/solarized-osaka/groups/barbar.lua | 81 ++++--- lua/solarized-osaka/groups/bufferline.lua | 1 + lua/solarized-osaka/groups/cmp.lua | 65 +++--- lua/solarized-osaka/groups/dashboard.lua | 13 +- lua/solarized-osaka/groups/editor.lua | 188 ++++++++--------- lua/solarized-osaka/groups/fern.lua | 1 + lua/solarized-osaka/groups/flash.lua | 3 +- lua/solarized-osaka/groups/gitgutter.lua | 9 +- lua/solarized-osaka/groups/gitsigns.lua | 3 +- lua/solarized-osaka/groups/glyph-pallete.lua | 1 + lua/solarized-osaka/groups/hop.lua | 7 +- lua/solarized-osaka/groups/illuminate.lua | 9 +- .../groups/indent-blankline.lua | 5 +- lua/solarized-osaka/groups/lazy.lua | 1 + lua/solarized-osaka/groups/leap.lua | 5 +- lua/solarized-osaka/groups/lightspeed.lua | 19 +- lua/solarized-osaka/groups/lspsaga.lua | 35 ++-- lua/solarized-osaka/groups/mini_animate.lua | 3 +- lua/solarized-osaka/groups/mini_clue.lua | 13 +- .../groups/mini_completion.lua | 1 + .../groups/mini_cursorword.lua | 3 +- lua/solarized-osaka/groups/mini_deps.lua | 19 +- lua/solarized-osaka/groups/mini_diff.lua | 13 +- lua/solarized-osaka/groups/mini_files.lua | 15 +- .../groups/mini_hipatterns.lua | 7 +- lua/solarized-osaka/groups/mini_icons.lua | 13 +- .../groups/mini_indentscope.lua | 3 +- lua/solarized-osaka/groups/mini_jump.lua | 9 +- lua/solarized-osaka/groups/mini_map.lua | 7 +- lua/solarized-osaka/groups/mini_notify.lua | 3 +- lua/solarized-osaka/groups/mini_operators.lua | 1 + lua/solarized-osaka/groups/mini_pick.lua | 23 +- lua/solarized-osaka/groups/mini_starter.lua | 15 +- .../groups/mini_statusline.lua | 22 +- lua/solarized-osaka/groups/mini_surround.lua | 1 + lua/solarized-osaka/groups/mini_tabline.lua | 13 +- lua/solarized-osaka/groups/mini_test.lua | 5 +- .../groups/mini_trailspace.lua | 1 + lua/solarized-osaka/groups/navic.lua | 57 ++--- lua/solarized-osaka/groups/neo-tree.lua | 7 +- lua/solarized-osaka/groups/neogit.lua | 13 +- lua/solarized-osaka/groups/neotest.lua | 31 +-- lua/solarized-osaka/groups/noice.lua | 1 + lua/solarized-osaka/groups/notify.lua | 37 ++-- lua/solarized-osaka/groups/nvim-tree.lua | 28 ++- .../groups/nvim-ts-rainbow.lua | 1 + .../groups/nvim-ts-rainbow2.lua | 7 +- .../groups/rainbow-delimiters.lua | 7 +- lua/solarized-osaka/groups/scrollbar.lua | 25 +-- .../groups/semantic_tokens.lua | 81 +++---- lua/solarized-osaka/groups/snacks.lua | 21 +- lua/solarized-osaka/groups/sneak.lua | 3 +- lua/solarized-osaka/groups/syntax.lua | 49 ++--- lua/solarized-osaka/groups/telescope.lua | 1 + .../groups/treesitter-context.lua | 1 + lua/solarized-osaka/groups/treesitter.lua | 197 +++++++++--------- lua/solarized-osaka/groups/trouble.lua | 5 +- lua/solarized-osaka/groups/ts-node-action.lua | 3 +- lua/solarized-osaka/groups/which-key.lua | 11 +- lua/solarized-osaka/groups/yanky.lua | 3 +- 61 files changed, 639 insertions(+), 595 deletions(-) diff --git a/lua/solarized-osaka/groups/alpha.lua b/lua/solarized-osaka/groups/alpha.lua index 676fefa..09d3711 100644 --- a/lua/solarized-osaka/groups/alpha.lua +++ b/lua/solarized-osaka/groups/alpha.lua @@ -1,12 +1,13 @@ local M = {} function M.get(c) + -- stylua: ignore return { - AlphaShortcut = { fg = c.orange }, - AlphaHeader = { fg = c.blue }, + AlphaShortcut = { fg = c.orange }, + AlphaHeader = { fg = c.blue }, AlphaHeaderLabel = { fg = c.orange }, - AlphaFooter = { fg = c.cyan }, - AlphaButtons = { fg = c.cyan }, + AlphaFooter = { fg = c.cyan }, + AlphaButtons = { fg = c.cyan }, } end diff --git a/lua/solarized-osaka/groups/barbar.lua b/lua/solarized-osaka/groups/barbar.lua index 1d32183..f3a6a87 100644 --- a/lua/solarized-osaka/groups/barbar.lua +++ b/lua/solarized-osaka/groups/barbar.lua @@ -3,50 +3,47 @@ local Util = require("solarized-osaka.util") local M = {} function M.get(c, opts) + --stylua: ignore return { - BufferCurrent = { bg = c.bg, fg = c.fg }, - BufferCurrentERROR = { bg = c.bg, fg = c.error }, - BufferCurrentHINT = { bg = c.bg, fg = c.hint }, - -- BufferCurrentIcon = { bg = c.bg, fg = c.}, - BufferCurrentINFO = { bg = c.bg, fg = c.info }, - BufferCurrentWARN = { bg = c.bg, fg = c.warning }, - BufferCurrentIndex = { bg = c.bg, fg = c.info }, - BufferCurrentMod = { bg = c.bg, fg = c.warning }, - BufferCurrentSign = { bg = c.bg, fg = c.bg }, - BufferCurrentTarget = { bg = c.bg, fg = c.red }, - BufferAlternate = { bg = c.base01, fg = c.fg }, - BufferAlternateERROR = { bg = c.base01, fg = c.error }, - BufferAlternateHINT = { bg = c.base01, fg = c.hint }, - -- BufferAlternateIcon = { bg = c.base01, fg = c. }, - BufferAlternateIndex = { bg = c.base01, fg = c.info }, - BufferAlternateINFO = { bg = c.base01, fg = c.info }, - BufferAlternateMod = { bg = c.base01, fg = c.warning }, - BufferAlternateSign = { bg = c.base01, fg = c.info }, + BufferCurrent = { bg = c.bg, fg = c.fg }, + BufferCurrentERROR = { bg = c.bg, fg = c.error }, + BufferCurrentHINT = { bg = c.bg, fg = c.hint }, + BufferCurrentINFO = { bg = c.bg, fg = c.info }, + BufferCurrentWARN = { bg = c.bg, fg = c.warning }, + BufferCurrentIndex = { bg = c.bg, fg = c.info }, + BufferCurrentMod = { bg = c.bg, fg = c.warning }, + BufferCurrentSign = { bg = c.bg, fg = c.bg }, + BufferCurrentTarget = { bg = c.bg, fg = c.red }, + BufferAlternate = { bg = c.base01, fg = c.fg }, + BufferAlternateERROR = { bg = c.base01, fg = c.error }, + BufferAlternateHINT = { bg = c.base01, fg = c.hint }, + BufferAlternateIndex = { bg = c.base01, fg = c.info }, + BufferAlternateINFO = { bg = c.base01, fg = c.info }, + BufferAlternateMod = { bg = c.base01, fg = c.warning }, + BufferAlternateSign = { bg = c.base01, fg = c.info }, BufferAlternateTarget = { bg = c.base01, fg = c.red }, - BufferAlternateWARN = { bg = c.base01, fg = c.warning }, - BufferVisible = { bg = c.bg_statusline, fg = c.fg }, - BufferVisibleERROR = { bg = c.bg_statusline, fg = c.error }, - BufferVisibleHINT = { bg = c.bg_statusline, fg = c.hint }, - -- BufferVisibleIcon = { bg = c.bg_statusline, fg = c. }, - BufferVisibleINFO = { bg = c.bg_statusline, fg = c.info }, - BufferVisibleWARN = { bg = c.bg_statusline, fg = c.warning }, - BufferVisibleIndex = { bg = c.bg_statusline, fg = c.info }, - BufferVisibleMod = { bg = c.bg_statusline, fg = c.warning }, - BufferVisibleSign = { bg = c.bg_statusline, fg = c.info }, - BufferVisibleTarget = { bg = c.bg_statusline, fg = c.red }, - BufferInactive = { bg = Util.darken(c.bg_highlight, 0.4), fg = Util.darken(c.violet500, 0.8) }, - BufferInactiveERROR = { bg = Util.darken(c.bg_highlight, 0.4), fg = Util.darken(c.error, 0.8) }, - BufferInactiveHINT = { bg = Util.darken(c.bg_highlight, 0.4), fg = Util.darken(c.hint, 0.8) }, - -- BufferInactiveIcon = { bg = c.bg_statusline, fg = util.darken(c., 0.1) }, - BufferInactiveINFO = { bg = Util.darken(c.bg_highlight, 0.4), fg = Util.darken(c.info, 0.8) }, - BufferInactiveWARN = { bg = Util.darken(c.bg_highlight, 0.4), fg = Util.darken(c.warning, 0.8) }, - BufferInactiveIndex = { bg = Util.darken(c.bg_highlight, 0.4), fg = c.violet500 }, - BufferInactiveMod = { bg = Util.darken(c.bg_highlight, 0.4), fg = Util.darken(c.warning, 0.8) }, - BufferInactiveSign = { bg = Util.darken(c.bg_highlight, 0.4), fg = c.bg }, - BufferInactiveTarget = { bg = Util.darken(c.bg_highlight, 0.4), fg = c.red }, - BufferOffset = { bg = c.bg_statusline, fg = c.violet500 }, - BufferTabpageFill = { bg = Util.darken(c.bg_highlight, 0.8), fg = c.violet500 }, - BufferTabpages = { bg = c.bg_statusline, fg = c.none }, + BufferAlternateWARN = { bg = c.base01, fg = c.warning }, + BufferVisible = { bg = c.bg_statusline, fg = c.fg }, + BufferVisibleERROR = { bg = c.bg_statusline, fg = c.error }, + BufferVisibleHINT = { bg = c.bg_statusline, fg = c.hint }, + BufferVisibleINFO = { bg = c.bg_statusline, fg = c.info }, + BufferVisibleWARN = { bg = c.bg_statusline, fg = c.warning }, + BufferVisibleIndex = { bg = c.bg_statusline, fg = c.info }, + BufferVisibleMod = { bg = c.bg_statusline, fg = c.warning }, + BufferVisibleSign = { bg = c.bg_statusline, fg = c.info }, + BufferVisibleTarget = { bg = c.bg_statusline, fg = c.red }, + BufferInactive = { bg = Util.darken(c.bg_highlight, 0.4), fg = Util.darken(c.violet500, 0.8) }, + BufferInactiveERROR = { bg = Util.darken(c.bg_highlight, 0.4), fg = Util.darken(c.error, 0.8) }, + BufferInactiveHINT = { bg = Util.darken(c.bg_highlight, 0.4), fg = Util.darken(c.hint, 0.8) }, + BufferInactiveINFO = { bg = Util.darken(c.bg_highlight, 0.4), fg = Util.darken(c.info, 0.8) }, + BufferInactiveWARN = { bg = Util.darken(c.bg_highlight, 0.4), fg = Util.darken(c.warning, 0.8) }, + BufferInactiveIndex = { bg = Util.darken(c.bg_highlight, 0.4), fg = c.violet500 }, + BufferInactiveMod = { bg = Util.darken(c.bg_highlight, 0.4), fg = Util.darken(c.warning, 0.8) }, + BufferInactiveSign = { bg = Util.darken(c.bg_highlight, 0.4), fg = c.bg }, + BufferInactiveTarget = { bg = Util.darken(c.bg_highlight, 0.4), fg = c.red }, + BufferOffset = { bg = c.bg_statusline, fg = c.violet500 }, + BufferTabpageFill = { bg = Util.darken(c.bg_highlight, 0.8), fg = c.violet500 }, + BufferTabpages = { bg = c.bg_statusline, fg = c.none }, } end diff --git a/lua/solarized-osaka/groups/bufferline.lua b/lua/solarized-osaka/groups/bufferline.lua index 728bbab..e609625 100644 --- a/lua/solarized-osaka/groups/bufferline.lua +++ b/lua/solarized-osaka/groups/bufferline.lua @@ -1,6 +1,7 @@ local M = {} function M.get(c, opts) + --stylua: ignore return { BufferLineIndicatorSelected = { fg = c.yellow500 }, } diff --git a/lua/solarized-osaka/groups/cmp.lua b/lua/solarized-osaka/groups/cmp.lua index 4b8acd1..dbedb50 100644 --- a/lua/solarized-osaka/groups/cmp.lua +++ b/lua/solarized-osaka/groups/cmp.lua @@ -1,49 +1,50 @@ local M = {} function M.get(c, opts) + --stylua: ignore return { - CmpDocumentation = { fg = c.fg, bg = c.bg_float }, - CmpDocumentationBorder = { fg = c.base02, bg = c.bg_float }, - CmpGhostText = { fg = c.base01 }, + CmpDocumentation = { fg = c.fg, bg = c.bg_float }, + CmpDocumentationBorder = { fg = c.base02, bg = c.bg_float }, + CmpGhostText = { fg = c.base01 }, - CmpItemAbbr = { fg = c.fg, bg = c.none }, - CmpItemAbbrDeprecated = { fg = c.base01, bg = c.none, strikethrough = true }, - CmpItemAbbrMatch = { fg = c.violet500, bg = c.none }, - CmpItemAbbrMatchFuzzy = { fg = c.violet500, bg = c.none }, + CmpItemAbbr = { fg = c.fg, bg = c.none }, + CmpItemAbbrDeprecated = { fg = c.base01, bg = c.none, strikethrough = true }, + CmpItemAbbrMatch = { fg = c.violet500, bg = c.none }, + CmpItemAbbrMatchFuzzy = { fg = c.violet500, bg = c.none }, - CmpItemMenu = { fg = c.base01, bg = c.none }, + CmpItemMenu = { fg = c.base01, bg = c.none }, - CmpItemKindDefault = { fg = c.base01, bg = c.none }, + CmpItemKindDefault = { fg = c.base01, bg = c.none }, - CmpItemKindCodeium = { fg = c.cyan500, bg = c.none }, - CmpItemKindCopilot = { fg = c.cyan500, bg = c.none }, - CmpItemKindTabNine = { fg = c.cyan500, bg = c.none }, + CmpItemKindCodeium = { fg = c.cyan500, bg = c.none }, + CmpItemKindCopilot = { fg = c.cyan500, bg = c.none }, + CmpItemKindTabNine = { fg = c.cyan500, bg = c.none }, - CmpItemKindKeyword = { fg = c.cyan, bg = c.none }, - CmpItemKindVariable = { fg = c.magenta, bg = c.none }, - CmpItemKindConstant = { fg = c.magenta, bg = c.none }, - CmpItemKindReference = { fg = c.magenta, bg = c.none }, - CmpItemKindValue = { fg = c.magenta, bg = c.none }, + CmpItemKindKeyword = { fg = c.cyan, bg = c.none }, + CmpItemKindVariable = { fg = c.magenta, bg = c.none }, + CmpItemKindConstant = { fg = c.magenta, bg = c.none }, + CmpItemKindReference = { fg = c.magenta, bg = c.none }, + CmpItemKindValue = { fg = c.magenta, bg = c.none }, - CmpItemKindFunction = { fg = c.blue, bg = c.none }, - CmpItemKindMethod = { fg = c.blue, bg = c.none }, - CmpItemKindConstructor = { fg = c.blue, bg = c.none }, + CmpItemKindFunction = { fg = c.blue, bg = c.none }, + CmpItemKindMethod = { fg = c.blue, bg = c.none }, + CmpItemKindConstructor = { fg = c.blue, bg = c.none }, - CmpItemKindClass = { fg = c.orange, bg = c.none }, - CmpItemKindInterface = { fg = c.orange, bg = c.none }, - CmpItemKindStruct = { fg = c.orange, bg = c.none }, - CmpItemKindEvent = { fg = c.orange, bg = c.none }, - CmpItemKindEnum = { fg = c.orange, bg = c.none }, - CmpItemKindUnit = { fg = c.orange, bg = c.none }, + CmpItemKindClass = { fg = c.orange, bg = c.none }, + CmpItemKindInterface = { fg = c.orange, bg = c.none }, + CmpItemKindStruct = { fg = c.orange, bg = c.none }, + CmpItemKindEvent = { fg = c.orange, bg = c.none }, + CmpItemKindEnum = { fg = c.orange, bg = c.none }, + CmpItemKindUnit = { fg = c.orange, bg = c.none }, - CmpItemKindModule = { fg = c.yellow, bg = c.none }, + CmpItemKindModule = { fg = c.yellow, bg = c.none }, - CmpItemKindProperty = { fg = c.cyan, bg = c.none }, - CmpItemKindField = { fg = c.cyan, bg = c.none }, + CmpItemKindProperty = { fg = c.cyan, bg = c.none }, + CmpItemKindField = { fg = c.cyan, bg = c.none }, CmpItemKindTypeParameter = { fg = c.cyan, bg = c.none }, - CmpItemKindEnumMember = { fg = c.cyan, bg = c.none }, - CmpItemKindOperator = { fg = c.cyan, bg = c.none }, - CmpItemKindSnippet = { fg = c.violet500, bg = c.none }, + CmpItemKindEnumMember = { fg = c.cyan, bg = c.none }, + CmpItemKindOperator = { fg = c.cyan, bg = c.none }, + CmpItemKindSnippet = { fg = c.violet500, bg = c.none }, } end diff --git a/lua/solarized-osaka/groups/dashboard.lua b/lua/solarized-osaka/groups/dashboard.lua index 613009a..f5bc06e 100644 --- a/lua/solarized-osaka/groups/dashboard.lua +++ b/lua/solarized-osaka/groups/dashboard.lua @@ -1,14 +1,15 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { DashboardShortCut = { fg = c.cyan }, - DashboardHeader = { fg = c.blue }, - DashboardCenter = { fg = c.magenta }, - DashboardFooter = { fg = c.yellow, italic = true }, - DashboardKey = { fg = c.orange500 }, - DashboardDesc = { fg = c.cyan500 }, - DashboardIcon = { fg = c.cyan500, bold = true }, + DashboardHeader = { fg = c.blue }, + DashboardCenter = { fg = c.magenta }, + DashboardFooter = { fg = c.yellow, italic = true }, + DashboardKey = { fg = c.orange500 }, + DashboardDesc = { fg = c.cyan500 }, + DashboardIcon = { fg = c.cyan500, bold = true }, } end diff --git a/lua/solarized-osaka/groups/editor.lua b/lua/solarized-osaka/groups/editor.lua index d98abfa..36d5114 100644 --- a/lua/solarized-osaka/groups/editor.lua +++ b/lua/solarized-osaka/groups/editor.lua @@ -1,116 +1,112 @@ local M = {} function M.get(c, options) + -- stylua: ignore return { - ColorColumn = { bg = c.base02 }, -- used for the columns set with 'colorcolumn' - Conceal = { fg = c.blue500 }, -- placeholder characters substituted for concealed text (see 'conceallevel') - Cursor = { fg = c.base03, bg = c.base0 }, -- character under the cursor - lCursor = { fg = c.base03, bg = c.base00 }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') - CursorIM = { fg = c.base03, bg = c.base0 }, -- like Cursor, but used when in IME mode |CursorIM| - CursorColumn = { bg = c.base02 }, -- Screen-column at the cursor, when 'cursorcolumn' is set. - CursorLine = { bg = c.base03, sp = c.base1 }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. - Directory = { fg = c.blue500 }, -- directory names (and other special names in listings) - DiffAdd = { fg = c.green500, bg = c.base02, bold = true }, -- diff mode: Added line |diff.txt| - DiffChange = { fg = c.yellow500, bg = c.base02, bold = true }, -- diff mode: Changed line |diff.txt| - DiffDelete = { fg = c.red500, bg = c.base02, bold = true }, -- diff mode: Deleted line |diff.txt| - DiffText = { fg = c.blue500, bg = c.base02, bold = true }, -- diff mode: Changed text within a changed line |diff.txt| - EndOfBuffer = { fg = c.base01 }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. + ColorColumn = { bg = c.base02 }, -- used for the columns set with 'colorcolumn' + Conceal = { fg = c.blue500 }, -- placeholder characters substituted for concealed text (see 'conceallevel') + Cursor = { fg = c.base03, bg = c.base0 }, -- character under the cursor + lCursor = { fg = c.base03, bg = c.base00 }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') + CursorIM = { fg = c.base03, bg = c.base0 }, -- like Cursor, but used when in IME mode |CursorIM| + CursorColumn = { bg = c.base02 }, -- Screen-column at the cursor, when 'cursorcolumn' is set. + CursorLine = { bg = c.base03, sp = c.base1 }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. + Directory = { fg = c.blue500 }, -- directory names (and other special names in listings) + DiffAdd = { fg = c.green500, bg = c.base02, bold = true }, -- diff mode: Added line |diff.txt| + DiffChange = { fg = c.yellow500, bg = c.base02, bold = true }, -- diff mode: Changed line |diff.txt| + DiffDelete = { fg = c.red500, bg = c.base02, bold = true }, -- diff mode: Deleted line |diff.txt| + DiffText = { fg = c.blue500, bg = c.base02, bold = true }, -- diff mode: Changed text within a changed line |diff.txt| + EndOfBuffer = { fg = c.base01 }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. -- TermCursor = { }, -- cursor in a focused terminal -- TermCursorNC= { }, -- cursor in an unfocused terminal - ErrorMsg = { fg = c.red500, reverse = true }, -- error messages on the command line - VertSplit = { fg = c.base00 }, -- the column separating vertically split windows - WinSeparator = { fg = c.base02, bold = true }, -- the column separating vertically split windows - Folded = { fg = c.base0, bg = c.base02, bold = true }, -- line used for closed folds - FoldColumn = { fg = c.base0 }, -- 'foldcolumn' - SignColumn = { fg = c.base0 }, -- column where |signs| are displayed - SignColumnSB = { fg = c.base0 }, -- column where |signs| are displayed - Substitute = { fg = c.base04, bg = c.red500 }, -- |:substitute| replacement text highlighting - LineNr = { fg = c.yellow700, bg = options.transparent and c.none or c.bg }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. - CursorLineNr = { fg = c.orange500, sp = c.base1 }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. - MatchParen = { fg = c.red100, bg = c.red500, bold = true }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| - ModeMsg = { fg = c.blue500 }, -- 'showmode' message (e.g., "-- INSERT -- ") - MsgArea = { fg = c.base01 }, -- Area for messages and cmdline + ErrorMsg = { fg = c.red500, reverse = true }, -- error messages on the command line + VertSplit = { fg = c.base00 }, -- the column separating vertically split windows + WinSeparator = { fg = c.base02, bold = true }, -- the column separating vertically split windows + Folded = { fg = c.base0, bg = c.base02, bold = true }, -- line used for closed folds + FoldColumn = { fg = c.base0 }, -- 'foldcolumn' + SignColumn = { fg = c.base0 }, -- column where |signs| are displayed + SignColumnSB = { fg = c.base0 }, -- column where |signs| are displayed + Substitute = { fg = c.base04, bg = c.red500 }, -- |:substitute| replacement text highlighting + LineNr = { fg = c.yellow700, bg = options.transparent and c.none or c.bg }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. + CursorLineNr = { fg = c.orange500, sp = c.base1 }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. + MatchParen = { fg = c.red100, bg = c.red500, bold = true }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| + ModeMsg = { fg = c.blue500 }, -- 'showmode' message (e.g., "-- INSERT -- ") + MsgArea = { fg = c.base01 }, -- Area for messages and cmdline -- MsgSeparator= { }, -- Separator for scrolled messages, `msgsep` flag of 'display' - MoreMsg = { fg = c.blue500 }, -- |more-prompt| - NonText = { fg = c.base00, bold = true }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|. - Normal = { fg = c.base0, bg = options.transparent and c.none or c.bg }, -- normal text - NormalNC = { fg = c.base00, bg = options.transparent and c.none or options.dim_inactive and c.base04 or c.bg }, -- normal text in non-current windows - NormalSB = { fg = c.base01, bg = c.bg_sidebar }, -- normal text in sidebar - NormalFloat = { fg = c.base0, bg = c.bg_float }, -- Normal text in floating windows. - FloatBorder = { fg = c.yellow700, bg = c.bg_float }, - FloatTitle = { fg = c.base2, bg = c.bg_float }, - Pmenu = { fg = c.base0, bg = c.base02 }, -- Popup menu: normal item. - PmenuSel = { fg = c.base01, bg = c.base2, reverse = true }, -- Popup menu: selected item. - PmenuSbar = { fg = c.base02, reverse = true }, -- Popup menu: scrollbar. - PmenuThumb = { fg = c.base0, reverse = true }, -- Popup menu: Thumb of the scrollbar. - Question = { fg = c.cyan500, bold = true }, -- |hit-enter| prompt and yes/no questions - QuickFixLine = { bg = c.blue700, bold = true }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. - Search = { fg = c.yellow500, reverse = true }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. - IncSearch = { fg = c.orange500, standout = true }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" - CurSearch = "IncSearch", - SpecialKey = { fg = c.base00 }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| - SpellBad = { sp = c.red500, undercurl = true }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. - SpellCap = { sp = c.violet500, undercurl = true }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. - SpellLocal = { sp = c.cyan500, undercurl = true }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. - SpellRare = { sp = c.yellow500, undercurl = true }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. - StatusLine = { fg = c.base1, bg = c.base03 }, -- status line of current window - StatusLineNC = { - fg = options.hide_inactive_statusline and c.bg or c.base0, - bg = options.hide_inactive_statusline and c.none or c.base04, - sp = options.hide_inactive_statusline and c.border or c.none, - underline = options.hide_inactive_statusline and true or false, - }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. - TabLine = { fg = c.base0, bg = c.base02, sp = c.base0 }, -- tab pages line, not active tab page label - TabLineFill = { fg = c.base0, bg = c.base02 }, -- tab pages line, where there are no labels - TabLineSel = { fg = c.yellow500, bg = c.bg }, -- tab pages line, active tab page label - Title = { fg = c.orange500, bold = true }, -- titles for output from ":set all", ":autocmd" etc. - Visual = { bg = c.base03, reverse = true }, -- Visual mode selection - VisualNOS = { bg = c.base03, reverse = true }, -- Visual mode selection when vim is "Not Owning the Selection". - WarningMsg = { fg = c.orange500, bold = true }, -- warning messages - Whitespace = { fg = c.base01 }, -- "nbsp", "space", "tab" and "trail" in 'listchars' - WildMenu = { fg = c.base2, bg = c.base02, reverse = true }, -- current match in 'wildmenu' completion - WinBar = "StatusLine", -- window bar - WinBarNC = "StatusLineNC", -- window bar in inactive windows + MoreMsg = { fg = c.blue500 }, -- |more-prompt| + NonText = { fg = c.base00, bold = true }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|. + Normal = { fg = c.base0, bg = options.transparent and c.none or c.bg }, -- normal text + NormalNC = { fg = c.base00, bg = options.transparent and c.none or options.dim_inactive and c.base04 or c.bg }, -- normal text in non-current windows + NormalSB = { fg = c.base01, bg = c.bg_sidebar }, -- normal text in sidebar + NormalFloat = { fg = c.base0, bg = c.bg_float }, -- Normal text in floating windows. + FloatBorder = { fg = c.yellow700, bg = c.bg_float }, + FloatTitle = { fg = c.base2, bg = c.bg_float }, + Pmenu = { fg = c.base0, bg = c.base02 }, -- Popup menu: normal item. + PmenuSel = { fg = c.base01, bg = c.base2, reverse = true }, -- Popup menu: selected item. + PmenuSbar = { fg = c.base02, reverse = true }, -- Popup menu: scrollbar. + PmenuThumb = { fg = c.base0, reverse = true }, -- Popup menu: Thumb of the scrollbar. + Question = { fg = c.cyan500, bold = true }, -- |hit-enter| prompt and yes/no questions + QuickFixLine = { bg = c.blue700, bold = true }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. + Search = { fg = c.yellow500, reverse = true }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. + IncSearch = { fg = c.orange500, standout = true }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" + CurSearch = "IncSearch", + SpecialKey = { fg = c.base00 }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| + SpellBad = { sp = c.red500, undercurl = true }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. + SpellCap = { sp = c.violet500, undercurl = true }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. + SpellLocal = { sp = c.cyan500, undercurl = true }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. + SpellRare = { sp = c.yellow500, undercurl = true }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. + StatusLine = { fg = c.base1, bg = c.base03 }, -- status line of current window + StatusLineNC = { fg = options.hide_inactive_statusline and c.bg or c.base0, bg = options.hide_inactive_statusline and c.none or c.base04, sp = options.hide_inactive_statusline and c.border or c.none, underline = options.hide_inactive_statusline and true or false }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. + TabLine = { fg = c.base0, bg = c.base02, sp = c.base0 }, -- tab pages line, not active tab page label + TabLineFill = { fg = c.base0, bg = c.base02 }, -- tab pages line, where there are no labels + TabLineSel = { fg = c.yellow500, bg = c.bg }, -- tab pages line, active tab page label + Title = { fg = c.orange500, bold = true }, -- titles for output from ":set all", ":autocmd" etc. + Visual = { bg = c.base03, reverse = true }, -- Visual mode selection + VisualNOS = { bg = c.base03, reverse = true }, -- Visual mode selection when vim is "Not Owning the Selection". + WarningMsg = { fg = c.orange500, bold = true }, -- warning messages + Whitespace = { fg = c.base01 }, -- "nbsp", "space", "tab" and "trail" in 'listchars' + WildMenu = { fg = c.base2, bg = c.base02, reverse = true }, -- current match in 'wildmenu' completion + WinBar = "StatusLine", -- window bar + WinBarNC = "StatusLineNC", -- window bar in inactive windows -- These groups are for the native LSP client. Some other LSP clients may -- use these groups, or use their own. Consult your LSP client's -- documentation. - LspReferenceText = { bg = c.magenta900 }, -- used for highlighting "text" references - LspReferenceRead = { bg = c.magenta900 }, -- used for highlighting "read" references - LspReferenceWrite = { bg = c.magenta900 }, -- used for highlighting "write" references + LspReferenceText = { bg = c.magenta900 }, -- used for highlighting "text" references + LspReferenceRead = { bg = c.magenta900 }, -- used for highlighting "read" references + LspReferenceWrite = { bg = c.magenta900 }, -- used for highlighting "write" references LspSignatureActiveParameter = { bg = c.base03, bold = true }, - LspCodeLens = { fg = c.base01 }, - LspInlayHint = { bg = c.violet900, fg = c.violet500 }, - LspInfoBorder = { fg = c.base02, bg = c.bg_float }, + LspCodeLens = { fg = c.base01 }, + LspInlayHint = { bg = c.violet900, fg = c.violet500 }, + LspInfoBorder = { fg = c.base02, bg = c.bg_float }, - DiagnosticError = { fg = c.error }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticWarn = { fg = c.warning }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticInfo = { fg = c.info }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticHint = { fg = c.hint }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticUnnecessary = { fg = c.base00 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticError = { fg = c.error }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticWarn = { fg = c.warning }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticInfo = { fg = c.info }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticHint = { fg = c.hint }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticUnnecessary = { fg = c.base00 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticVirtualTextError = { bg = c.red900, fg = c.red500 }, -- Used for "Error" diagnostic virtual text - DiagnosticVirtualTextWarn = { bg = c.yellow900, fg = c.yellow500 }, -- Used for "Warning" diagnostic virtual text - DiagnosticVirtualTextInfo = { bg = c.blue900, fg = c.blue500 }, -- Used for "Information" diagnostic virtual text - DiagnosticVirtualTextHint = { bg = c.cyan900, fg = c.cyan500 }, -- Used for "Hint" diagnostic virtual text + DiagnosticVirtualTextError = { bg = c.red900, fg = c.red500 }, -- Used for "Error" diagnostic virtual text + DiagnosticVirtualTextWarn = { bg = c.yellow900, fg = c.yellow500 }, -- Used for "Warning" diagnostic virtual text + DiagnosticVirtualTextInfo = { bg = c.blue900, fg = c.blue500 }, -- Used for "Information" diagnostic virtual text + DiagnosticVirtualTextHint = { bg = c.cyan900, fg = c.cyan500 }, -- Used for "Hint" diagnostic virtual text - DiagnosticUnderlineError = { undercurl = true, sp = c.error }, -- Used to underline "Error" diagnostics - DiagnosticUnderlineWarn = { undercurl = true, sp = c.warning }, -- Used to underline "Warning" diagnostics - DiagnosticUnderlineInfo = { undercurl = true, sp = c.info }, -- Used to underline "Information" diagnostics - DiagnosticUnderlineHint = { undercurl = true, sp = c.hint }, -- Used to underline "Hint" diagnostics + DiagnosticUnderlineError = { undercurl = true, sp = c.error }, -- Used to underline "Error" diagnostics + DiagnosticUnderlineWarn = { undercurl = true, sp = c.warning }, -- Used to underline "Warning" diagnostics + DiagnosticUnderlineInfo = { undercurl = true, sp = c.info }, -- Used to underline "Information" diagnostics + DiagnosticUnderlineHint = { undercurl = true, sp = c.hint }, -- Used to underline "Hint" diagnostics - healthError = { fg = c.error }, - healthSuccess = { fg = c.cyan }, - healthWarning = { fg = c.warning }, + healthError = { fg = c.error }, + healthSuccess = { fg = c.cyan }, + healthWarning = { fg = c.warning }, - diffAdded = { fg = c.green500 }, - diffRemoved = { fg = c.red500 }, - diffChanged = { fg = c.yellow500 }, - diffOldFile = { fg = c.violet500 }, - diffNewFile = { fg = c.orange500 }, - diffFile = { fg = c.blue500 }, - diffLine = { fg = c.base01 }, - diffIndexLine = { fg = c.magenta500 }, + diffAdded = { fg = c.green500 }, + diffRemoved = { fg = c.red500 }, + diffChanged = { fg = c.yellow500 }, + diffOldFile = { fg = c.violet500 }, + diffNewFile = { fg = c.orange500 }, + diffFile = { fg = c.blue500 }, + diffLine = { fg = c.base01 }, + diffIndexLine = { fg = c.magenta500 }, } end diff --git a/lua/solarized-osaka/groups/fern.lua b/lua/solarized-osaka/groups/fern.lua index 0da1fed..ee54a79 100644 --- a/lua/solarized-osaka/groups/fern.lua +++ b/lua/solarized-osaka/groups/fern.lua @@ -1,6 +1,7 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { FernBranchText = { fg = c.blue }, } diff --git a/lua/solarized-osaka/groups/flash.lua b/lua/solarized-osaka/groups/flash.lua index 9ada6ea..5fe018c 100644 --- a/lua/solarized-osaka/groups/flash.lua +++ b/lua/solarized-osaka/groups/flash.lua @@ -1,9 +1,10 @@ local M = {} function M.get(c) + -- stylua: ignore return { FlashBackdrop = { fg = c.base01 }, - FlashLabel = { bg = c.magenta500, bold = true, fg = c.bg }, + FlashLabel = { bg = c.magenta500, bold = true, fg = c.bg }, } end diff --git a/lua/solarized-osaka/groups/gitgutter.lua b/lua/solarized-osaka/groups/gitgutter.lua index ea7d2cd..6436342 100644 --- a/lua/solarized-osaka/groups/gitgutter.lua +++ b/lua/solarized-osaka/groups/gitgutter.lua @@ -1,11 +1,12 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - GitGutterAdd = { fg = c.green500 }, -- diff mode: Added line |diff.txt| - GitGutterChange = { fg = c.yellow500 }, -- diff mode: Changed line |diff.txt| - GitGutterDelete = { fg = c.red500 }, -- diff mode: Deleted line |diff.txt| - GitGutterAddLineNr = { fg = c.green500 }, + GitGutterAdd = { fg = c.green500 }, -- diff mode: Added line |diff.txt| + GitGutterChange = { fg = c.yellow500 }, -- diff mode: Changed line |diff.txt| + GitGutterDelete = { fg = c.red500 }, -- diff mode: Deleted line |diff.txt| + GitGutterAddLineNr = { fg = c.green500 }, GitGutterChangeLineNr = { fg = c.yellow500 }, GitGutterDeleteLineNr = { fg = c.red500 }, } diff --git a/lua/solarized-osaka/groups/gitsigns.lua b/lua/solarized-osaka/groups/gitsigns.lua index 9f20158..6ddcb09 100644 --- a/lua/solarized-osaka/groups/gitsigns.lua +++ b/lua/solarized-osaka/groups/gitsigns.lua @@ -1,8 +1,9 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - GitSignsAdd = { fg = c.green500 }, -- diff mode: Added line |diff.txt| + GitSignsAdd = { fg = c.green500 }, -- diff mode: Added line |diff.txt| GitSignsChange = { fg = c.yellow500 }, -- diff mode: Changed line |diff.txt| GitSignsDelete = { fg = c.red500 }, -- diff mode: Deleted line |diff.txt| } diff --git a/lua/solarized-osaka/groups/glyph-pallete.lua b/lua/solarized-osaka/groups/glyph-pallete.lua index 87d6ae7..8037e6d 100644 --- a/lua/solarized-osaka/groups/glyph-pallete.lua +++ b/lua/solarized-osaka/groups/glyph-pallete.lua @@ -1,6 +1,7 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { GlyphPalette1 = { fg = c.red500 }, GlyphPalette2 = { fg = c.green }, diff --git a/lua/solarized-osaka/groups/hop.lua b/lua/solarized-osaka/groups/hop.lua index 8671e95..4706d4b 100644 --- a/lua/solarized-osaka/groups/hop.lua +++ b/lua/solarized-osaka/groups/hop.lua @@ -1,10 +1,11 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - HopNextKey = { fg = c.magenta500, bold = true }, - HopNextKey1 = { fg = c.violet500, bold = true }, - HopNextKey2 = { fg = c.violet700 }, + HopNextKey = { fg = c.magenta500, bold = true }, + HopNextKey1 = { fg = c.violet500, bold = true }, + HopNextKey2 = { fg = c.violet700 }, HopUnmatched = { fg = c.base01 }, } end diff --git a/lua/solarized-osaka/groups/illuminate.lua b/lua/solarized-osaka/groups/illuminate.lua index ab89cdb..885aab2 100644 --- a/lua/solarized-osaka/groups/illuminate.lua +++ b/lua/solarized-osaka/groups/illuminate.lua @@ -1,11 +1,12 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - illuminatedWord = { bg = c.violet900 }, - illuminatedCurWord = { bg = c.violet900 }, - IlluminatedWordText = { bg = c.violet900 }, - IlluminatedWordRead = { bg = c.magenta900 }, + illuminatedWord = { bg = c.violet900 }, + illuminatedCurWord = { bg = c.violet900 }, + IlluminatedWordText = { bg = c.violet900 }, + IlluminatedWordRead = { bg = c.magenta900 }, IlluminatedWordWrite = { bg = c.magenta900 }, } end diff --git a/lua/solarized-osaka/groups/indent-blankline.lua b/lua/solarized-osaka/groups/indent-blankline.lua index c0ae02a..ae36e6c 100644 --- a/lua/solarized-osaka/groups/indent-blankline.lua +++ b/lua/solarized-osaka/groups/indent-blankline.lua @@ -1,9 +1,10 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - IblIndent = { fg = c.base03, nocombine = true }, - IndentBlanklineChar = { fg = c.base03, nocombine = true }, + IblIndent = { fg = c.base03, nocombine = true }, + IndentBlanklineChar = { fg = c.base03, nocombine = true }, IndentBlanklineContextChar = { fg = c.orange500, nocombine = true }, } end diff --git a/lua/solarized-osaka/groups/lazy.lua b/lua/solarized-osaka/groups/lazy.lua index c432d56..3699453 100644 --- a/lua/solarized-osaka/groups/lazy.lua +++ b/lua/solarized-osaka/groups/lazy.lua @@ -1,6 +1,7 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { LazyProgressDone = { bold = true, fg = c.magenta500 }, LazyProgressTodo = { bold = true, fg = c.base01 }, diff --git a/lua/solarized-osaka/groups/leap.lua b/lua/solarized-osaka/groups/leap.lua index 25ed1f3..9238b32 100644 --- a/lua/solarized-osaka/groups/leap.lua +++ b/lua/solarized-osaka/groups/leap.lua @@ -1,9 +1,10 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - LeapMatch = { bg = c.magenta500, fg = c.fg, bold = true }, - LeapLabel = { fg = c.magenta500, bold = true }, + LeapMatch = { bg = c.magenta500, fg = c.fg, bold = true }, + LeapLabel = { fg = c.magenta500, bold = true }, LeapBackdrop = { fg = c.base01 }, } end diff --git a/lua/solarized-osaka/groups/lightspeed.lua b/lua/solarized-osaka/groups/lightspeed.lua index df2d5ce..886905e 100644 --- a/lua/solarized-osaka/groups/lightspeed.lua +++ b/lua/solarized-osaka/groups/lightspeed.lua @@ -1,20 +1,21 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - LightspeedGreyWash = { fg = c.base01 }, + LightspeedGreyWash = { fg = c.base01 }, -- LightspeedCursor = { link = "Cursor" }, - LightspeedLabel = { fg = c.magenta500, bold = true, underline = true }, - LightspeedLabelDistant = { fg = c.cyan, bold = true, underline = true }, + LightspeedLabel = { fg = c.magenta500, bold = true, underline = true }, + LightspeedLabelDistant = { fg = c.cyan, bold = true, underline = true }, LightspeedLabelDistantOverlapped = { fg = c.cyan500, underline = true }, - LightspeedLabelOverlapped = { fg = c.magenta500, underline = true }, - LightspeedMaskedChar = { fg = c.orange }, - LightspeedOneCharMatch = { bg = c.magenta500, fg = c.fg, bold = true }, - LightspeedPendingOpArea = { bg = c.magenta500, fg = c.fg }, - LightspeedShortcut = { bg = c.magenta500, fg = c.fg, bold = true, underline = true }, + LightspeedLabelOverlapped = { fg = c.magenta500, underline = true }, + LightspeedMaskedChar = { fg = c.orange }, + LightspeedOneCharMatch = { bg = c.magenta500, fg = c.fg, bold = true }, + LightspeedPendingOpArea = { bg = c.magenta500, fg = c.fg }, + LightspeedShortcut = { bg = c.magenta500, fg = c.fg, bold = true, underline = true }, -- LightspeedShortcutOverlapped = { link = "LightspeedShortcut" }, -- LightspeedUniqueChar = { link = "LightspeedUnlabeledMatch" }, - LightspeedUnlabeledMatch = { fg = c.violet500, bold = true }, + LightspeedUnlabeledMatch = { fg = c.violet500, bold = true }, } end diff --git a/lua/solarized-osaka/groups/lspsaga.lua b/lua/solarized-osaka/groups/lspsaga.lua index ed4ce0b..0e2c48f 100644 --- a/lua/solarized-osaka/groups/lspsaga.lua +++ b/lua/solarized-osaka/groups/lspsaga.lua @@ -1,25 +1,26 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - DiagnosticWarning = { link = "DiagnosticWarn" }, - DiagnosticInformation = { link = "DiagnosticInfo" }, - LspFloatWinNormal = { bg = c.bg_float }, - LspFloatWinBorder = { fg = c.base02 }, - LspSagaBorderTitle = { fg = c.cyan }, - LspSagaHoverBorder = { fg = c.blue }, - LspSagaRenameBorder = { fg = c.green }, - LspSagaDefPreviewBorder = { fg = c.green }, - LspSagaCodeActionBorder = { fg = c.blue }, - LspSagaFinderSelection = { fg = c.base03 }, - LspSagaCodeActionTitle = { fg = c.cyan }, - LspSagaCodeActionContent = { fg = c.violet500 }, + DiagnosticWarning = { link = "DiagnosticWarn" }, + DiagnosticInformation = { link = "DiagnosticInfo" }, + LspFloatWinNormal = { bg = c.bg_float }, + LspFloatWinBorder = { fg = c.base02 }, + LspSagaBorderTitle = { fg = c.cyan }, + LspSagaHoverBorder = { fg = c.blue }, + LspSagaRenameBorder = { fg = c.green }, + LspSagaDefPreviewBorder = { fg = c.green }, + LspSagaCodeActionBorder = { fg = c.blue }, + LspSagaFinderSelection = { fg = c.base03 }, + LspSagaCodeActionTitle = { fg = c.cyan }, + LspSagaCodeActionContent = { fg = c.violet500 }, LspSagaSignatureHelpBorder = { fg = c.red }, - ReferencesCount = { fg = c.violet500 }, - DefinitionCount = { fg = c.violet500 }, - DefinitionIcon = { fg = c.blue }, - ReferencesIcon = { fg = c.blue }, - TargetWord = { fg = c.cyan500 }, + ReferencesCount = { fg = c.violet500 }, + DefinitionCount = { fg = c.violet500 }, + DefinitionIcon = { fg = c.blue }, + ReferencesIcon = { fg = c.blue }, + TargetWord = { fg = c.cyan500 }, } end diff --git a/lua/solarized-osaka/groups/mini_animate.lua b/lua/solarized-osaka/groups/mini_animate.lua index 31cca8a..8728f1a 100644 --- a/lua/solarized-osaka/groups/mini_animate.lua +++ b/lua/solarized-osaka/groups/mini_animate.lua @@ -1,8 +1,9 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - MiniAnimateCursor = { reverse = true, nocombine = true }, + MiniAnimateCursor = { reverse = true, nocombine = true }, MiniAnimateNormalFloat = "NormalFloat", } end diff --git a/lua/solarized-osaka/groups/mini_clue.lua b/lua/solarized-osaka/groups/mini_clue.lua index 00f02f1..6d90bfa 100644 --- a/lua/solarized-osaka/groups/mini_clue.lua +++ b/lua/solarized-osaka/groups/mini_clue.lua @@ -1,14 +1,15 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - MiniClueBorder = "FloatBorder", - MiniClueDescGroup = "DiagnosticFloatingWarn", - MiniClueDescSingle = "NormalFloat", - MiniClueNextKey = "DiagnosticFloatingHint", + MiniClueBorder = "FloatBorder", + MiniClueDescGroup = "DiagnosticFloatingWarn", + MiniClueDescSingle = "NormalFloat", + MiniClueNextKey = "DiagnosticFloatingHint", MiniClueNextKeyWithPostkeys = "DiagnosticFloatingError", - MiniClueSeparator = "DiagnosticFloatingInfo", - MiniClueTitle = "FloatTitle", + MiniClueSeparator = "DiagnosticFloatingInfo", + MiniClueTitle = "FloatTitle", } end diff --git a/lua/solarized-osaka/groups/mini_completion.lua b/lua/solarized-osaka/groups/mini_completion.lua index cf8b470..203e496 100644 --- a/lua/solarized-osaka/groups/mini_completion.lua +++ b/lua/solarized-osaka/groups/mini_completion.lua @@ -1,6 +1,7 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { MiniCompletionActiveParameter = "LspSignatureActiveParameter", } diff --git a/lua/solarized-osaka/groups/mini_cursorword.lua b/lua/solarized-osaka/groups/mini_cursorword.lua index 9a2fb0d..0469a1c 100644 --- a/lua/solarized-osaka/groups/mini_cursorword.lua +++ b/lua/solarized-osaka/groups/mini_cursorword.lua @@ -1,8 +1,9 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - MiniCursorword = { underline = true }, + MiniCursorword = { underline = true }, MiniCursorwordCurrent = { underline = true }, } end diff --git a/lua/solarized-osaka/groups/mini_deps.lua b/lua/solarized-osaka/groups/mini_deps.lua index a8e89c5..c2ab6cf 100644 --- a/lua/solarized-osaka/groups/mini_deps.lua +++ b/lua/solarized-osaka/groups/mini_deps.lua @@ -1,17 +1,18 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - MiniDepsChangeAdded = "diffAdded", + MiniDepsChangeAdded = "diffAdded", MiniDepsChangeRemoved = "diffRemoved", - MiniDepsHint = "DiagnosticHint", - MiniDepsInfo = "DiagnosticInfo", - MiniDepsMsgBreaking = "DiagnosticWarn", - MiniDepsPlaceholder = "Comment", - MiniDepsTitle = "Title", - MiniDepsTitleError = "DiffDelete", - MiniDepsTitleSame = "DiffText", - MiniDepsTitleUpdate = "DiffAdd", + MiniDepsHint = "DiagnosticHint", + MiniDepsInfo = "DiagnosticInfo", + MiniDepsMsgBreaking = "DiagnosticWarn", + MiniDepsPlaceholder = "Comment", + MiniDepsTitle = "Title", + MiniDepsTitleError = "DiffDelete", + MiniDepsTitleSame = "DiffText", + MiniDepsTitleUpdate = "DiffAdd", } end diff --git a/lua/solarized-osaka/groups/mini_diff.lua b/lua/solarized-osaka/groups/mini_diff.lua index 2cffe44..77fd107 100644 --- a/lua/solarized-osaka/groups/mini_diff.lua +++ b/lua/solarized-osaka/groups/mini_diff.lua @@ -1,14 +1,15 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - MiniDiffOverAdd = "DiffAdd", - MiniDiffOverChange = "DiffText", + MiniDiffOverAdd = "DiffAdd", + MiniDiffOverChange = "DiffText", MiniDiffOverContext = "DiffChange", - MiniDiffOverDelete = "DiffDelete", - MiniDiffSignAdd = { fg = c.green500 }, - MiniDiffSignChange = { fg = c.yellow500 }, - MiniDiffSignDelete = { fg = c.red500 }, + MiniDiffOverDelete = "DiffDelete", + MiniDiffSignAdd = { fg = c.green500 }, + MiniDiffSignChange = { fg = c.yellow500 }, + MiniDiffSignDelete = { fg = c.red500 }, } end diff --git a/lua/solarized-osaka/groups/mini_files.lua b/lua/solarized-osaka/groups/mini_files.lua index 2d87625..75dc0d9 100644 --- a/lua/solarized-osaka/groups/mini_files.lua +++ b/lua/solarized-osaka/groups/mini_files.lua @@ -1,15 +1,16 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - MiniFilesBorder = "FloatBorder", + MiniFilesBorder = "FloatBorder", MiniFilesBorderModified = "DiagnosticFloatingWarn", - MiniFilesCursorLine = "CursorLine", - MiniFilesDirectory = "Directory", - MiniFilesFile = { fg = c.fg }, - MiniFilesNormal = "NormalFloat", - MiniFilesTitle = "FloatTitle", - MiniFilesTitleFocused = { fg = c.hint, bg = c.bg_float }, + MiniFilesCursorLine = "CursorLine", + MiniFilesDirectory = "Directory", + MiniFilesFile = { fg = c.fg }, + MiniFilesNormal = "NormalFloat", + MiniFilesTitle = "FloatTitle", + MiniFilesTitleFocused = { fg = c.hint, bg = c.bg_float }, } end diff --git a/lua/solarized-osaka/groups/mini_hipatterns.lua b/lua/solarized-osaka/groups/mini_hipatterns.lua index 18a2e68..1a38850 100644 --- a/lua/solarized-osaka/groups/mini_hipatterns.lua +++ b/lua/solarized-osaka/groups/mini_hipatterns.lua @@ -1,11 +1,12 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { MiniHipatternsFixme = { fg = c.bg, bg = c.error, bold = true }, - MiniHipatternsHack = { fg = c.bg, bg = c.warning, bold = true }, - MiniHipatternsNote = { fg = c.bg, bg = c.info, bold = true }, - MiniHipatternsTodo = { fg = c.bg, bg = c.hint, bold = true }, + MiniHipatternsHack = { fg = c.bg, bg = c.warning, bold = true }, + MiniHipatternsNote = { fg = c.bg, bg = c.info, bold = true }, + MiniHipatternsTodo = { fg = c.bg, bg = c.hint, bold = true }, } end diff --git a/lua/solarized-osaka/groups/mini_icons.lua b/lua/solarized-osaka/groups/mini_icons.lua index dd4db19..948870e 100644 --- a/lua/solarized-osaka/groups/mini_icons.lua +++ b/lua/solarized-osaka/groups/mini_icons.lua @@ -1,15 +1,16 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - MiniIconsAzure = { fg = c.blue300 }, - MiniIconsBlue = { fg = c.blue }, - MiniIconsCyan = { fg = c.cyan }, - MiniIconsGreen = { fg = c.green }, - MiniIconsGrey = { fg = c.base2 }, + MiniIconsAzure = { fg = c.blue300 }, + MiniIconsBlue = { fg = c.blue }, + MiniIconsCyan = { fg = c.cyan }, + MiniIconsGreen = { fg = c.green }, + MiniIconsGrey = { fg = c.base2 }, MiniIconsOrange = { fg = c.orange }, MiniIconsPurple = { fg = c.violet }, - MiniIconsRed = { fg = c.red }, + MiniIconsRed = { fg = c.red }, MiniIconsYellow = { fg = c.yellow }, } end diff --git a/lua/solarized-osaka/groups/mini_indentscope.lua b/lua/solarized-osaka/groups/mini_indentscope.lua index 55cdf95..56fc15b 100644 --- a/lua/solarized-osaka/groups/mini_indentscope.lua +++ b/lua/solarized-osaka/groups/mini_indentscope.lua @@ -1,8 +1,9 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - MiniIndentscopeSymbol = { fg = c.violet700, nocombine = true }, + MiniIndentscopeSymbol = { fg = c.violet700, nocombine = true }, MiniIndentscopeSymbolOff = { fg = c.warning, nocombine = true }, } end diff --git a/lua/solarized-osaka/groups/mini_jump.lua b/lua/solarized-osaka/groups/mini_jump.lua index 3c0dd81..26a0d6c 100644 --- a/lua/solarized-osaka/groups/mini_jump.lua +++ b/lua/solarized-osaka/groups/mini_jump.lua @@ -1,11 +1,12 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - MiniJump = { bg = c.magenta500, fg = c.base4 }, - MiniJump2dDim = { fg = c.base01 }, - MiniJump2dSpot = { fg = c.magenta500, bold = true, nocombine = true }, - MiniJump2dSpotAhead = { fg = c.cyan500, bg = c.black, nocombine = true }, + MiniJump = { bg = c.magenta500, fg = c.base4 }, + MiniJump2dDim = { fg = c.base01 }, + MiniJump2dSpot = { fg = c.magenta500, bold = true, nocombine = true }, + MiniJump2dSpotAhead = { fg = c.cyan500, bg = c.black, nocombine = true }, MiniJump2dSpotUnique = { fg = c.yellow500, bold = true, nocombine = true }, } end diff --git a/lua/solarized-osaka/groups/mini_map.lua b/lua/solarized-osaka/groups/mini_map.lua index dc7cc0c..53bbb0f 100644 --- a/lua/solarized-osaka/groups/mini_map.lua +++ b/lua/solarized-osaka/groups/mini_map.lua @@ -1,11 +1,12 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - MiniMapNormal = "NormalFloat", + MiniMapNormal = "NormalFloat", MiniMapSymbolCount = "Special", - MiniMapSymbolLine = "Title", - MiniMapSymbolView = "Delimiter", + MiniMapSymbolLine = "Title", + MiniMapSymbolView = "Delimiter", } end diff --git a/lua/solarized-osaka/groups/mini_notify.lua b/lua/solarized-osaka/groups/mini_notify.lua index 970be12..628bf1e 100644 --- a/lua/solarized-osaka/groups/mini_notify.lua +++ b/lua/solarized-osaka/groups/mini_notify.lua @@ -1,10 +1,11 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { MiniNotifyBorder = "FloatBorder", MiniNotifyNormal = "NormalFloat", - MiniNotifyTitle = "FloatTitle", + MiniNotifyTitle = "FloatTitle", } end diff --git a/lua/solarized-osaka/groups/mini_operators.lua b/lua/solarized-osaka/groups/mini_operators.lua index 21bc7e4..38d2ca9 100644 --- a/lua/solarized-osaka/groups/mini_operators.lua +++ b/lua/solarized-osaka/groups/mini_operators.lua @@ -1,6 +1,7 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { MiniOperatorsExchangeFrom = "IncSearch", } diff --git a/lua/solarized-osaka/groups/mini_pick.lua b/lua/solarized-osaka/groups/mini_pick.lua index 5448dfd..347c2e7 100644 --- a/lua/solarized-osaka/groups/mini_pick.lua +++ b/lua/solarized-osaka/groups/mini_pick.lua @@ -1,20 +1,21 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - MiniPickBorder = "FloatBorder", - MiniPickBorderBusy = "DiagnosticFloatingWarn", - MiniPickBorderText = "FloatTitle", - MiniPickHeader = "DiagnosticFloatingHint", + MiniPickBorder = "FloatBorder", + MiniPickBorderBusy = "DiagnosticFloatingWarn", + MiniPickBorderText = "FloatTitle", + MiniPickHeader = "DiagnosticFloatingHint", MiniPickIconDirectory = "Directory", - MiniPickIconFile = "MiniPickNormal", - MiniPickMatchCurrent = "CursorLine", - MiniPickMatchMarked = "Visual", - MiniPickMatchRanges = "DiagnosticFloatingHint", - MiniPickNormal = "NormalFloat", - MiniPickPreviewLine = "CursorLine", + MiniPickIconFile = "MiniPickNormal", + MiniPickMatchCurrent = "CursorLine", + MiniPickMatchMarked = "Visual", + MiniPickMatchRanges = "DiagnosticFloatingHint", + MiniPickNormal = "NormalFloat", + MiniPickPreviewLine = "CursorLine", MiniPickPreviewRegion = "IncSearch", - MiniPickPrompt = "DiagnosticFloatingInfo", + MiniPickPrompt = "DiagnosticFloatingInfo", } end diff --git a/lua/solarized-osaka/groups/mini_starter.lua b/lua/solarized-osaka/groups/mini_starter.lua index a6a42a9..f0d17c5 100644 --- a/lua/solarized-osaka/groups/mini_starter.lua +++ b/lua/solarized-osaka/groups/mini_starter.lua @@ -1,16 +1,17 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - MiniStarterCurrent = { nocombine = true }, - MiniStarterFooter = { fg = c.yellow, italic = true }, - MiniStarterHeader = { fg = c.blue }, - MiniStarterInactive = { fg = c.base01, style = opts.styles.comments }, - MiniStarterItem = { fg = c.fg, bg = opts.transparent and c.none or c.bg }, + MiniStarterCurrent = { nocombine = true }, + MiniStarterFooter = { fg = c.yellow, italic = true }, + MiniStarterHeader = { fg = c.blue }, + MiniStarterInactive = { fg = c.base01, style = opts.styles.comments }, + MiniStarterItem = { fg = c.fg, bg = opts.transparent and c.none or c.bg }, MiniStarterItemBullet = { fg = c.base01 }, MiniStarterItemPrefix = { fg = c.warning }, - MiniStarterSection = { fg = c.violet500 }, - MiniStarterQuery = { fg = c.info }, + MiniStarterSection = { fg = c.violet500 }, + MiniStarterQuery = { fg = c.info }, } end diff --git a/lua/solarized-osaka/groups/mini_statusline.lua b/lua/solarized-osaka/groups/mini_statusline.lua index c78bf89..5274b59 100644 --- a/lua/solarized-osaka/groups/mini_statusline.lua +++ b/lua/solarized-osaka/groups/mini_statusline.lua @@ -1,22 +1,18 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - MiniStatuslineDevinfo = { fg = c.base01, bg = c.bg_highlight }, - MiniStatuslineFileinfo = { fg = c.base01, bg = c.bg_highlight }, - MiniStatuslineFilename = { fg = c.base01, bg = c.bg_highlight }, - MiniStatuslineInactive = { - fg = opts.hide_inactive_statusline and c.bg or c.blue, - bg = opts.hide_inactive_statusline and c.none or c.bg_statusline, - sp = opts.hide_inactive_statusline and c.border or c.none, - underline = opts.hide_inactive_statusline, - }, + MiniStatuslineDevinfo = { fg = c.base01, bg = c.bg_highlight }, + MiniStatuslineFileinfo = { fg = c.base01, bg = c.bg_highlight }, + MiniStatuslineFilename = { fg = c.base01, bg = c.bg_highlight }, + MiniStatuslineInactive = { fg = opts.hide_inactive_statusline and c.bg or c.blue, bg = opts.hide_inactive_statusline and c.none or c.bg_statusline, sp = opts.hide_inactive_statusline and c.border or c.none, underline = opts.hide_inactive_statusline }, MiniStatuslineModeCommand = { fg = c.black, bg = c.yellow, bold = true }, - MiniStatuslineModeInsert = { fg = c.black, bg = c.green, bold = true }, - MiniStatuslineModeNormal = { fg = c.black, bg = c.blue, bold = true }, - MiniStatuslineModeOther = { fg = c.black, bg = c.cyan500, bold = true }, + MiniStatuslineModeInsert = { fg = c.black, bg = c.green, bold = true }, + MiniStatuslineModeNormal = { fg = c.black, bg = c.blue, bold = true }, + MiniStatuslineModeOther = { fg = c.black, bg = c.cyan500, bold = true }, MiniStatuslineModeReplace = { fg = c.black, bg = c.red, bold = true }, - MiniStatuslineModeVisual = { fg = c.black, bg = c.magenta, bold = true }, + MiniStatuslineModeVisual = { fg = c.black, bg = c.magenta, bold = true }, } end diff --git a/lua/solarized-osaka/groups/mini_surround.lua b/lua/solarized-osaka/groups/mini_surround.lua index 89ded01..74d6230 100644 --- a/lua/solarized-osaka/groups/mini_surround.lua +++ b/lua/solarized-osaka/groups/mini_surround.lua @@ -1,6 +1,7 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { MiniSurround = { bg = c.orange, fg = c.black }, } diff --git a/lua/solarized-osaka/groups/mini_tabline.lua b/lua/solarized-osaka/groups/mini_tabline.lua index 90e0e26..3e5b74c 100644 --- a/lua/solarized-osaka/groups/mini_tabline.lua +++ b/lua/solarized-osaka/groups/mini_tabline.lua @@ -1,15 +1,16 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - MiniTablineCurrent = { fg = c.fg, bg = c.base02, bold = true }, - MiniTablineFill = { bg = c.black }, - MiniTablineHidden = { fg = c.violet500, bg = c.bg_statusline }, + MiniTablineCurrent = { fg = c.fg, bg = c.base02, bold = true }, + MiniTablineFill = { bg = c.black }, + MiniTablineHidden = { fg = c.violet500, bg = c.bg_statusline }, MiniTablineModifiedCurrent = { fg = c.base02, bg = c.fg, bold = true }, - MiniTablineModifiedHidden = { fg = c.bg_statusline, bg = c.violet500 }, + MiniTablineModifiedHidden = { fg = c.bg_statusline, bg = c.violet500 }, MiniTablineModifiedVisible = { fg = c.bg_statusline, bg = c.fg }, - MiniTablineTabpagesection = { bg = c.bg_statusline, fg = c.none }, - MiniTablineVisible = { fg = c.fg, bg = c.bg_statusline }, + MiniTablineTabpagesection = { bg = c.bg_statusline, fg = c.none }, + MiniTablineVisible = { fg = c.fg, bg = c.bg_statusline }, } end diff --git a/lua/solarized-osaka/groups/mini_test.lua b/lua/solarized-osaka/groups/mini_test.lua index 4147b62..2f4b4cf 100644 --- a/lua/solarized-osaka/groups/mini_test.lua +++ b/lua/solarized-osaka/groups/mini_test.lua @@ -1,10 +1,11 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { MiniTestEmphasis = { bold = true }, - MiniTestFail = { fg = c.red, bold = true }, - MiniTestPass = { fg = c.green, bold = true }, + MiniTestFail = { fg = c.red, bold = true }, + MiniTestPass = { fg = c.green, bold = true }, } end diff --git a/lua/solarized-osaka/groups/mini_trailspace.lua b/lua/solarized-osaka/groups/mini_trailspace.lua index 5a30195..abb9791 100644 --- a/lua/solarized-osaka/groups/mini_trailspace.lua +++ b/lua/solarized-osaka/groups/mini_trailspace.lua @@ -1,6 +1,7 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { MiniTrailspace = { bg = c.red }, } diff --git a/lua/solarized-osaka/groups/navic.lua b/lua/solarized-osaka/groups/navic.lua index 0b6ae0c..34f3c89 100644 --- a/lua/solarized-osaka/groups/navic.lua +++ b/lua/solarized-osaka/groups/navic.lua @@ -1,36 +1,37 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - NavicIconsFile = { fg = c.fg, bg = c.bg_statusline }, - NavicIconsModule = { fg = c.yellow, bg = c.bg_statusline }, - NavicIconsNamespace = { fg = c.fg, bg = c.bg_statusline }, - NavicIconsPackage = { fg = c.fg, bg = c.bg_statusline }, - NavicIconsClass = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsMethod = { fg = c.blue, bg = c.bg_statusline }, - NavicIconsProperty = { fg = c.cyan, bg = c.bg_statusline }, - NavicIconsField = { fg = c.cyan, bg = c.bg_statusline }, - NavicIconsConstructor = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsEnum = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsInterface = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsFunction = { fg = c.blue, bg = c.bg_statusline }, - NavicIconsVariable = { fg = c.magenta, bg = c.bg_statusline }, - NavicIconsConstant = { fg = c.magenta, bg = c.bg_statusline }, - NavicIconsString = { fg = c.green, bg = c.bg_statusline }, - NavicIconsNumber = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsBoolean = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsArray = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsObject = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsKey = { fg = c.violet500, bg = c.bg_statusline }, - NavicIconsKeyword = { fg = c.violet500, bg = c.bg_statusline }, - NavicIconsNull = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsEnumMember = { fg = c.cyan, bg = c.bg_statusline }, - NavicIconsStruct = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsEvent = { fg = c.orange, bg = c.bg_statusline }, - NavicIconsOperator = { fg = c.fg, bg = c.bg_statusline }, + NavicIconsFile = { fg = c.fg, bg = c.bg_statusline }, + NavicIconsModule = { fg = c.yellow, bg = c.bg_statusline }, + NavicIconsNamespace = { fg = c.fg, bg = c.bg_statusline }, + NavicIconsPackage = { fg = c.fg, bg = c.bg_statusline }, + NavicIconsClass = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsMethod = { fg = c.blue, bg = c.bg_statusline }, + NavicIconsProperty = { fg = c.cyan, bg = c.bg_statusline }, + NavicIconsField = { fg = c.cyan, bg = c.bg_statusline }, + NavicIconsConstructor = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsEnum = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsInterface = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsFunction = { fg = c.blue, bg = c.bg_statusline }, + NavicIconsVariable = { fg = c.magenta, bg = c.bg_statusline }, + NavicIconsConstant = { fg = c.magenta, bg = c.bg_statusline }, + NavicIconsString = { fg = c.green, bg = c.bg_statusline }, + NavicIconsNumber = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsBoolean = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsArray = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsObject = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsKey = { fg = c.violet500, bg = c.bg_statusline }, + NavicIconsKeyword = { fg = c.violet500, bg = c.bg_statusline }, + NavicIconsNull = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsEnumMember = { fg = c.cyan, bg = c.bg_statusline }, + NavicIconsStruct = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsEvent = { fg = c.orange, bg = c.bg_statusline }, + NavicIconsOperator = { fg = c.fg, bg = c.bg_statusline }, NavicIconsTypeParameter = { fg = c.cyan, bg = c.bg_statusline }, - NavicText = { fg = c.fg, bg = c.bg_statusline }, - NavicSeparator = { fg = c.fg, bg = c.bg_statusline }, + NavicText = { fg = c.fg, bg = c.bg_statusline }, + NavicSeparator = { fg = c.fg, bg = c.bg_statusline }, } end diff --git a/lua/solarized-osaka/groups/neo-tree.lua b/lua/solarized-osaka/groups/neo-tree.lua index 71adfab..7ffb58d 100644 --- a/lua/solarized-osaka/groups/neo-tree.lua +++ b/lua/solarized-osaka/groups/neo-tree.lua @@ -1,11 +1,12 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - NeoTreeNormal = { fg = c.base00, bg = c.bg_sidebar }, + NeoTreeNormal = { fg = c.base00, bg = c.bg_sidebar }, NeoTreeNormalNC = { fg = c.base00, bg = c.bg_sidebar }, - NeoTreeDimText = { fg = c.base01 }, - NeoTreeMessage = { fg = c.base01 }, + NeoTreeDimText = { fg = c.base01 }, + NeoTreeMessage = { fg = c.base01 }, } end diff --git a/lua/solarized-osaka/groups/neogit.lua b/lua/solarized-osaka/groups/neogit.lua index 4a8e15e..f03da32 100644 --- a/lua/solarized-osaka/groups/neogit.lua +++ b/lua/solarized-osaka/groups/neogit.lua @@ -1,14 +1,15 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - NeogitBranch = { fg = c.magenta500 }, - NeogitRemote = { fg = c.violet500 }, - NeogitHunkHeader = { fg = c.base0, bg = c.base02 }, - NeogitHunkHeaderHighlight = { fg = c.blue500, bg = c.base02 }, + NeogitBranch = { fg = c.magenta500 }, + NeogitRemote = { fg = c.violet500 }, + NeogitHunkHeader = { fg = c.base0, bg = c.base02 }, + NeogitHunkHeaderHighlight = { fg = c.blue500, bg = c.base02 }, NeogitDiffContextHighlight = { fg = c.base00, bg = c.base02 }, - NeogitDiffDeleteHighlight = { fg = c.red500, bg = c.red900 }, - NeogitDiffAddHighlight = { fg = c.green500, bg = c.green900 }, + NeogitDiffDeleteHighlight = { fg = c.red500, bg = c.red900 }, + NeogitDiffAddHighlight = { fg = c.green500, bg = c.green900 }, } end diff --git a/lua/solarized-osaka/groups/neotest.lua b/lua/solarized-osaka/groups/neotest.lua index f4d5138..241cf52 100644 --- a/lua/solarized-osaka/groups/neotest.lua +++ b/lua/solarized-osaka/groups/neotest.lua @@ -1,23 +1,24 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - NeotestPassed = { fg = c.green500 }, - NeotestRunning = { fg = c.yellow500 }, - NeotestFailed = { fg = c.red500 }, - NeotestSkipped = { fg = c.blue500 }, - NeotestTest = { fg = c.base00 }, - NeotestNamespace = { fg = c.cyan500 }, - NeotestFocused = { fg = c.yellow500 }, - NeotestFile = { fg = c.cyan500 }, - NeotestDir = { fg = c.blue500 }, - NeotestBorder = { fg = c.blue500 }, - NeotestIndent = { fg = c.base00 }, + NeotestPassed = { fg = c.green500 }, + NeotestRunning = { fg = c.yellow500 }, + NeotestFailed = { fg = c.red500 }, + NeotestSkipped = { fg = c.blue500 }, + NeotestTest = { fg = c.base00 }, + NeotestNamespace = { fg = c.cyan500 }, + NeotestFocused = { fg = c.yellow500 }, + NeotestFile = { fg = c.cyan500 }, + NeotestDir = { fg = c.blue500 }, + NeotestBorder = { fg = c.blue500 }, + NeotestIndent = { fg = c.base00 }, NeotestExpandMarker = { fg = c.base0 }, - NeotestAdapterName = { fg = c.violet500, bold = true }, - NeotestWinSelect = { fg = c.blue500 }, - NeotestMarked = { fg = c.blue500 }, - NeotestTarget = { fg = c.blue500 }, + NeotestAdapterName = { fg = c.violet500, bold = true }, + NeotestWinSelect = { fg = c.blue500 }, + NeotestMarked = { fg = c.blue500 }, + NeotestTarget = { fg = c.blue500 }, --[[ NeotestUnknown = {}, ]] } end diff --git a/lua/solarized-osaka/groups/noice.lua b/lua/solarized-osaka/groups/noice.lua index 7ca5c7b..bb78bf8 100644 --- a/lua/solarized-osaka/groups/noice.lua +++ b/lua/solarized-osaka/groups/noice.lua @@ -1,6 +1,7 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { NoiceCompletionItemKindDefault = { fg = c.base01, bg = c.none }, } diff --git a/lua/solarized-osaka/groups/notify.lua b/lua/solarized-osaka/groups/notify.lua index bcc86ab..8c534a7 100644 --- a/lua/solarized-osaka/groups/notify.lua +++ b/lua/solarized-osaka/groups/notify.lua @@ -3,32 +3,33 @@ local Util = require("solarized-osaka.util") local M = {} function M.get(c, opts) + -- stylua: ignore return { - NotifyBackground = { fg = c.fg, bg = c.bg }, + NotifyBackground = { fg = c.fg, bg = c.bg }, --- Border NotifyERRORBorder = { fg = Util.darken(c.error, 0.3), bg = opts.transparent and c.none or c.bg }, - NotifyWARNBorder = { fg = Util.darken(c.warning, 0.3), bg = opts.transparent and c.none or c.bg }, - NotifyINFOBorder = { fg = Util.darken(c.info, 0.3), bg = opts.transparent and c.none or c.bg }, + NotifyWARNBorder = { fg = Util.darken(c.warning, 0.3), bg = opts.transparent and c.none or c.bg }, + NotifyINFOBorder = { fg = Util.darken(c.info, 0.3), bg = opts.transparent and c.none or c.bg }, NotifyDEBUGBorder = { fg = Util.darken(c.base01, 0.3), bg = opts.transparent and c.none or c.bg }, NotifyTRACEBorder = { fg = Util.darken(c.violet500, 0.3), bg = opts.transparent and c.none or c.bg }, --- Icons - NotifyERRORIcon = { fg = c.error }, - NotifyWARNIcon = { fg = c.warning }, - NotifyINFOIcon = { fg = c.info }, - NotifyDEBUGIcon = { fg = c.base01 }, - NotifyTRACEIcon = { fg = c.violet500 }, + NotifyERRORIcon = { fg = c.error }, + NotifyWARNIcon = { fg = c.warning }, + NotifyINFOIcon = { fg = c.info }, + NotifyDEBUGIcon = { fg = c.base01 }, + NotifyTRACEIcon = { fg = c.violet500 }, --- Title - NotifyERRORTitle = { fg = c.error }, - NotifyWARNTitle = { fg = c.warning }, - NotifyINFOTitle = { fg = c.info }, - NotifyDEBUGTitle = { fg = c.base01 }, - NotifyTRACETitle = { fg = c.violet500 }, + NotifyERRORTitle = { fg = c.error }, + NotifyWARNTitle = { fg = c.warning }, + NotifyINFOTitle = { fg = c.info }, + NotifyDEBUGTitle = { fg = c.base01 }, + NotifyTRACETitle = { fg = c.violet500 }, --- Body - NotifyERRORBody = { fg = c.fg, bg = opts.transparent and c.none or c.bg }, - NotifyWARNBody = { fg = c.fg, bg = opts.transparent and c.none or c.bg }, - NotifyINFOBody = { fg = c.fg, bg = opts.transparent and c.none or c.bg }, - NotifyDEBUGBody = { fg = c.fg, bg = opts.transparent and c.none or c.bg }, - NotifyTRACEBody = { fg = c.fg, bg = opts.transparent and c.none or c.bg }, + NotifyERRORBody = { fg = c.fg, bg = opts.transparent and c.none or c.bg }, + NotifyWARNBody = { fg = c.fg, bg = opts.transparent and c.none or c.bg }, + NotifyINFOBody = { fg = c.fg, bg = opts.transparent and c.none or c.bg }, + NotifyDEBUGBody = { fg = c.fg, bg = opts.transparent and c.none or c.bg }, + NotifyTRACEBody = { fg = c.fg, bg = opts.transparent and c.none or c.bg }, } end diff --git a/lua/solarized-osaka/groups/nvim-tree.lua b/lua/solarized-osaka/groups/nvim-tree.lua index ef790e6..83c8f47 100644 --- a/lua/solarized-osaka/groups/nvim-tree.lua +++ b/lua/solarized-osaka/groups/nvim-tree.lua @@ -1,23 +1,21 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - NvimTreeNormal = { fg = c.base00, bg = c.bg_sidebar }, - NvimTreeWinSeparator = { - fg = opts.styles.sidebars == "transparent" and c.border or c.bg_sidebar, - bg = c.bg_sidebar, - }, - NvimTreeNormalNC = { fg = c.base00, bg = c.bg_sidebar }, - NvimTreeRootFolder = { fg = c.blue, bold = true }, - NvimTreeGitDirty = { fg = c.yellow500 }, - NvimTreeGitNew = { fg = c.green500 }, - NvimTreeGitDeleted = { fg = c.red500 }, - NvimTreeOpenedFile = { bg = c.bg_highlight }, - NvimTreeSpecialFile = { fg = c.violet500, underline = true }, + NvimTreeNormal = { fg = c.base00, bg = c.bg_sidebar }, + NvimTreeWinSeparator = { fg = opts.styles.sidebars == "transparent" and c.border or c.bg_sidebar, bg = c.bg_sidebar }, + NvimTreeNormalNC = { fg = c.base00, bg = c.bg_sidebar }, + NvimTreeRootFolder = { fg = c.blue, bold = true }, + NvimTreeGitDirty = { fg = c.yellow500 }, + NvimTreeGitNew = { fg = c.green500 }, + NvimTreeGitDeleted = { fg = c.red500 }, + NvimTreeOpenedFile = { bg = c.bg_highlight }, + NvimTreeSpecialFile = { fg = c.violet500, underline = true }, NvimTreeIndentMarker = { fg = c.base02 }, - NvimTreeImageFile = { fg = c.base00 }, - NvimTreeSymlink = { fg = c.blue }, - NvimTreeFolderIcon = { bg = c.none, fg = c.blue }, + NvimTreeImageFile = { fg = c.base00 }, + NvimTreeSymlink = { fg = c.blue }, + NvimTreeFolderIcon = { bg = c.none, fg = c.blue }, -- NvimTreeFolderName= { fg = c.fg_float }, } end diff --git a/lua/solarized-osaka/groups/nvim-ts-rainbow.lua b/lua/solarized-osaka/groups/nvim-ts-rainbow.lua index 6982839..84e055f 100644 --- a/lua/solarized-osaka/groups/nvim-ts-rainbow.lua +++ b/lua/solarized-osaka/groups/nvim-ts-rainbow.lua @@ -1,6 +1,7 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { rainbowcol1 = { fg = c.red500 }, rainbowcol2 = { fg = c.orange500 }, diff --git a/lua/solarized-osaka/groups/nvim-ts-rainbow2.lua b/lua/solarized-osaka/groups/nvim-ts-rainbow2.lua index 71adfab..7ffb58d 100644 --- a/lua/solarized-osaka/groups/nvim-ts-rainbow2.lua +++ b/lua/solarized-osaka/groups/nvim-ts-rainbow2.lua @@ -1,11 +1,12 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - NeoTreeNormal = { fg = c.base00, bg = c.bg_sidebar }, + NeoTreeNormal = { fg = c.base00, bg = c.bg_sidebar }, NeoTreeNormalNC = { fg = c.base00, bg = c.bg_sidebar }, - NeoTreeDimText = { fg = c.base01 }, - NeoTreeMessage = { fg = c.base01 }, + NeoTreeDimText = { fg = c.base01 }, + NeoTreeMessage = { fg = c.base01 }, } end diff --git a/lua/solarized-osaka/groups/rainbow-delimiters.lua b/lua/solarized-osaka/groups/rainbow-delimiters.lua index 71adfab..7ffb58d 100644 --- a/lua/solarized-osaka/groups/rainbow-delimiters.lua +++ b/lua/solarized-osaka/groups/rainbow-delimiters.lua @@ -1,11 +1,12 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - NeoTreeNormal = { fg = c.base00, bg = c.bg_sidebar }, + NeoTreeNormal = { fg = c.base00, bg = c.bg_sidebar }, NeoTreeNormalNC = { fg = c.base00, bg = c.bg_sidebar }, - NeoTreeDimText = { fg = c.base01 }, - NeoTreeMessage = { fg = c.base01 }, + NeoTreeDimText = { fg = c.base01 }, + NeoTreeMessage = { fg = c.base01 }, } end diff --git a/lua/solarized-osaka/groups/scrollbar.lua b/lua/solarized-osaka/groups/scrollbar.lua index 400d372..f7773ed 100644 --- a/lua/solarized-osaka/groups/scrollbar.lua +++ b/lua/solarized-osaka/groups/scrollbar.lua @@ -1,26 +1,27 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - ScrollbarHandle = { fg = c.none, bg = c.bg_highlight }, + ScrollbarHandle = { fg = c.none, bg = c.bg_highlight }, ScrollbarSearchHandle = { fg = c.orange, bg = c.bg_highlight }, - ScrollbarSearch = { fg = c.orange, bg = c.none }, + ScrollbarSearch = { fg = c.orange, bg = c.none }, - ScrollbarErrorHandle = { fg = c.error, bg = c.bg_highlight }, - ScrollbarError = { fg = c.error, bg = c.none }, + ScrollbarErrorHandle = { fg = c.error, bg = c.bg_highlight }, + ScrollbarError = { fg = c.error, bg = c.none }, - ScrollbarWarnHandle = { fg = c.warning, bg = c.bg_highlight }, - ScrollbarWarn = { fg = c.warning, bg = c.none }, + ScrollbarWarnHandle = { fg = c.warning, bg = c.bg_highlight }, + ScrollbarWarn = { fg = c.warning, bg = c.none }, - ScrollbarInfoHandle = { fg = c.info, bg = c.bg_highlight }, - ScrollbarInfo = { fg = c.info, bg = c.none }, + ScrollbarInfoHandle = { fg = c.info, bg = c.bg_highlight }, + ScrollbarInfo = { fg = c.info, bg = c.none }, - ScrollbarHintHandle = { fg = c.hint, bg = c.bg_highlight }, - ScrollbarHint = { fg = c.hint, bg = c.none }, + ScrollbarHintHandle = { fg = c.hint, bg = c.bg_highlight }, + ScrollbarHint = { fg = c.hint, bg = c.none }, - ScrollbarMiscHandle = { fg = c.violet500, bg = c.bg_highlight }, - ScrollbarMisc = { fg = c.violet500, bg = c.none }, + ScrollbarMiscHandle = { fg = c.violet500, bg = c.bg_highlight }, + ScrollbarMisc = { fg = c.violet500, bg = c.none }, } end diff --git a/lua/solarized-osaka/groups/semantic_tokens.lua b/lua/solarized-osaka/groups/semantic_tokens.lua index 91281f3..f6ebd5a 100644 --- a/lua/solarized-osaka/groups/semantic_tokens.lua +++ b/lua/solarized-osaka/groups/semantic_tokens.lua @@ -1,48 +1,49 @@ local M = {} function M.get(c) + -- stylua: ignore return { - ["@lsp.type.boolean"] = "@boolean", - ["@lsp.type.builtinType"] = "@type.builtin", - ["@lsp.type.comment"] = "@comment", - ["@lsp.type.decorator"] = "@attribute", - ["@lsp.type.deriveHelper"] = "@attribute", - ["@lsp.type.enum"] = "@type", - ["@lsp.type.enumMember"] = "@constant", - ["@lsp.type.escapeSequence"] = "@string.escape", - ["@lsp.type.formatSpecifier"] = "@markup.list", - ["@lsp.type.generic"] = "@variable", - ["@lsp.type.interface"] = { fg = c.blue500 }, - ["@lsp.type.keyword"] = "@keyword", - ["@lsp.type.lifetime"] = "@keyword.storage", - ["@lsp.type.namespace"] = "@module", - ["@lsp.type.number"] = "@number", - ["@lsp.type.operator"] = "@operator", - ["@lsp.type.parameter"] = "@variable.parameter", - ["@lsp.type.property"] = "@property", - ["@lsp.type.selfKeyword"] = "@variable.builtin", - ["@lsp.type.selfTypeKeyword"] = "@variable.builtin", - ["@lsp.type.string"] = "@string", - ["@lsp.type.typeAlias"] = "@type.definition", - ["@lsp.type.unresolvedReference"] = { undercurl = true, sp = c.error }, - ["@lsp.type.variable"] = {}, -- use treesitter styles for regular variables - ["@lsp.typemod.class.defaultLibrary"] = "@type.builtin", - ["@lsp.typemod.enum.defaultLibrary"] = "@type.builtin", + ["@lsp.type.boolean"] = "@boolean", + ["@lsp.type.builtinType"] = "@type.builtin", + ["@lsp.type.comment"] = "@comment", + ["@lsp.type.decorator"] = "@attribute", + ["@lsp.type.deriveHelper"] = "@attribute", + ["@lsp.type.enum"] = "@type", + ["@lsp.type.enumMember"] = "@constant", + ["@lsp.type.escapeSequence"] = "@string.escape", + ["@lsp.type.formatSpecifier"] = "@markup.list", + ["@lsp.type.generic"] = "@variable", + ["@lsp.type.interface"] = { fg = c.blue500 }, + ["@lsp.type.keyword"] = "@keyword", + ["@lsp.type.lifetime"] = "@keyword.storage", + ["@lsp.type.namespace"] = "@module", + ["@lsp.type.number"] = "@number", + ["@lsp.type.operator"] = "@operator", + ["@lsp.type.parameter"] = "@variable.parameter", + ["@lsp.type.property"] = "@property", + ["@lsp.type.selfKeyword"] = "@variable.builtin", + ["@lsp.type.selfTypeKeyword"] = "@variable.builtin", + ["@lsp.type.string"] = "@string", + ["@lsp.type.typeAlias"] = "@type.definition", + ["@lsp.type.unresolvedReference"] = { undercurl = true, sp = c.error }, + ["@lsp.type.variable"] = {}, -- use treesitter styles for regular variables + ["@lsp.typemod.class.defaultLibrary"] = "@type.builtin", + ["@lsp.typemod.enum.defaultLibrary"] = "@type.builtin", ["@lsp.typemod.enumMember.defaultLibrary"] = "@constant.builtin", - ["@lsp.typemod.function.defaultLibrary"] = "@function.builtin", - ["@lsp.typemod.keyword.async"] = "@keyword.coroutine", - ["@lsp.typemod.keyword.injected"] = "@keyword", - ["@lsp.typemod.macro.defaultLibrary"] = "@function.builtin", - ["@lsp.typemod.method.defaultLibrary"] = "@function.builtin", - ["@lsp.typemod.operator.injected"] = "@operator", - ["@lsp.typemod.string.injected"] = "@string", - ["@lsp.typemod.struct.defaultLibrary"] = "@type.builtin", - ["@lsp.typemod.type.defaultLibrary"] = { fg = c.blue500 }, - ["@lsp.typemod.typeAlias.defaultLibrary"] = { fg = c.blue500 }, - ["@lsp.typemod.variable.callable"] = "@function", - ["@lsp.typemod.variable.defaultLibrary"] = "@variable.builtin", - ["@lsp.typemod.variable.injected"] = "@variable", - ["@lsp.typemod.variable.static"] = "@constant", + ["@lsp.typemod.function.defaultLibrary"] = "@function.builtin", + ["@lsp.typemod.keyword.async"] = "@keyword.coroutine", + ["@lsp.typemod.keyword.injected"] = "@keyword", + ["@lsp.typemod.macro.defaultLibrary"] = "@function.builtin", + ["@lsp.typemod.method.defaultLibrary"] = "@function.builtin", + ["@lsp.typemod.operator.injected"] = "@operator", + ["@lsp.typemod.string.injected"] = "@string", + ["@lsp.typemod.struct.defaultLibrary"] = "@type.builtin", + ["@lsp.typemod.type.defaultLibrary"] = { fg = c.blue500 }, + ["@lsp.typemod.typeAlias.defaultLibrary"] = { fg = c.blue500 }, + ["@lsp.typemod.variable.callable"] = "@function", + ["@lsp.typemod.variable.defaultLibrary"] = "@variable.builtin", + ["@lsp.typemod.variable.injected"] = "@variable", + ["@lsp.typemod.variable.static"] = "@constant", -- NOTE: maybe add these with distinct highlights? -- ["@lsp.typemod.variable.globalScope"] (global variables) } diff --git a/lua/solarized-osaka/groups/snacks.lua b/lua/solarized-osaka/groups/snacks.lua index 7da134b..3fb84fe 100644 --- a/lua/solarized-osaka/groups/snacks.lua +++ b/lua/solarized-osaka/groups/snacks.lua @@ -1,18 +1,19 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - SnacksDashboardDesc = { fg = c.cyan500 }, - SnacksDashboardKey = { fg = c.orange500 }, - SnacksDashboardFooter = { fg = c.yellow, italic = true }, - SnacksDashboardSpecial = { fg = c.yellow500 }, - SnacksDashboardHeader = { fg = c.blue }, - SnacksDashboardIcon = { fg = c.cyan500, bold = true }, + SnacksDashboardDesc = { fg = c.cyan500 }, + SnacksDashboardKey = { fg = c.orange500 }, + SnacksDashboardFooter = { fg = c.yellow, italic = true }, + SnacksDashboardSpecial = { fg = c.yellow500 }, + SnacksDashboardHeader = { fg = c.blue }, + SnacksDashboardIcon = { fg = c.cyan500, bold = true }, SnacksNotifierBorderTrace = { fg = c.magenta500 }, - SnacksNotifierIconTrace = { fg = c.magenta500 }, - SnacksNotifierTitleTrace = { fg = c.magenta500 }, - SnacksIndentScope = { fg = c.violet700, nocombine = true }, - SnacksIndent = { fg = c.base03, nocombine = true }, + SnacksNotifierIconTrace = { fg = c.magenta500 }, + SnacksNotifierTitleTrace = { fg = c.magenta500 }, + SnacksIndentScope = { fg = c.violet700, nocombine = true }, + SnacksIndent = { fg = c.base03, nocombine = true }, } end diff --git a/lua/solarized-osaka/groups/sneak.lua b/lua/solarized-osaka/groups/sneak.lua index d56b9e8..d11dec5 100644 --- a/lua/solarized-osaka/groups/sneak.lua +++ b/lua/solarized-osaka/groups/sneak.lua @@ -1,8 +1,9 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - Sneak = { fg = c.bg_highlight, bg = c.magenta }, + Sneak = { fg = c.bg_highlight, bg = c.magenta }, SneakScope = { bg = c.base03 }, } end diff --git a/lua/solarized-osaka/groups/syntax.lua b/lua/solarized-osaka/groups/syntax.lua index 7000230..09d267c 100644 --- a/lua/solarized-osaka/groups/syntax.lua +++ b/lua/solarized-osaka/groups/syntax.lua @@ -1,59 +1,60 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - Comment = { fg = c.base01, style = opts.styles.comments }, -- any comment - Constant = { fg = c.cyan500 }, -- (preferred) any constant - String = { fg = c.cyan500 }, -- a string constant: "this is a string" - Character = "Constant", -- a character constant: 'c', '\n' + Comment = { fg = c.base01, style = opts.styles.comments }, -- any comment + Constant = { fg = c.cyan500 }, -- (preferred) any constant + String = { fg = c.cyan500 }, -- a string constant: "this is a string" + Character = "Constant", -- a character constant: 'c', '\n' -- Number = { }, -- a number constant: 234, 0xff -- Boolean = { }, -- a boolean constant: TRUE, false -- Float = { }, -- a floating point constant: 2.3e10 - Identifier = { fg = c.blue500, style = opts.styles.variables }, -- (preferred) any variable name - Function = { fg = c.blue500, style = opts.styles.functions }, -- function name (also: methods for classes) + Identifier = { fg = c.blue500, style = opts.styles.variables }, -- (preferred) any variable name + Function = { fg = c.blue500, style = opts.styles.functions }, -- function name (also: methods for classes) - Statement = { fg = c.green500 }, -- (preferred) any statement + Statement = { fg = c.green500 }, -- (preferred) any statement -- Conditional = { }, -- if, then, else, endif, switch, etc. -- Repeat = { }, -- for, do, while, etc. -- Label = { }, -- case, default, etc. - Operator = { fg = c.green500 }, -- "sizeof", "+", "*", etc. - Keyword = { fg = c.green500, style = opts.styles.keywords }, -- any other keyword + Operator = { fg = c.green500 }, -- "sizeof", "+", "*", etc. + Keyword = { fg = c.green500, style = opts.styles.keywords }, -- any other keyword -- Exception = { }, -- try, catch, throw - PreProc = { fg = c.red500 }, -- (preferred) generic Preprocessor + PreProc = { fg = c.red500 }, -- (preferred) generic Preprocessor -- Include = { }, -- preprocessor #include -- Define = { }, -- preprocessor #define -- Macro = { }, -- same as Define -- PreCondit = { }, -- preprocessor #if, #else, #endif, etc. - Type = { fg = c.yellow500 }, -- (preferred) int, long, char, etc. + Type = { fg = c.yellow500 }, -- (preferred) int, long, char, etc. -- StorageClass = { }, -- static, register, volatile, etc. -- Structure = { }, -- struct, union, enum, etc. -- Typedef = { }, -- A typedef - Special = { fg = c.orange500 }, -- (preferred) any special symbol + Special = { fg = c.orange500 }, -- (preferred) any special symbol -- SpecialChar = { }, -- special character in a constant -- Tag = { }, -- you can use CTRL-] on this -- Delimiter = { }, -- character that needs attention -- SpecialComment= { }, -- special things inside a comment - Debug = { fg = c.orange500 }, -- debugging statements - htmlH1 = { fg = c.magenta500, bold = true }, - htmlH2 = { fg = c.blue500, bold = true }, + Debug = { fg = c.orange500 }, -- debugging statements + htmlH1 = { fg = c.magenta500, bold = true }, + htmlH2 = { fg = c.blue500, bold = true }, -- mkdHeading = { fg = c.orange, bold = true }, - mkdCode = { bg = c.green900 }, - mkdCodeDelimiter = { fg = c.base0, bg = c.green700 }, - mkdCodeStart = { fg = c.orange500, bold = true }, - mkdCodeEnd = { fg = c.orange500, bold = true }, + mkdCode = { bg = c.green900 }, + mkdCodeDelimiter = { fg = c.base0, bg = c.green700 }, + mkdCodeStart = { fg = c.orange500, bold = true }, + mkdCodeEnd = { fg = c.orange500, bold = true }, -- mkdLink = { fg = c.blue, underline = true }, markdownHeadingDelimiter = { fg = c.orange500, bold = true }, - markdownCode = { fg = c.yellow500, bg = c.green900 }, - markdownCodeBlock = { fg = c.yellow500, bg = c.green900 }, - markdownH1 = { fg = c.magenta500, bold = true }, - markdownH2 = { fg = c.violet500, bold = true }, - markdownLinkText = { fg = c.blue500, underline = true }, + markdownCode = { fg = c.yellow500, bg = c.green900 }, + markdownCodeBlock = { fg = c.yellow500, bg = c.green900 }, + markdownH1 = { fg = c.magenta500, bold = true }, + markdownH2 = { fg = c.violet500, bold = true }, + markdownLinkText = { fg = c.blue500, underline = true }, } end diff --git a/lua/solarized-osaka/groups/telescope.lua b/lua/solarized-osaka/groups/telescope.lua index e96f6e8..450db12 100644 --- a/lua/solarized-osaka/groups/telescope.lua +++ b/lua/solarized-osaka/groups/telescope.lua @@ -1,6 +1,7 @@ local M = {} function M.get(c) + -- stylua: ignore return { TelescopeBorder = { fg = c.base02, bg = c.bg_float }, TelescopeNormal = { fg = c.base0, bg = c.bg_float }, diff --git a/lua/solarized-osaka/groups/treesitter-context.lua b/lua/solarized-osaka/groups/treesitter-context.lua index 5e41e13..aa54ea0 100644 --- a/lua/solarized-osaka/groups/treesitter-context.lua +++ b/lua/solarized-osaka/groups/treesitter-context.lua @@ -1,6 +1,7 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { TreesitterContext = { bg = c.violet900 }, } diff --git a/lua/solarized-osaka/groups/treesitter.lua b/lua/solarized-osaka/groups/treesitter.lua index 329d967..4c7607e 100644 --- a/lua/solarized-osaka/groups/treesitter.lua +++ b/lua/solarized-osaka/groups/treesitter.lua @@ -1,63 +1,64 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - ["@annotation"] = "PreProc", - ["@attribute"] = "PreProc", - ["@boolean"] = "Boolean", - ["@character"] = "Character", - ["@character.special"] = "SpecialChar", - ["@comment"] = "Comment", - ["@keyword.conditional"] = "Conditional", - ["@constant"] = "Constant", - ["@constant.builtin"] = "Special", - ["@constant.macro"] = "Define", - ["@keyword.debug"] = "Debug", - ["@keyword.directive.define"] = "Define", - ["@keyword.exception"] = "Exception", - ["@number.float"] = "Float", - ["@function"] = "Function", - ["@function.builtin"] = "Special", - ["@function.call"] = "@function", - ["@function.macro"] = "Macro", - ["@keyword.import"] = "Include", - ["@keyword.coroutine"] = "@keyword", - ["@keyword.operator"] = "@operator", - ["@keyword.return"] = "@keyword", - ["@function.method"] = "Function", - ["@function.method.call"] = "@function.method", - ["@namespace.builtin"] = "@variable.builtin", - ["@none"] = {}, - ["@number"] = "Number", - ["@keyword.directive"] = "PreProc", - ["@keyword.repeat"] = "Repeat", - ["@keyword.storage"] = "StorageClass", - ["@string"] = "String", - ["@markup.link.label"] = "SpecialChar", - ["@markup.link.label.symbol"] = "Identifier", - ["@tag"] = "Label", - ["@tag.attribute"] = "@property", - ["@tag.delimiter"] = "Delimiter", - ["@markup"] = "@none", - ["@markup.environment"] = "Macro", - ["@markup.environment.name"] = "Type", - ["@markup.raw"] = "String", - ["@markup.math"] = "Special", - ["@markup.strong"] = { bold = true }, - ["@markup.italic"] = { italic = true }, - ["@markup.strikethrough"] = { strikethrough = true }, - ["@markup.underline"] = { underline = true }, - ["@markup.heading"] = "Title", - ["@comment.note"] = { fg = c.hint }, - ["@comment.error"] = { fg = c.error }, - ["@comment.hint"] = { fg = c.hint }, - ["@comment.info"] = { fg = c.info }, - ["@comment.warning"] = { fg = c.warning }, - ["@comment.todo"] = { fg = c.todo }, - ["@markup.link.url"] = "Underlined", - ["@type"] = "Type", - ["@type.definition"] = "Typedef", - ["@type.qualifier"] = "@keyword", + ["@annotation"] = "PreProc", + ["@attribute"] = "PreProc", + ["@boolean"] = "Boolean", + ["@character"] = "Character", + ["@character.special"] = "SpecialChar", + ["@comment"] = "Comment", + ["@keyword.conditional"] = "Conditional", + ["@constant"] = "Constant", + ["@constant.builtin"] = "Special", + ["@constant.macro"] = "Define", + ["@keyword.debug"] = "Debug", + ["@keyword.directive.define"] = "Define", + ["@keyword.exception"] = "Exception", + ["@number.float"] = "Float", + ["@function"] = "Function", + ["@function.builtin"] = "Special", + ["@function.call"] = "@function", + ["@function.macro"] = "Macro", + ["@keyword.import"] = "Include", + ["@keyword.coroutine"] = "@keyword", + ["@keyword.operator"] = "@operator", + ["@keyword.return"] = "@keyword", + ["@function.method"] = "Function", + ["@function.method.call"] = "@function.method", + ["@namespace.builtin"] = "@variable.builtin", + ["@none"] = {}, + ["@number"] = "Number", + ["@keyword.directive"] = "PreProc", + ["@keyword.repeat"] = "Repeat", + ["@keyword.storage"] = "StorageClass", + ["@string"] = "String", + ["@markup.link.label"] = "SpecialChar", + ["@markup.link.label.symbol"] = "Identifier", + ["@tag"] = "Label", + ["@tag.attribute"] = "@property", + ["@tag.delimiter"] = "Delimiter", + ["@markup"] = "@none", + ["@markup.environment"] = "Macro", + ["@markup.environment.name"] = "Type", + ["@markup.raw"] = "String", + ["@markup.math"] = "Special", + ["@markup.strong"] = { bold = true }, + ["@markup.italic"] = { italic = true }, + ["@markup.strikethrough"] = { strikethrough = true }, + ["@markup.underline"] = { underline = true }, + ["@markup.heading"] = "Title", + ["@comment.note"] = { fg = c.hint }, + ["@comment.error"] = { fg = c.error }, + ["@comment.hint"] = { fg = c.hint }, + ["@comment.info"] = { fg = c.info }, + ["@comment.warning"] = { fg = c.warning }, + ["@comment.todo"] = { fg = c.todo }, + ["@markup.link.url"] = "Underlined", + ["@type"] = "Type", + ["@type.definition"] = "Typedef", + ["@type.qualifier"] = "@keyword", -- Misc -- TODO: @@ -65,75 +66,75 @@ function M.get(c, opts) -- ["@operator"] = { fg = c.green500 }, -- For any operator: `+`, but also `->` and `*` in C. -- Punctuation - ["@punctuation.delimiter"] = { fg = c.green500 }, -- For delimiters ie: `.` - ["@punctuation.bracket"] = { fg = c.orange500 }, -- For brackets and parens. - ["@punctuation.special"] = { fg = c.orange500 }, -- For special punctutation that does not fall in the catagories before. + ["@punctuation.delimiter"] = { fg = c.green500 }, -- For delimiters ie: `.` + ["@punctuation.bracket"] = { fg = c.orange500 }, -- For brackets and parens. + ["@punctuation.special"] = { fg = c.orange500 }, -- For special punctutation that does not fall in the catagories before. ["@punctuation.special.markdown"] = { fg = c.orange500, bold = true }, - ["@markup.list"] = { fg = c.blue500 }, -- For special punctutation that does not fall in the catagories before. - ["@markup.list.markdown"] = { fg = c.orange500, bold = true }, + ["@markup.list"] = { fg = c.blue500 }, -- For special punctutation that does not fall in the catagories before. + ["@markup.list.markdown"] = { fg = c.orange500, bold = true }, -- Literals - ["@string.documentation"] = { fg = c.cyan500 }, - ["@string.regexp"] = { fg = c.cyan300 }, -- For regexes. - ["@string.escape"] = { fg = c.orange700 }, -- For escape characters within a string. + ["@string.documentation"] = { fg = c.cyan500 }, + ["@string.regexp"] = { fg = c.cyan300 }, -- For regexes. + ["@string.escape"] = { fg = c.orange700 }, -- For escape characters within a string. -- Functions - ["@constructor"] = { fg = c.orange500 }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. - ["@variable.parameter"] = { fg = c.orange500 }, -- For parameters of a function. - ["@variable.parameter.builtin"] = { fg = c.yellow300 }, -- For builtin parameters of a function, e.g. "..." or Smali's p[1-99] + ["@constructor"] = { fg = c.orange500 }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. + ["@variable.parameter"] = { fg = c.orange500 }, -- For parameters of a function. + ["@variable.parameter.builtin"] = { fg = c.yellow300 }, -- For builtin parameters of a function, e.g. "..." or Smali's p[1-99] -- Keywords - ["@keyword"] = { fg = c.green500, style = opts.styles.keywords }, -- For keywords that don't fall in previous categories. - ["@keyword.function"] = { fg = c.green500, style = opts.styles.functions }, -- For keywords used to define a fuction. + ["@keyword"] = { fg = c.green500, style = opts.styles.keywords }, -- For keywords that don't fall in previous categories. + ["@keyword.function"] = { fg = c.green500, style = opts.styles.functions }, -- For keywords used to define a fuction. - ["@label"] = { fg = c.green500 }, -- For labels: `label:` in C and `:label:` in Lua. + ["@label"] = { fg = c.green500 }, -- For labels: `label:` in C and `:label:` in Lua. -- Types - ["@type.builtin"] = "Type", - ["@variable.member"] = { fg = c.cyan500 }, -- For fields. - ["@property"] = "Identifier", + ["@type.builtin"] = "Type", + ["@variable.member"] = { fg = c.cyan500 }, -- For fields. + ["@property"] = "Identifier", -- Identifiers - ["@variable"] = { fg = c.base0, style = opts.styles.variables }, -- Any variable name that does not have another highlight. - ["@variable.builtin"] = { fg = c.orange500 }, -- Variable names that are defined by the languages, like `this` or `self`. - ["@module.builtin"] = { fg = c.orange500 }, -- Variable names that are defined by the languages, like `this` or `self`. + ["@variable"] = { fg = c.base0, style = opts.styles.variables }, -- Any variable name that does not have another highlight. + ["@variable.builtin"] = { fg = c.orange500 }, -- Variable names that are defined by the languages, like `this` or `self`. + ["@module.builtin"] = { fg = c.orange500 }, -- Variable names that are defined by the languages, like `this` or `self`. -- Text - ["@markup.raw.markdown"] = { fg = c.blue }, - ["@markup.raw.markdown_inline"] = { fg = c.yellow500, bg = c.green900 }, - ["@markup.link"] = { fg = c.blue500, underline = true }, + ["@markup.raw.markdown"] = { fg = c.blue }, + ["@markup.raw.markdown_inline"] = { fg = c.yellow500, bg = c.green900 }, + ["@markup.link"] = { fg = c.blue500, underline = true }, - ["@markup.list.unchecked"] = { fg = c.yellow500 }, -- For brackets and parens. - ["@markup.list.checked"] = { fg = c.green500 }, -- For brackets and parens. + ["@markup.list.unchecked"] = { fg = c.yellow500 }, -- For brackets and parens. + ["@markup.list.checked"] = { fg = c.green500 }, -- For brackets and parens. - ["@diff.plus"] = "DiffAdd", - ["@diff.minus"] = "DiffDelete", - ["@diff.delta"] = "DiffChange", + ["@diff.plus"] = "DiffAdd", + ["@diff.minus"] = "DiffDelete", + ["@diff.delta"] = "DiffChange", - ["@module"] = "Include", + ["@module"] = "Include", -- tsx - ["@constructor.tsx"] = { fg = c.blue500 }, - ["@tag.delimiter.tsx"] = { fg = c.orange500 }, - ["@tag.tsx"] = { fg = c.yellow500 }, - ["@keyword.return.tsx"] = { fg = c.green500, italic = true }, - ["@keyword.tsx"] = { fg = c.green500, italic = true }, + ["@constructor.tsx"] = { fg = c.blue500 }, + ["@tag.delimiter.tsx"] = { fg = c.orange500 }, + ["@tag.tsx"] = { fg = c.yellow500 }, + ["@keyword.return.tsx"] = { fg = c.green500, italic = true }, + ["@keyword.tsx"] = { fg = c.green500, italic = true }, -- typescript - ["@variable.typescript"] = { fg = c.yellow500 }, + ["@variable.typescript"] = { fg = c.yellow500 }, -- Vue - ["@tag.delimiter.vue"] = { fg = c.orange500 }, + ["@tag.delimiter.vue"] = { fg = c.orange500 }, -- html - ["@tag.delimiter.html"] = { fg = c.orange500 }, + ["@tag.delimiter.html"] = { fg = c.orange500 }, -- javascriptreact - ["@keyword.javascript"] = { fg = c.green500, italic = true }, - ["@keyword.return.javascript"] = { fg = c.green500, italic = true }, - ["@tag.delimiter.javascript"] = { fg = c.orange500 }, - ["@tag.javascript"] = { fg = c.yellow500 }, - ["@variable.javascript"] = { fg = c.yellow500 }, + ["@keyword.javascript"] = { fg = c.green500, italic = true }, + ["@keyword.return.javascript"] = { fg = c.green500, italic = true }, + ["@tag.delimiter.javascript"] = { fg = c.orange500 }, + ["@tag.javascript"] = { fg = c.yellow500 }, + ["@variable.javascript"] = { fg = c.yellow500 }, } end diff --git a/lua/solarized-osaka/groups/trouble.lua b/lua/solarized-osaka/groups/trouble.lua index 5f9fb7b..2470d00 100644 --- a/lua/solarized-osaka/groups/trouble.lua +++ b/lua/solarized-osaka/groups/trouble.lua @@ -1,9 +1,10 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - TroubleText = { fg = c.base0 }, - TroubleCount = { fg = c.magenta500 }, + TroubleText = { fg = c.base0 }, + TroubleCount = { fg = c.magenta500 }, TroubleNormal = { fg = c.base0 }, } end diff --git a/lua/solarized-osaka/groups/ts-node-action.lua b/lua/solarized-osaka/groups/ts-node-action.lua index ee22173..f7ac10d 100644 --- a/lua/solarized-osaka/groups/ts-node-action.lua +++ b/lua/solarized-osaka/groups/ts-node-action.lua @@ -1,8 +1,9 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - TSNodeKey = { fg = c.magenta500, bold = true }, + TSNodeKey = { fg = c.magenta500, bold = true }, TSNodeUnmatched = { fg = c.base01 }, } end diff --git a/lua/solarized-osaka/groups/which-key.lua b/lua/solarized-osaka/groups/which-key.lua index 498491b..fe06904 100644 --- a/lua/solarized-osaka/groups/which-key.lua +++ b/lua/solarized-osaka/groups/which-key.lua @@ -1,14 +1,15 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - WhichKey = { fg = c.cyan }, - WhichKeyGroup = { fg = c.blue }, - WhichKeyDesc = { fg = c.magenta }, + WhichKey = { fg = c.cyan }, + WhichKeyGroup = { fg = c.blue }, + WhichKeyDesc = { fg = c.magenta }, WhichKeySeperator = { fg = c.base01 }, WhichKeySeparator = { fg = c.base01 }, - WhichKeyFloat = { bg = c.bg_sidebar }, - WhichKeyValue = { fg = c.violet500 }, + WhichKeyFloat = { bg = c.bg_sidebar }, + WhichKeyValue = { fg = c.violet500 }, } end diff --git a/lua/solarized-osaka/groups/yanky.lua b/lua/solarized-osaka/groups/yanky.lua index 10420d1..013587e 100644 --- a/lua/solarized-osaka/groups/yanky.lua +++ b/lua/solarized-osaka/groups/yanky.lua @@ -1,8 +1,9 @@ local M = {} function M.get(c, opts) + -- stylua: ignore return { - YankyPut = "IncSearch", + YankyPut = "IncSearch", YankyYanked = "IncSearch", } end From f86886d1fd4ec9dd792ca7b44d5f2115698cf21b Mon Sep 17 00:00:00 2001 From: Miroslav Lincovschi Date: Mon, 23 Dec 2024 18:35:56 +0300 Subject: [PATCH 09/18] fix: using the wrong highlight groups for `nvim-ts-raindow2` and `rainbow-delimiters` --- lua/solarized-osaka/groups/nvim-ts-rainbow2.lua | 11 +++++++---- lua/solarized-osaka/groups/rainbow-delimiters.lua | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/lua/solarized-osaka/groups/nvim-ts-rainbow2.lua b/lua/solarized-osaka/groups/nvim-ts-rainbow2.lua index 7ffb58d..5998654 100644 --- a/lua/solarized-osaka/groups/nvim-ts-rainbow2.lua +++ b/lua/solarized-osaka/groups/nvim-ts-rainbow2.lua @@ -3,10 +3,13 @@ local M = {} function M.get(c, opts) -- stylua: ignore return { - NeoTreeNormal = { fg = c.base00, bg = c.bg_sidebar }, - NeoTreeNormalNC = { fg = c.base00, bg = c.bg_sidebar }, - NeoTreeDimText = { fg = c.base01 }, - NeoTreeMessage = { fg = c.base01 }, + TSRainbowRed = { fg = c.red }, + TSRainbowOrange = { fg = c.orange }, + TSRainbowYellow = { fg = c.yellow }, + TSRainbowGreen = { fg = c.green }, + TSRainbowBlue = { fg = c.blue }, + TSRainbowViolet = { fg = c.violet500 }, + TSRainbowCyan = { fg = c.cyan }, } end diff --git a/lua/solarized-osaka/groups/rainbow-delimiters.lua b/lua/solarized-osaka/groups/rainbow-delimiters.lua index 7ffb58d..9c12295 100644 --- a/lua/solarized-osaka/groups/rainbow-delimiters.lua +++ b/lua/solarized-osaka/groups/rainbow-delimiters.lua @@ -3,10 +3,13 @@ local M = {} function M.get(c, opts) -- stylua: ignore return { - NeoTreeNormal = { fg = c.base00, bg = c.bg_sidebar }, - NeoTreeNormalNC = { fg = c.base00, bg = c.bg_sidebar }, - NeoTreeDimText = { fg = c.base01 }, - NeoTreeMessage = { fg = c.base01 }, + RainbowDelimiterRed = { fg = c.red }, + RainbowDelimiterOrange = { fg = c.orange }, + RainbowDelimiterYellow = { fg = c.yellow }, + RainbowDelimiterGreen = { fg = c.green }, + RainbowDelimiterBlue = { fg = c.blue }, + RainbowDelimiterViolet = { fg = c.violet }, + RainbowDelimiterCyan = { fg = c.cyan }, } end From 97ad4060a168ce80697124792352da39b2919dec Mon Sep 17 00:00:00 2001 From: Miroslav Lincovschi Date: Tue, 24 Dec 2024 18:26:18 +0300 Subject: [PATCH 10/18] feat: add `blink.cmp` hl groups --- lua/solarized-osaka/groups/blink.lua | 51 ++++++++++++++++++++++++++++ lua/solarized-osaka/groups/init.lua | 1 + 2 files changed, 52 insertions(+) create mode 100644 lua/solarized-osaka/groups/blink.lua diff --git a/lua/solarized-osaka/groups/blink.lua b/lua/solarized-osaka/groups/blink.lua new file mode 100644 index 0000000..87882c7 --- /dev/null +++ b/lua/solarized-osaka/groups/blink.lua @@ -0,0 +1,51 @@ +local M = {} + +function M.get(c, opts) + --stylua: ignore + return { + --Blink-cmp + BlinkCmpLabel = { fg = c.fg, bg = c.none }, + BlinkCmpLabelDeprecated = { fg = c.base01, bg = c.none, strikethrough = true }, + --INFO: unused at the moment but passed still for future use + BlinkCmpLabelMatch = { fg = c.violet500, bg = c.none }, + -- Documentation windows + BlinkCmpDoc = { fg = c.fg, bg = c.bg_float }, + BlinkCmpDocBorder = { fg = c.base02, bg = c.bg_float }, + BlinkCmpGhostText = { fg = c.base01 }, + -- Signature help + BlinkCmpSignatureHelp = { fg = c.violet500, bg = c.none }, + BlinkCmpSignatureHelpBorder = { fg = c.base02, bg = c.none }, + BlinkCmpSignatureHelpActiveParameter = { fg = c.orange, bg = c.none }, + -- ISSUE: passing c.none causes menu to be invisible + -- BlinkCmpMenu = { fg = c.base01, bg = c.none }, + BlinkCmpMenu = { fg = c.base01, bg = c.base02 }, + BlinkCmpKindDefault = { fg = c.base01, bg = c.none }, -- Default fallback + BlinkCmpKindCodeium = { fg = c.cyan500, bg = c.none }, + BlinkCmpKindCopilot = { fg = c.cyan500, bg = c.none }, + BlinkCmpKindTabNine = { fg = c.cyan500, bg = c.none }, + BlinkCmpKindSupermaven = { fg = c.cyan500, bg = c.none }, + BlinkCmpKindKeyword = { fg = c.cyan, bg = c.none }, + BlinkCmpKindVariable = { fg = c.magenta, bg = c.none }, + BlinkCmpKindConstant = { fg = c.magenta, bg = c.none }, + BlinkCmpKindReference = { fg = c.magenta, bg = c.none }, + BlinkCmpKindValue = { fg = c.magenta, bg = c.none }, + BlinkCmpKindFunction = { fg = c.blue, bg = c.none }, + BlinkCmpKindMethod = { fg = c.blue, bg = c.none }, + BlinkCmpKindConstructor = { fg = c.blue, bg = c.none }, + BlinkCmpKindClass = { fg = c.orange, bg = c.none }, + BlinkCmpKindInterface = { fg = c.orange, bg = c.none }, + BlinkCmpKindStruct = { fg = c.orange, bg = c.none }, + BlinkCmpKindEvent = { fg = c.orange, bg = c.none }, + BlinkCmpKindEnum = { fg = c.orange, bg = c.none }, + BlinkCmpKindUnit = { fg = c.orange, bg = c.none }, + BlinkCmpKindModule = { fg = c.yellow, bg = c.none }, + BlinkCmpKindProperty = { fg = c.cyan, bg = c.none }, + BlinkCmpKindField = { fg = c.cyan, bg = c.none }, + BlinkCmpKindTypeParameter = { fg = c.cyan, bg = c.none }, + BlinkCmpKindEnumMember = { fg = c.cyan, bg = c.none }, + BlinkCmpKindOperator = { fg = c.cyan, bg = c.none }, + BlinkCmpKindSnippet = { fg = c.violet500, bg = c.none }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/init.lua b/lua/solarized-osaka/groups/init.lua index e0d4b19..68ffc11 100644 --- a/lua/solarized-osaka/groups/init.lua +++ b/lua/solarized-osaka/groups/init.lua @@ -7,6 +7,7 @@ M.plugins = { ["alpha-nvim"] = "alpha", ["barbar.nvim"] = "barbar", ["bufferline.nvim"] = "bufferline", + ["blink.cmp"] = "blink", ["dashboard-nvim"] = "dashboard", ["flash.nvim"] = "flash", ["vim-fern"] = "fern", From caf0ff3621d039ea0ffe79c00c1599e8ba04c7ce Mon Sep 17 00:00:00 2001 From: Miroslav Lincovschi Date: Tue, 24 Dec 2024 18:48:13 +0300 Subject: [PATCH 11/18] style: remove unused comment --- lua/solarized-osaka/groups/blink.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/solarized-osaka/groups/blink.lua b/lua/solarized-osaka/groups/blink.lua index 87882c7..191e4fa 100644 --- a/lua/solarized-osaka/groups/blink.lua +++ b/lua/solarized-osaka/groups/blink.lua @@ -3,7 +3,6 @@ local M = {} function M.get(c, opts) --stylua: ignore return { - --Blink-cmp BlinkCmpLabel = { fg = c.fg, bg = c.none }, BlinkCmpLabelDeprecated = { fg = c.base01, bg = c.none, strikethrough = true }, --INFO: unused at the moment but passed still for future use From b9772fe6016ddd50d3acb59e1a84ead95424c744 Mon Sep 17 00:00:00 2001 From: Miroslav Lincovschi Date: Tue, 24 Dec 2024 18:48:51 +0300 Subject: [PATCH 12/18] feat: add `fzf-lua` hl groups --- lua/solarized-osaka/groups/fzf.lua | 18 ++++++++++++++++++ lua/solarized-osaka/groups/init.lua | 1 + 2 files changed, 19 insertions(+) create mode 100644 lua/solarized-osaka/groups/fzf.lua diff --git a/lua/solarized-osaka/groups/fzf.lua b/lua/solarized-osaka/groups/fzf.lua new file mode 100644 index 0000000..146ee0e --- /dev/null +++ b/lua/solarized-osaka/groups/fzf.lua @@ -0,0 +1,18 @@ +local M = {} + +function M.get(c, opts) + --stylua: ignore + return { + FzfLuaNormal = { fg = c.base0, bg = c.bg_float }, + FzfLuaBorder = { fg = c.base02, bg = c.bg_float }, + FzfLuaCursor = "IncSearch", + FzfLuaFzfCursorLine = "CursorLine", + FzfLuaPath = "Directory", + FzfLuaHeaderText = "Title", + FzfLuaHeaderBind = { fg = c.yellow, bg = c.bg_float }, + FzfLuaPreviewTitle = { fg = c.blue, bg = c.bg_float }, + FzfLuaTitle = { fg = c.orange, bg = c.bg_float }, + } +end + +return M diff --git a/lua/solarized-osaka/groups/init.lua b/lua/solarized-osaka/groups/init.lua index 68ffc11..145924e 100644 --- a/lua/solarized-osaka/groups/init.lua +++ b/lua/solarized-osaka/groups/init.lua @@ -10,6 +10,7 @@ M.plugins = { ["blink.cmp"] = "blink", ["dashboard-nvim"] = "dashboard", ["flash.nvim"] = "flash", + ["fzf-lua"] = "fzf", ["vim-fern"] = "fern", ["gitsigns.nvim"] = "gitsigns", ["hop.nvim"] = "hop", From d4bcea1287f73f0a0993b289aa814b679b6136a3 Mon Sep 17 00:00:00 2001 From: Miroslav Lincovschi Date: Tue, 24 Dec 2024 18:52:30 +0300 Subject: [PATCH 13/18] fix: commit `2fa6c30` --- lua/solarized-osaka/groups/editor.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/solarized-osaka/groups/editor.lua b/lua/solarized-osaka/groups/editor.lua index 36d5114..56520ce 100644 --- a/lua/solarized-osaka/groups/editor.lua +++ b/lua/solarized-osaka/groups/editor.lua @@ -47,7 +47,7 @@ function M.get(c, options) Question = { fg = c.cyan500, bold = true }, -- |hit-enter| prompt and yes/no questions QuickFixLine = { bg = c.blue700, bold = true }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. Search = { fg = c.yellow500, reverse = true }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. - IncSearch = { fg = c.orange500, standout = true }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" + IncSearch = { fg = c.base2, bg = c.orange500 }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" CurSearch = "IncSearch", SpecialKey = { fg = c.base00 }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| SpellBad = { sp = c.red500, undercurl = true }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. From b25529899e941d3e643ab0a785030df5af2946cf Mon Sep 17 00:00:00 2001 From: Miroslav Lincovschi Date: Tue, 24 Dec 2024 18:54:46 +0300 Subject: [PATCH 14/18] fix: commit aee69e3 --- lua/solarized-osaka/groups/editor.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/solarized-osaka/groups/editor.lua b/lua/solarized-osaka/groups/editor.lua index 56520ce..a11ff09 100644 --- a/lua/solarized-osaka/groups/editor.lua +++ b/lua/solarized-osaka/groups/editor.lua @@ -60,7 +60,7 @@ function M.get(c, options) TabLineFill = { fg = c.base0, bg = c.base02 }, -- tab pages line, where there are no labels TabLineSel = { fg = c.yellow500, bg = c.bg }, -- tab pages line, active tab page label Title = { fg = c.orange500, bold = true }, -- titles for output from ":set all", ":autocmd" etc. - Visual = { bg = c.base03, reverse = true }, -- Visual mode selection + Visual = { bg = c.base02 }, -- Visual mode selection VisualNOS = { bg = c.base03, reverse = true }, -- Visual mode selection when vim is "Not Owning the Selection". WarningMsg = { fg = c.orange500, bold = true }, -- warning messages Whitespace = { fg = c.base01 }, -- "nbsp", "space", "tab" and "trail" in 'listchars' From a0e35462c1368892faedcea797c4f21ffb8f9428 Mon Sep 17 00:00:00 2001 From: Miroslav Lincovschi Date: Tue, 24 Dec 2024 19:52:31 +0300 Subject: [PATCH 15/18] fix: remove unnecessary `link` --- lua/solarized-osaka/groups/lspsaga.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/solarized-osaka/groups/lspsaga.lua b/lua/solarized-osaka/groups/lspsaga.lua index 0e2c48f..8772bae 100644 --- a/lua/solarized-osaka/groups/lspsaga.lua +++ b/lua/solarized-osaka/groups/lspsaga.lua @@ -3,8 +3,8 @@ local M = {} function M.get(c, opts) -- stylua: ignore return { - DiagnosticWarning = { link = "DiagnosticWarn" }, - DiagnosticInformation = { link = "DiagnosticInfo" }, + DiagnosticWarning = "DiagnosticWarn", + DiagnosticInformation = "DiagnosticInfo", LspFloatWinNormal = { bg = c.bg_float }, LspFloatWinBorder = { fg = c.base02 }, LspSagaBorderTitle = { fg = c.cyan }, From 1dc4548835b78e0ebd7d55d2040479a7b7a52464 Mon Sep 17 00:00:00 2001 From: Miroslav Lincovschi Date: Sat, 4 Jan 2025 00:46:13 +0300 Subject: [PATCH 16/18] feat: commit b2446aa --- lua/solarized-osaka/groups/which-key.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/solarized-osaka/groups/which-key.lua b/lua/solarized-osaka/groups/which-key.lua index fe06904..2eae0a1 100644 --- a/lua/solarized-osaka/groups/which-key.lua +++ b/lua/solarized-osaka/groups/which-key.lua @@ -8,7 +8,7 @@ function M.get(c, opts) WhichKeyDesc = { fg = c.magenta }, WhichKeySeperator = { fg = c.base01 }, WhichKeySeparator = { fg = c.base01 }, - WhichKeyFloat = { bg = c.bg_sidebar }, + WhichKeyBorder = { fg = c.base02, bg = c.bg_float }, WhichKeyValue = { fg = c.violet500 }, } end From 4dbf58b2a00e597099802560968c31f949c9efd9 Mon Sep 17 00:00:00 2001 From: Miroslav Lincovschi Date: Mon, 6 Jan 2025 11:23:39 +0300 Subject: [PATCH 17/18] fix: misspell on the filename --- .../groups/{glyph-pallete.lua => glyph-palette.lua} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename lua/solarized-osaka/groups/{glyph-pallete.lua => glyph-palette.lua} (100%) diff --git a/lua/solarized-osaka/groups/glyph-pallete.lua b/lua/solarized-osaka/groups/glyph-palette.lua similarity index 100% rename from lua/solarized-osaka/groups/glyph-pallete.lua rename to lua/solarized-osaka/groups/glyph-palette.lua From bed82a2c3ae0f27848290f3d2d67063eaf8eeb97 Mon Sep 17 00:00:00 2001 From: Miroslav Lincovschi Date: Mon, 6 Jan 2025 11:25:05 +0300 Subject: [PATCH 18/18] fix: misspell on the plugin name --- lua/solarized-osaka/groups/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/solarized-osaka/groups/init.lua b/lua/solarized-osaka/groups/init.lua index 145924e..d18e9ca 100644 --- a/lua/solarized-osaka/groups/init.lua +++ b/lua/solarized-osaka/groups/init.lua @@ -52,7 +52,7 @@ M.plugins = { ["nvim-ts-rainbow"] = "nvim-ts-rainbow", ["nvim-ts-rainbow2"] = "nvim-ts-rainbow2", ["ts-node-action"] = "ts-node-action", - ["rainbow-delimiters.nvim"] = "rainbow", + ["rainbow-delimiters.nvim"] = "rainbow-delimiters", ["snacks.nvim"] = "snacks", ["telescope.nvim"] = "telescope", ["trouble.nvim"] = "trouble",