From 8b704ffdf4670e3743dceb393ae5e581ed12aeba Mon Sep 17 00:00:00 2001 From: mvllow Date: Mon, 7 Feb 2022 11:44:56 -0600 Subject: [PATCH] minor tweaks and formatting --- lua/rose-pine/theme.lua | 155 +++++++++++++++++++--------------------- 1 file changed, 73 insertions(+), 82 deletions(-) diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua index 6eb9344..484ce60 100644 --- a/lua/rose-pine/theme.lua +++ b/lua/rose-pine/theme.lua @@ -33,9 +33,9 @@ local theme = { ColorColumn = { bg = palette.highlight_high }, Conceal = { bg = palette.none }, -- Cursor = {}, - CursorColumn = { bg = group.border }, + CursorColumn = { bg = palette.overlay }, -- CursorIM = {}, - CursorLine = { bg = palette.highlight_low }, + CursorLine = { bg = palette.overlay }, CursorLineNr = { fg = palette.text }, DarkenedPanel = { bg = palette.surface }, DarkenedStatusline = { bg = palette.surface }, @@ -59,14 +59,19 @@ local theme = { MoreMsg = { fg = palette.iris }, NonText = { fg = palette.muted }, Normal = { fg = palette.text, bg = background }, - NormalNC = { fg = palette.text, bg = inactive_background }, NormalFloat = { fg = palette.text, bg = float_background }, + NormalNC = { fg = palette.text, bg = inactive_background }, + NvimInternalError = { fg = '#ffffff', bg = palette.love }, Pmenu = { fg = palette.subtle, bg = float_background }, - PmenuSbar = { bg = palette.overlay }, + PmenuSbar = { bg = palette.highlight_low }, PmenuSel = { fg = palette.text, bg = palette.overlay }, - PmenuThumb = { bg = palette.muted }, + PmenuThumb = { bg = palette.highlight_med }, Question = { fg = palette.gold }, -- QuickFixLine = {}, + -- RedrawDebugNormal = {} + RedrawDebugClear = { fg = '#ffffff', bg = palette.gold }, + RedrawDebugComposed = { fg = '#ffffff', bg = palette.pine }, + RedrawDebugRecompose = { fg = '#ffffff', bg = palette.love }, Search = { bg = palette.highlight_med }, SpecialKey = { fg = palette.foam }, SpellBad = { sp = palette.love, style = 'undercurl' }, @@ -76,11 +81,11 @@ local theme = { SignColumn = { fg = palette.text, bg = background }, StatusLine = { fg = palette.subtle, bg = palette.surface }, StatusLineNC = { fg = palette.muted, bg = palette.base }, - -- StatusLineTerm = {}, - -- StatusLineTermNC = {}, - TabLine = { fg = palette.subtle, bg = palette.overlay }, + StatusLineTerm = { link = 'StatusLine' }, + StatusLineTermNC = { link = 'StatusLineNC' }, + TabLine = { fg = palette.subtle, bg = palette.surface }, TabLineFill = { bg = palette.surface }, - TabLineSel = { fg = palette.text, bg = palette.muted }, + TabLineSel = { fg = palette.text, bg = palette.overlay }, Title = { fg = palette.text }, VertSplit = { fg = palette.overlay, bg = vert_split_background }, Visual = { bg = palette.highlight_med }, @@ -89,7 +94,7 @@ local theme = { -- Whitespace = {}, -- WildMenu = {}, - Boolean = { fg = palette.gold }, + Boolean = { fg = palette.rose }, Character = { fg = palette.gold }, Comment = { fg = group.comment, style = maybe_italic }, Conditional = { fg = palette.pine }, @@ -123,37 +128,38 @@ local theme = { Todo = { fg = palette.iris }, Type = { fg = palette.foam }, Typedef = { fg = palette.foam }, - Underlined = { fg = palette.foam, style = 'underline' }, + Underlined = { style = 'underline' }, htmlArg = { fg = palette.iris }, - htmlBold = { fg = palette.text, style = 'bold' }, + htmlBold = { style = 'bold' }, htmlEndTag = { fg = palette.subtle }, htmlH1 = { fg = group.headings.h1, style = 'bold' }, htmlH2 = { fg = group.headings.h2, style = 'bold' }, htmlH3 = { fg = group.headings.h3, style = 'bold' }, htmlH4 = { fg = group.headings.h4, style = 'bold' }, htmlH5 = { fg = group.headings.h5, style = 'bold' }, - htmlItalic = { fg = palette.text, style = maybe_italic }, + htmlItalic = { style = maybe_italic }, htmlLink = { fg = group.link }, htmlTag = { fg = palette.subtle }, htmlTagN = { fg = palette.text }, htmlTagName = { fg = palette.foam }, - markdownH1 = { fg = group.headings.h1, style = 'bold' }, - markdownH1Delimiter = { fg = group.headings.h1 }, - markdownH2 = { fg = group.headings.h2, style = 'bold' }, - markdownH2Delimiter = { fg = group.headings.h2 }, - markdownH3 = { fg = group.headings.h3, style = 'bold' }, - markdownH3Delimiter = { fg = group.headings.h3 }, - markdownH4 = { fg = group.headings.h4, style = 'bold' }, - markdownH4Delimiter = { fg = group.headings.h4 }, - markdownH5 = { fg = group.headings.h5, style = 'bold' }, - markdownH5Delimiter = { fg = group.headings.h5 }, - markdownH6 = { fg = group.headings.h6, style = 'bold' }, - markdownH6Delimiter = { fg = group.headings.h6 }, markdownDelimiter = { fg = palette.subtle }, + markdownH1 = { fg = group.headings.h1, style = 'bold' }, + markdownH1Delimiter = { link = 'markdownH1' }, + markdownH2 = { fg = group.headings.h2, style = 'bold' }, + markdownH2Delimiter = { link = 'markdownH2' }, + markdownH3 = { fg = group.headings.h3, style = 'bold' }, + markdownH3Delimiter = { link = 'markdownH3' }, + markdownH4 = { fg = group.headings.h4, style = 'bold' }, + markdownH4Delimiter = { link = 'markdownH4' }, + markdownH5 = { fg = group.headings.h5, style = 'bold' }, + markdownH5Delimiter = { link = 'markdownH5' }, + markdownH6 = { fg = group.headings.h6, style = 'bold' }, + markdownH6Delimiter = { link = 'markdownH6' }, markdownLinkText = { fg = group.link, style = 'underline' }, - markdownUrl = { fg = palette.iris, style = 'underline' }, + markdownUrl = { link = 'markdownLinkText' }, + mkdCode = { fg = palette.foam, style = maybe_italic }, mkdCodeDelimiter = { fg = palette.rose }, mkdCodeEnd = { fg = palette.foam }, @@ -161,43 +167,36 @@ local theme = { mkdFootnotes = { fg = palette.foam }, mkdID = { fg = palette.foam, style = 'underline' }, mkdInlineURL = { fg = group.link, style = 'underline' }, - mkdLink = { fg = group.link, style = 'underline' }, - mkdLinkDef = { fg = group.link, style = 'underline' }, + mkdLink = { link = 'mkdInlineURL' }, + mkdLinkDef = { link = 'mkdInlineURL' }, mkdListItemLine = { fg = palette.text }, mkdRule = { fg = palette.subtle }, - mkdURL = { fg = palette.foam, style = 'underline' }, - - -- Fix background mismatch if user sets custom float background - -- In LSP hover float: (paramater) - -- ^ ^ - typescriptParens = { bg = palette.none }, + mkdURL = { link = 'mkdInlineURL' }, + DiagnosticError = { fg = group.error }, DiagnosticHint = { fg = group.hint }, DiagnosticInfo = { fg = group.info }, - DiagnosticInformation = { link = 'DiagnosticInfo' }, DiagnosticWarn = { fg = group.warn }, - DiagnosticWarning = { link = 'DiagnosticWarn' }, - DiagnosticError = { fg = group.error }, + DiagnosticDefaultError = { fg = group.error }, DiagnosticDefaultHint = { fg = group.hint }, DiagnosticDefaultInfo = { fg = group.info }, DiagnosticDefaultWarn = { fg = group.warn }, - DiagnosticDefaultError = { fg = group.error }, + DiagnosticFloatingError = { fg = group.error }, DiagnosticFloatingHint = { fg = group.hint }, DiagnosticFloatingInfo = { fg = group.info }, DiagnosticFloatingWarn = { fg = group.warn }, - DiagnosticFloatingError = { fg = group.error }, + DiagnosticSignError = { fg = group.error }, DiagnosticSignHint = { fg = group.hint }, DiagnosticSignInfo = { fg = group.info }, DiagnosticSignWarn = { fg = group.warn }, - DiagnosticSignError = { fg = group.error }, + DiagnosticUnderlineError = { sp = group.error, style = 'undercurl' }, DiagnosticUnderlineHint = { sp = group.hint, style = 'undercurl' }, DiagnosticUnderlineInfo = { sp = group.info, style = 'undercurl' }, DiagnosticUnderlineWarn = { sp = group.warn, style = 'undercurl' }, - DiagnosticUnderlineError = { sp = group.error, style = 'undercurl' }, + DiagnosticVirtualTextError = { fg = group.error }, DiagnosticVirtualTextHint = { fg = group.hint }, DiagnosticVirtualTextInfo = { fg = group.info }, DiagnosticVirtualTextWarn = { fg = group.warn }, - DiagnosticVirtualTextError = { fg = group.error }, LspReferenceText = { fg = palette.rose, bg = palette.highlight_med }, LspReferenceRead = { fg = palette.rose, bg = palette.highlight_med }, @@ -225,19 +224,11 @@ local theme = { LspDiagnosticsVirtualTextInformation = { link = 'DiagnosticVirtualTextInfo' }, LspDiagnosticsUnderlineInformation = { link = 'DiagnosticUnderlineInfo' }, - -- RedrawDebugNormal - RedrawDebugClear = { fg = '#ffffff', bg = palette.gold }, - RedrawDebugComposed = { fg = '#ffffff', bg = palette.pine }, - RedrawDebugRecompose = { fg = '#ffffff', bg = palette.love }, - - NvimInternalError = { fg = '#ffffff', bg = palette.love }, - - -- TSAnnotation = {}, -- TSAttribute = {}, - TSBoolean = { fg = palette.rose }, - -- TSCharacter = {}, - TSComment = { fg = group.comment, style = maybe_italic }, - -- TSConditional = {}, + TSBoolean = { link = 'Boolean' }, + TSCharacter = { link = 'Character' }, + TSComment = { link = 'Comment' }, + TSConditional = { link = 'Conditional' }, TSConstBuiltin = { fg = palette.love }, -- TSConstMacro = {}, TSConstant = { fg = palette.foam }, @@ -259,7 +250,7 @@ local theme = { -- TSMethod = {}, -- TSNamespace = {}, -- TSNone = {}, - -- TSNumber = {}, + TSNumber = { link = 'Number' }, TSOperator = { fg = palette.subtle }, TSParameter = { fg = palette.iris, style = maybe_italic }, -- TSParameterReference = {}, @@ -269,7 +260,7 @@ local theme = { TSPunctSpecial = { fg = group.punctuation }, -- TSRepeat = {}, -- TSStrike = {}, - TSString = { fg = palette.gold }, + TSString = { link = 'String' }, TSStringEscape = { fg = palette.pine }, -- TSStringRegex = {}, TSStringSpecial = { link = 'TSString' }, @@ -278,15 +269,14 @@ local theme = { TSTagDelimiter = { fg = palette.subtle }, TSText = { fg = palette.text }, TSTitle = { fg = group.headings.h1, style = 'bold' }, - -- TSType = {}, + TSType = { link = 'Type' }, -- TSTypeBuiltin = {}, - TSURI = { fg = palette.gold }, + TSURI = { fg = group.link }, -- TSUnderline = {}, TSVariable = { fg = palette.text, style = maybe_italic }, TSVariableBuiltin = { fg = palette.love }, -- romgrk/barbar.nvim - BufferTabpageFill = { fg = palette.base, bg = palette.base }, BufferCurrent = { fg = palette.text, bg = palette.overlay }, BufferCurrentIndex = { fg = palette.text, bg = palette.overlay }, BufferCurrentMod = { fg = palette.foam, bg = palette.overlay }, @@ -297,6 +287,7 @@ local theme = { BufferInactiveMod = { fg = palette.foam }, BufferInactiveSign = { fg = palette.muted }, BufferInactiveTarget = { fg = palette.gold }, + BufferTabpageFill = { fg = palette.base, bg = palette.base }, BufferVisible = { fg = palette.subtle }, BufferVisibleIndex = { fg = palette.subtle }, BufferVisibleMod = { fg = palette.foam }, @@ -304,12 +295,12 @@ local theme = { BufferVisibleTarget = { fg = palette.gold }, -- lewis6991/gitsigns.nvim - SignAdd = { fg = group.git_add }, - SignChange = { fg = group.git_change }, - SignDelete = { fg = group.git_delete }, GitSignsAdd = { fg = group.git_add }, GitSignsChange = { fg = group.git_change }, GitSignsDelete = { fg = group.git_delete }, + SignAdd = { link = 'GitSignsAdd' }, + SignChange = { link = 'GitSignsChange' }, + SignDelete = { link = 'GitSignsDelete' }, -- mvllow/modes.nvim ModesCopy = { bg = palette.gold }, @@ -318,21 +309,15 @@ local theme = { ModesVisual = { bg = palette.iris }, -- kyazdani42/nvim-tree.lua - NvimTreeNormal = { fg = palette.text }, + NvimTreeEmptyFolderName = { fg = palette.muted }, NvimTreeFileDeleted = { fg = palette.love }, NvimTreeFileDirty = { fg = palette.rose }, NvimTreeFileMerge = { fg = palette.iris }, NvimTreeFileNew = { fg = palette.foam }, NvimTreeFileRenamed = { fg = palette.pine }, NvimTreeFileStaged = { fg = palette.iris }, - NvimTreeEmptyFolderName = { fg = palette.muted }, NvimTreeFolderIcon = { fg = palette.subtle }, NvimTreeFolderName = { fg = palette.foam }, - NvimTreeImageFile = { fg = palette.text }, - NvimTreeOpenedFile = { fg = palette.text, bg = palette.highlight_med }, - NvimTreeOpenedFolderName = { fg = palette.foam }, - NvimTreeRootFolder = { fg = palette.iris }, - NvimTreeSpecialFile = { link = 'NvimTreeNormal' }, NvimTreeGitDeleted = { fg = group.git_delete }, NvimTreeGitDirty = { fg = group.git_dirty }, NvimTreeGitIgnored = { fg = group.git_ignore }, @@ -340,6 +325,12 @@ local theme = { NvimTreeGitNew = { fg = group.git_add }, NvimTreeGitRenamed = { fg = group.git_rename }, NvimTreeGitStaged = { fg = group.git_stage }, + NvimTreeImageFile = { fg = palette.text }, + NvimTreeNormal = { fg = palette.text }, + NvimTreeOpenedFile = { fg = palette.text, bg = palette.highlight_med }, + NvimTreeOpenedFolderName = { fg = palette.foam }, + NvimTreeRootFolder = { fg = palette.iris }, + NvimTreeSpecialFile = { link = 'NvimTreeNormal' }, NvimTreeWindowPicker = { fg = palette.base, bg = palette.iris }, -- folke/which-key.nvim @@ -354,22 +345,22 @@ local theme = { IndentBlanklineChar = { fg = palette.muted }, -- hrsh7th/nvim-cmp - CmpItemKind = { fg = palette.iris }, CmpItemAbbr = { fg = palette.subtle }, + CmpItemAbbrDeprecated = { fg = palette.subtle, style = 'strikethrough' }, CmpItemAbbrMatch = { fg = palette.text, style = 'bold' }, CmpItemAbbrMatchFuzzy = { fg = palette.text, style = 'bold' }, - CmpItemAbbrDeprecated = { fg = palette.subtle, style = 'strikethrough' }, - CmpItemKindVariable = { fg = palette.foam }, + CmpItemKind = { fg = palette.iris }, CmpItemKindClass = { fg = palette.gold }, - CmpItemKindInterface = { fg = palette.gold }, CmpItemKindFunction = { fg = palette.iris }, + CmpItemKindInterface = { fg = palette.gold }, CmpItemKindMethod = { fg = palette.iris }, CmpItemKindSnippet = { fg = palette.iris }, + CmpItemKindVariable = { fg = palette.foam }, -- TimUntersberger/neogit NeogitDiffAddHighlight = { fg = palette.foam, bg = palette.highlight_med }, - NeogitDiffDeleteHighlight = { fg = palette.love, bg = palette.highlight_med }, NeogitDiffContextHighlight = { bg = palette.highlight_low }, + NeogitDiffDeleteHighlight = { fg = palette.love, bg = palette.highlight_med }, NeogitHunkHeader = { bg = palette.highlight_low }, NeogitHunkHeaderHighlight = { bg = palette.highlight_low }, @@ -388,17 +379,17 @@ local theme = { -- nvim-neorg/neorg NeorgHeading1Prefix = { fg = group.headings.h1, style = 'bold' }, - NeorgHeading1Title = { fg = group.headings.h1, style = 'bold' }, + NeorgHeading1Title = { link = 'NeorgHeading1Prefix' }, NeorgHeading2Prefix = { fg = group.headings.h2, style = 'bold' }, - NeorgHeading2Title = { fg = group.headings.h2, style = 'bold' }, + NeorgHeading2Title = { link = 'NeorgHeading2Prefix' }, NeorgHeading3Prefix = { fg = group.headings.h3, style = 'bold' }, - NeorgHeading3Title = { fg = group.headings.h3, style = 'bold' }, + NeorgHeading3Title = { link = 'NeorgHeading3Prefix' }, NeorgHeading4Prefix = { fg = group.headings.h4, style = 'bold' }, - NeorgHeading4Title = { fg = group.headings.h4, style = 'bold' }, + NeorgHeading4Title = { link = 'NeorgHeading4Prefix' }, NeorgHeading5Prefix = { fg = group.headings.h5, style = 'bold' }, - NeorgHeading5Title = { fg = group.headings.h5, style = 'bold' }, + NeorgHeading5Title = { link = 'NeorgHeading5Prefix' }, NeorgHeading6Prefix = { fg = group.headings.h6, style = 'bold' }, - NeorgHeading6Title = { fg = group.headings.h6, style = 'bold' }, + NeorgHeading6Title = { link = 'NeorgHeading6Prefix' }, NeorgMarkerTitle = { fg = palette.text, style = 'bold' }, -- tami5/lspsaga.nvim (fork of glepnir/lspsaga.nvim) @@ -444,8 +435,8 @@ local theme = { TelescopeNormal = { fg = palette.subtle }, TelescopePromptNormal = { fg = palette.text }, TelescopePromptPrefix = { fg = palette.subtle }, - TelescopeSelection = { fg = palette.text, bg = palette.highlight_low }, - TelescopeSelectionCaret = { fg = palette.rose, bg = palette.highlight_low }, + TelescopeSelection = { fg = palette.text, bg = palette.overlay }, + TelescopeSelectionCaret = { fg = palette.rose, bg = palette.overlay }, TelescopeTitle = { fg = palette.subtle }, }