From e0fd291fb0b95fdf9b4473ee35770dfd47dbe50c Mon Sep 17 00:00:00 2001 From: not Date: Fri, 21 Jan 2022 20:27:22 -0600 Subject: [PATCH 001/211] Update palette (#58) * chore: format * feat!: use new palette - color "inactive" has been renamed to "muted" - update subtle and muted colors --- .stylua.toml | 2 +- lua/lualine/themes/rose-pine.lua | 6 +++--- lua/rose-pine/galaxyline/theme.lua | 28 ++++++++++++++-------------- lua/rose-pine/init.lua | 17 +++-------------- lua/rose-pine/palette.lua | 12 ++++++------ lua/rose-pine/theme.lua | 14 +++++++------- lua/rose-pine/util.lua | 7 +------ 7 files changed, 35 insertions(+), 51 deletions(-) diff --git a/.stylua.toml b/.stylua.toml index 85d575e..ffab677 100644 --- a/.stylua.toml +++ b/.stylua.toml @@ -1,3 +1,3 @@ -column_width = 80 +column_width = 100 indent_type = "Tabs" quote_style = "AutoPreferSingle" diff --git a/lua/lualine/themes/rose-pine.lua b/lua/lualine/themes/rose-pine.lua index f17aec5..dde3075 100644 --- a/lua/lualine/themes/rose-pine.lua +++ b/lua/lualine/themes/rose-pine.lua @@ -27,8 +27,8 @@ return { c = { bg = p.base, fg = p.text }, }, inactive = { - a = { bg = p.base, fg = p.inactive, gui = 'bold' }, - b = { bg = p.base, fg = p.inactive }, - c = { bg = p.base, fg = p.inactive }, + a = { bg = p.base, fg = p.muted, gui = 'bold' }, + b = { bg = p.base, fg = p.muted }, + c = { bg = p.base, fg = p.muted }, }, } diff --git a/lua/rose-pine/galaxyline/theme.lua b/lua/rose-pine/galaxyline/theme.lua index eb8db58..5142949 100644 --- a/lua/rose-pine/galaxyline/theme.lua +++ b/lua/rose-pine/galaxyline/theme.lua @@ -1,19 +1,19 @@ -local present, galaxyline_colors = pcall(require, "galaxyline.themes.colors") +local present, galaxyline_colors = pcall(require, 'galaxyline.themes.colors') if not present then - return + return end -local palette = require("rose-pine.palette") +local palette = require('rose-pine.palette') -galaxyline_colors["rose-pine"] = { - bg = palette.overlay, - fg = palette.text, - fg_alt = palette.subtle, - yellow = palette.gold, - cyan = palette.foam, - green = palette.inactive, - orange = palette.rose, - magenta = palette.iris, - blue = palette.foam, - red = palette.love, +galaxyline_colors['rose-pine'] = { + bg = palette.overlay, + fg = palette.text, + fg_alt = palette.subtle, + blue = palette.foam, + cyan = palette.foam, + green = palette.muted, + magenta = palette.iris, + orange = palette.rose, + red = palette.love, + yellow = palette.gold, } diff --git a/lua/rose-pine/init.lua b/lua/rose-pine/init.lua index f07ee01..f872457 100644 --- a/lua/rose-pine/init.lua +++ b/lua/rose-pine/init.lua @@ -23,16 +23,7 @@ function M.colorscheme() local bg = color.bg and 'guibg=' .. color.bg or 'guibg=NONE' local sp = color.sp and 'guisp=' .. color.sp or '' - local hl = 'highlight ' - .. group - .. ' ' - .. style - .. ' ' - .. fg - .. ' ' - .. bg - .. ' ' - .. sp + local hl = 'highlight ' .. group .. ' ' .. style .. ' ' .. fg .. ' ' .. bg .. ' ' .. sp vim.cmd(hl) if color.link then @@ -49,7 +40,7 @@ end function M.set(variant) vim.g.rose_pine_variant = variant - vim.cmd([[colorscheme rose-pine]]) + vim.cmd('colorscheme rose-pine') end function M.toggle(variants) @@ -64,9 +55,7 @@ function M.toggle(variants) vim.g.rose_pine_current_variant = index[vim.g.rose_pine_variant] or 0 end - vim.g.rose_pine_current_variant = ( - vim.g.rose_pine_current_variant % #variants - ) + 1 + vim.g.rose_pine_current_variant = (vim.g.rose_pine_current_variant % #variants) + 1 M.set(variants[vim.g.rose_pine_current_variant]) end diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua index e73caee..25216f5 100644 --- a/lua/rose-pine/palette.lua +++ b/lua/rose-pine/palette.lua @@ -3,8 +3,8 @@ local variants = { base = '#191724', surface = '#1f1d2e', overlay = '#26233a', - inactive = '#555169', - subtle = '#6e6a86', + muted = '#6e6a86', + subtle = '#908caa', text = '#e0def4', love = '#eb6f92', gold = '#f6c177', @@ -20,8 +20,8 @@ local variants = { base = '#232136', surface = '#2a273f', overlay = '#393552', - inactive = '#59546d', - subtle = '#817c9c', + muted = '#6e6a86', + subtle = '#908caa', text = '#e0def4', love = '#eb6f92', gold = '#f6c177', @@ -37,8 +37,8 @@ local variants = { base = '#faf4ed', surface = '#fffaf3', overlay = '#f2e9de', - inactive = '#9893a5', - subtle = '#6e6a86', + muted = '#9893a5', + subtle = '#797593', text = '#575279', love = '#b4637a', gold = '#ea9d34', diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua index 60b4a3b..b982372 100644 --- a/lua/rose-pine/theme.lua +++ b/lua/rose-pine/theme.lua @@ -54,18 +54,18 @@ local theme = { FoldColumn = {}, Folded = { fg = p.text, bg = p.surface }, IncSearch = { bg = p.highlight_med }, - LineNr = { fg = p.inactive }, + LineNr = { fg = p.muted }, MatchParen = { fg = p.text, bg = p.highlight_med }, ModeMsg = { fg = p.subtle }, MoreMsg = { fg = p.iris }, - NonText = { fg = p.inactive }, + NonText = { fg = p.muted }, Normal = { fg = p.text, bg = maybe_background }, NormalNC = { fg = p.text, bg = maybe_inactive_background }, NormalFloat = { fg = p.text, bg = maybe_float_background }, Pmenu = { fg = p.subtle, bg = maybe_float_background }, PmenuSbar = { bg = p.overlay }, PmenuSel = { fg = p.text, bg = p.overlay }, - PmenuThumb = { bg = p.inactive }, + PmenuThumb = { bg = p.muted }, Question = { fg = p.gold }, -- QuickFixLine = {}, Search = { fg = p.iris, bg = p.highlight_high }, @@ -81,7 +81,7 @@ local theme = { -- StatusLineTermNC = {}, TabLine = { fg = p.subtle, bg = p.overlay }, TabLineFill = { bg = p.surface }, - TabLineSel = { fg = p.text, bg = p.inactive }, + TabLineSel = { fg = p.text, bg = p.muted }, Title = { fg = p.text }, VertSplit = maybe_bold_vert_split, Visual = { bg = p.highlight_med }, @@ -317,12 +317,12 @@ local theme = { BufferInactive = { fg = p.subtle }, BufferInactiveIndex = { fg = p.subtle }, BufferInactiveMod = { fg = p.foam }, - BufferInactiveSign = { fg = p.inactive }, + BufferInactiveSign = { fg = p.muted }, BufferInactiveTarget = { fg = p.gold }, BufferVisible = { fg = p.subtle }, BufferVisibleIndex = { fg = p.subtle }, BufferVisibleMod = { fg = p.foam }, - BufferVisibleSign = { fg = p.inactive }, + BufferVisibleSign = { fg = p.muted }, BufferVisibleTarget = { fg = p.gold }, -- gitsigns.nvim @@ -350,7 +350,7 @@ local theme = { NvimTreeFileNew = { fg = p.foam }, NvimTreeFileRenamed = { fg = p.pine }, NvimTreeFileStaged = { fg = p.iris }, - NvimTreeEmptyFolderName = { fg = p.inactive }, + NvimTreeEmptyFolderName = { fg = p.muted }, NvimTreeFolderIcon = { fg = p.subtle }, NvimTreeFolderName = { fg = p.foam }, NvimTreeImageFile = { fg = p.text }, diff --git a/lua/rose-pine/util.lua b/lua/rose-pine/util.lua index fe60e27..8ad79d4 100644 --- a/lua/rose-pine/util.lua +++ b/lua/rose-pine/util.lua @@ -26,12 +26,7 @@ function util.blend(fg, bg, alpha) return math.floor(math.min(math.max(0, ret), 255) + 0.5) end - return string.format( - '#%02X%02X%02X', - blendChannel(1), - blendChannel(2), - blendChannel(3) - ) + return string.format('#%02X%02X%02X', blendChannel(1), blendChannel(2), blendChannel(3)) end return util From f8c9ac7dad8e6765a175d6671aa54aec64b4f6a6 Mon Sep 17 00:00:00 2001 From: mvllow Date: Fri, 21 Jan 2022 21:06:59 -0600 Subject: [PATCH 002/211] wip: add bufferline starting point ref #56 --- lua/rose-pine/bufferline/init.lua | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 lua/rose-pine/bufferline/init.lua diff --git a/lua/rose-pine/bufferline/init.lua b/lua/rose-pine/bufferline/init.lua new file mode 100644 index 0000000..3ae77b4 --- /dev/null +++ b/lua/rose-pine/bufferline/init.lua @@ -0,0 +1,23 @@ +local p = require('rose-pine.palette') + +-- TODO: Someone who uses bufferline.nvim is free to PR with this addition +-- `:h bufferline-highlights` +-- +-- The intended use would be (or any better solution): +-- +-- ``` +-- local highlights = require('rose-pine.bufferline') +-- require('bufferline').setup({ +-- highlights = highlights +-- }) +-- ``` +return { + fill = { + guifg = p.text, + guibg = p.base, + }, + background = { + guifg = p.text, + guibg = p.base, + }, +} From 06fca4e0071746da26e06e401df21105dedb12cd Mon Sep 17 00:00:00 2001 From: mvllow Date: Sun, 23 Jan 2022 18:27:38 -0600 Subject: [PATCH 003/211] darken statusline foreground --- lua/rose-pine/theme.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua index b982372..2d4e8d5 100644 --- a/lua/rose-pine/theme.lua +++ b/lua/rose-pine/theme.lua @@ -75,8 +75,8 @@ local theme = { SpellLocal = { style = 'undercurl', sp = p.subtle }, SpellRare = { style = 'undercurl', sp = p.subtle }, SignColumn = { fg = p.text, bg = maybe_background }, - StatusLine = { fg = p.text, bg = p.surface }, - StatusLineNC = { fg = p.subtle, bg = p.surface }, + StatusLine = { fg = p.subtle, bg = p.surface }, + StatusLineNC = { fg = p.muted, bg = p.surface }, -- StatusLineTerm = {}, -- StatusLineTermNC = {}, TabLine = { fg = p.subtle, bg = p.overlay }, From 556b04d0180af089e1beffabc2442a3deb8aa836 Mon Sep 17 00:00:00 2001 From: Devin <47056144+ikws4@users.noreply.github.com> Date: Tue, 25 Jan 2022 22:10:51 +0800 Subject: [PATCH 004/211] feat: add support for pounce.nvim (#60) --- lua/rose-pine/theme.lua | 7 +++++++ readme.md | 2 ++ 2 files changed, 9 insertions(+) diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua index 2d4e8d5..059f0a9 100644 --- a/lua/rose-pine/theme.lua +++ b/lua/rose-pine/theme.lua @@ -478,6 +478,13 @@ local theme = { -- Lsp_Signature -- https://github.com/ray-x/lsp_signature.nvim LspSignatureActiveParameter = { bg = p.overlay }, + + -- pounce + -- https://github.com/rlane/pounce.nvim + PounceMatch = { link = 'Search' }, + PounceGap = { link = 'Search' }, + PounceAccept = { fg = p.love, bg = p.highlight_high }, + PounceAcceptBest = { fg = p.base, bg = p.gold }, } vim.g.terminal_color_0 = p.overlay -- black diff --git a/readme.md b/readme.md index 1fad0f7..a000008 100644 --- a/readme.md +++ b/readme.md @@ -39,7 +39,9 @@ use({ - **[Neogit](https://github.com/TimUntersberger/neogit)** - **[Neorg](https://github.com/nvim-neorg/neorg)** - **[Lspsaga](https://github.com/tami5/lspsaga.nvim)** +- **[Pounce](https://github.com/rlane/pounce.nvim)** - **[Lualine](https://github.com/hoob3rt/lualine.nvim)** + ```lua require('lualine').setup({ options = { theme = 'rose-pine' } From ac704d114e741434291353bd91b59802473dde5e Mon Sep 17 00:00:00 2001 From: yuhixyz <50203860+yuhixyz@users.noreply.github.com> Date: Tue, 25 Jan 2022 22:12:05 +0800 Subject: [PATCH 005/211] vimwikilink add underline style (#61) --- lua/rose-pine/theme.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua index 059f0a9..700637f 100644 --- a/lua/rose-pine/theme.lua +++ b/lua/rose-pine/theme.lua @@ -415,7 +415,7 @@ local theme = { VimwikiHeader5 = { fg = config.colors.headings.h5, style = 'bold' }, VimwikiHeader6 = { fg = config.colors.headings.h6, style = 'bold' }, VimwikiHeaderChar = { fg = p.pine }, - VimwikiLink = { fg = p.rose }, + VimwikiLink = { fg = p.rose, style = 'underline' }, VimwikiList = { fg = p.iris }, VimwikiNoExistsLink = { fg = p.love }, From 7ecc4a9dfb77561dc791e96326d0fb81609300c2 Mon Sep 17 00:00:00 2001 From: mvllow Date: Wed, 26 Jan 2022 10:36:18 -0600 Subject: [PATCH 006/211] feat: support `FoldColumn` --- lua/rose-pine/theme.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua index 700637f..c3f0c5e 100644 --- a/lua/rose-pine/theme.lua +++ b/lua/rose-pine/theme.lua @@ -51,7 +51,7 @@ local theme = { -- EndOfBuffer = {}, ErrorMsg = { fg = p.love, style = 'bold' }, FloatBorder = { fg = p.subtle }, - FoldColumn = {}, + FoldColumn = { fg = p.muted }, Folded = { fg = p.text, bg = p.surface }, IncSearch = { bg = p.highlight_med }, LineNr = { fg = p.muted }, From 6a4eeaaac3eaac0b9d788ad1b06bc90dd299d9f8 Mon Sep 17 00:00:00 2001 From: mvllow Date: Wed, 26 Jan 2022 21:32:05 -0600 Subject: [PATCH 007/211] update search highlights --- lua/rose-pine/theme.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua index c3f0c5e..c0f4ad8 100644 --- a/lua/rose-pine/theme.lua +++ b/lua/rose-pine/theme.lua @@ -53,7 +53,7 @@ local theme = { FloatBorder = { fg = p.subtle }, FoldColumn = { fg = p.muted }, Folded = { fg = p.text, bg = p.surface }, - IncSearch = { bg = p.highlight_med }, + IncSearch = { bg = p.highlight_high }, LineNr = { fg = p.muted }, MatchParen = { fg = p.text, bg = p.highlight_med }, ModeMsg = { fg = p.subtle }, @@ -68,7 +68,7 @@ local theme = { PmenuThumb = { bg = p.muted }, Question = { fg = p.gold }, -- QuickFixLine = {}, - Search = { fg = p.iris, bg = p.highlight_high }, + Search = { bg = p.highlight_med }, SpecialKey = { fg = p.foam }, SpellBad = { style = 'undercurl', sp = p.love }, SpellCap = { style = 'undercurl', sp = p.subtle }, From 34e6fd25ce7939a45f0116c2c7eb02526b47e712 Mon Sep 17 00:00:00 2001 From: mvllow Date: Fri, 28 Jan 2022 15:11:59 -0600 Subject: [PATCH 008/211] feat: add support for telescope.nvim and allow border overrides --- lua/rose-pine/config.lua | 1 + lua/rose-pine/theme.lua | 166 ++++++++++++++++++++------------------- readme.md | 3 + 3 files changed, 90 insertions(+), 80 deletions(-) diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua index 3418757..5fc752d 100644 --- a/lua/rose-pine/config.lua +++ b/lua/rose-pine/config.lua @@ -9,6 +9,7 @@ local config = { colors = { punctuation = palette.subtle, comment = palette.subtle, + border = palette.highlight_med, hint = palette.iris, info = palette.foam, warn = palette.gold, diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua index c0f4ad8..beb9622 100644 --- a/lua/rose-pine/theme.lua +++ b/lua/rose-pine/theme.lua @@ -1,6 +1,7 @@ local config = require('rose-pine.config') local util = require('rose-pine.util') local p = require('rose-pine.palette') +local c = config.colors -- TODO: Refactor `maybe` logic local maybe_inactive_background = p.none @@ -50,7 +51,7 @@ local theme = { Directory = { fg = p.foam, bg = p.none }, -- EndOfBuffer = {}, ErrorMsg = { fg = p.love, style = 'bold' }, - FloatBorder = { fg = p.subtle }, + FloatBorder = { fg = c.border }, FoldColumn = { fg = p.muted }, Folded = { fg = p.text, bg = p.surface }, IncSearch = { bg = p.highlight_high }, @@ -93,7 +94,7 @@ local theme = { Boolean = { fg = p.gold }, Character = { fg = p.gold }, Comment = { - fg = config.colors.comment, + fg = c.comment, style = maybe_italic, }, Conditional = { fg = p.pine }, @@ -132,29 +133,29 @@ local theme = { htmlArg = { fg = p.iris }, htmlBold = { fg = p.text, style = 'bold' }, htmlEndTag = { fg = p.subtle }, - htmlH1 = { fg = config.colors.headings.h1, style = 'bold' }, - htmlH2 = { fg = config.colors.headings.h2, style = 'bold' }, - htmlH3 = { fg = config.colors.headings.h3, style = 'bold' }, - htmlH4 = { fg = config.colors.headings.h4, style = 'bold' }, - htmlH5 = { fg = config.colors.headings.h5, style = 'bold' }, + htmlH1 = { fg = c.headings.h1, style = 'bold' }, + htmlH2 = { fg = c.headings.h2, style = 'bold' }, + htmlH3 = { fg = c.headings.h3, style = 'bold' }, + htmlH4 = { fg = c.headings.h4, style = 'bold' }, + htmlH5 = { fg = c.headings.h5, style = 'bold' }, htmlItalic = { fg = p.text, style = maybe_italic }, htmlLink = { fg = p.text }, htmlTag = { fg = p.subtle }, htmlTagN = { fg = p.text }, htmlTagName = { fg = p.foam }, - markdownH1 = { fg = config.colors.headings.h1, style = 'bold' }, - markdownH1Delimiter = { fg = config.colors.headings.h1 }, - markdownH2 = { fg = config.colors.headings.h2, style = 'bold' }, - markdownH2Delimiter = { fg = config.colors.headings.h2 }, - markdownH3 = { fg = config.colors.headings.h3, style = 'bold' }, - markdownH3Delimiter = { fg = config.colors.headings.h3 }, - markdownH4 = { fg = config.colors.headings.h4, style = 'bold' }, - markdownH4Delimiter = { fg = config.colors.headings.h4 }, - markdownH5 = { fg = config.colors.headings.h5, style = 'bold' }, - markdownH5Delimiter = { fg = config.colors.headings.h5 }, - markdownH6 = { fg = config.colors.headings.h6, style = 'bold' }, - markdownH6Delimiter = { fg = config.colors.headings.h6 }, + markdownH1 = { fg = c.headings.h1, style = 'bold' }, + markdownH1Delimiter = { fg = c.headings.h1 }, + markdownH2 = { fg = c.headings.h2, style = 'bold' }, + markdownH2Delimiter = { fg = c.headings.h2 }, + markdownH3 = { fg = c.headings.h3, style = 'bold' }, + markdownH3Delimiter = { fg = c.headings.h3 }, + markdownH4 = { fg = c.headings.h4, style = 'bold' }, + markdownH4Delimiter = { fg = c.headings.h4 }, + markdownH5 = { fg = c.headings.h5, style = 'bold' }, + markdownH5Delimiter = { fg = c.headings.h5 }, + markdownH6 = { fg = c.headings.h6, style = 'bold' }, + markdownH6Delimiter = { fg = c.headings.h6 }, markdownDelimiter = { fg = p.subtle }, markdownLinkText = { fg = p.iris, style = 'underline' }, markdownUrl = { fg = p.iris, style = 'underline' }, @@ -176,35 +177,35 @@ local theme = { -- ^ ^ typescriptParens = { bg = p.none }, - DiagnosticHint = { fg = config.colors.hint }, - DiagnosticInfo = { fg = config.colors.info }, + DiagnosticHint = { fg = c.hint }, + DiagnosticInfo = { fg = c.info }, DiagnosticInformation = { link = 'DiagnosticInfo' }, - DiagnosticWarn = { fg = config.colors.warn }, + DiagnosticWarn = { fg = c.warn }, DiagnosticWarning = { link = 'DiagnosticWarn' }, - DiagnosticError = { fg = config.colors.error }, - DiagnosticDefaultHint = { fg = config.colors.hint }, - DiagnosticDefaultInfo = { fg = config.colors.info }, - DiagnosticDefaultWarn = { fg = config.colors.warn }, - DiagnosticDefaultError = { fg = config.colors.error }, - DiagnosticFloatingHint = { fg = config.colors.hint }, - DiagnosticFloatingInfo = { fg = config.colors.info }, - DiagnosticFloatingWarn = { fg = config.colors.warn }, - DiagnosticFloatingError = { fg = config.colors.error }, - DiagnosticSignHint = { fg = config.colors.hint }, - DiagnosticSignInfo = { fg = config.colors.info }, - DiagnosticSignWarn = { fg = config.colors.warn }, - DiagnosticSignError = { fg = config.colors.error }, - DiagnosticUnderlineHint = { style = 'undercurl', sp = config.colors.hint }, - DiagnosticUnderlineInfo = { style = 'undercurl', sp = config.colors.info }, - DiagnosticUnderlineWarn = { style = 'undercurl', sp = config.colors.warn }, + DiagnosticError = { fg = c.error }, + DiagnosticDefaultHint = { fg = c.hint }, + DiagnosticDefaultInfo = { fg = c.info }, + DiagnosticDefaultWarn = { fg = c.warn }, + DiagnosticDefaultError = { fg = c.error }, + DiagnosticFloatingHint = { fg = c.hint }, + DiagnosticFloatingInfo = { fg = c.info }, + DiagnosticFloatingWarn = { fg = c.warn }, + DiagnosticFloatingError = { fg = c.error }, + DiagnosticSignHint = { fg = c.hint }, + DiagnosticSignInfo = { fg = c.info }, + DiagnosticSignWarn = { fg = c.warn }, + DiagnosticSignError = { fg = c.error }, + DiagnosticUnderlineHint = { style = 'undercurl', sp = c.hint }, + DiagnosticUnderlineInfo = { style = 'undercurl', sp = c.info }, + DiagnosticUnderlineWarn = { style = 'undercurl', sp = c.warn }, DiagnosticUnderlineError = { style = 'undercurl', - sp = config.colors.error, + sp = c.error, }, - DiagnosticVirtualTextHint = { fg = config.colors.hint }, - DiagnosticVirtualTextInfo = { fg = config.colors.info }, - DiagnosticVirtualTextWarn = { fg = config.colors.warn }, - DiagnosticVirtualTextError = { fg = config.colors.error }, + DiagnosticVirtualTextHint = { fg = c.hint }, + DiagnosticVirtualTextInfo = { fg = c.info }, + DiagnosticVirtualTextWarn = { fg = c.warn }, + DiagnosticVirtualTextError = { fg = c.error }, LspReferenceText = { fg = p.rose, bg = p.highlight_med }, LspReferenceRead = { fg = p.rose, bg = p.highlight_med }, @@ -246,7 +247,7 @@ local theme = { TSBoolean = { fg = p.rose }, -- TSCharacter = {}, TSComment = { - fg = config.colors.comment, + fg = c.comment, style = maybe_italic, }, -- TSConditional = {}, @@ -282,9 +283,9 @@ local theme = { fg = p.iris, style = maybe_italic, }, - TSPunctBracket = { fg = config.colors.punctuation }, - TSPunctDelimiter = { fg = config.colors.punctuation }, - TSPunctSpecial = { fg = config.colors.punctuation }, + TSPunctBracket = { fg = c.punctuation }, + TSPunctDelimiter = { fg = c.punctuation }, + TSPunctSpecial = { fg = c.punctuation }, -- TSRepeat = {}, -- TSStrike = {}, TSString = { fg = p.gold }, @@ -295,7 +296,7 @@ local theme = { TSTag = { fg = p.foam }, TSTagDelimiter = { fg = p.subtle }, TSText = { fg = p.text }, - TSTitle = { fg = config.colors.headings.h1, style = 'bold' }, + TSTitle = { fg = c.headings.h1, style = 'bold' }, -- TSType = {}, -- TSTypeBuiltin = {}, TSURI = { fg = p.gold }, @@ -408,12 +409,12 @@ local theme = { -- VimWiki -- https://github.com/vimwiki/vimwiki VimwikiHR = { fg = p.subtle }, - VimwikiHeader1 = { fg = config.colors.headings.h1, style = 'bold' }, - VimwikiHeader2 = { fg = config.colors.headings.h2, style = 'bold' }, - VimwikiHeader3 = { fg = config.colors.headings.h3, style = 'bold' }, - VimwikiHeader4 = { fg = config.colors.headings.h4, style = 'bold' }, - VimwikiHeader5 = { fg = config.colors.headings.h5, style = 'bold' }, - VimwikiHeader6 = { fg = config.colors.headings.h6, style = 'bold' }, + VimwikiHeader1 = { fg = c.headings.h1, style = 'bold' }, + VimwikiHeader2 = { fg = c.headings.h2, style = 'bold' }, + VimwikiHeader3 = { fg = c.headings.h3, style = 'bold' }, + VimwikiHeader4 = { fg = c.headings.h4, style = 'bold' }, + VimwikiHeader5 = { fg = c.headings.h5, style = 'bold' }, + VimwikiHeader6 = { fg = c.headings.h6, style = 'bold' }, VimwikiHeaderChar = { fg = p.pine }, VimwikiLink = { fg = p.rose, style = 'underline' }, VimwikiList = { fg = p.iris }, @@ -421,19 +422,19 @@ local theme = { -- Neorg -- https://github.com/nvim-neorg/neorg - NeorgHeading1Prefix = { fg = config.colors.headings.h1, style = 'bold' }, - NeorgHeading2Prefix = { fg = config.colors.headings.h2, style = 'bold' }, - NeorgHeading3Prefix = { fg = config.colors.headings.h3, style = 'bold' }, - NeorgHeading4Prefix = { fg = config.colors.headings.h4, style = 'bold' }, - NeorgHeading5Prefix = { fg = config.colors.headings.h5, style = 'bold' }, - NeorgHeading6Prefix = { fg = config.colors.headings.h6, style = 'bold' }, + NeorgHeading1Prefix = { fg = c.headings.h1, style = 'bold' }, + NeorgHeading2Prefix = { fg = c.headings.h2, style = 'bold' }, + NeorgHeading3Prefix = { fg = c.headings.h3, style = 'bold' }, + NeorgHeading4Prefix = { fg = c.headings.h4, style = 'bold' }, + NeorgHeading5Prefix = { fg = c.headings.h5, style = 'bold' }, + NeorgHeading6Prefix = { fg = c.headings.h6, style = 'bold' }, - NeorgHeading1Title = { fg = config.colors.headings.h1, style = 'bold' }, - NeorgHeading2Title = { fg = config.colors.headings.h2, style = 'bold' }, - NeorgHeading3Title = { fg = config.colors.headings.h3, style = 'bold' }, - NeorgHeading4Title = { fg = config.colors.headings.h4, style = 'bold' }, - NeorgHeading5Title = { fg = config.colors.headings.h5, style = 'bold' }, - NeorgHeading6Title = { fg = config.colors.headings.h6, style = 'bold' }, + NeorgHeading1Title = { fg = c.headings.h1, style = 'bold' }, + NeorgHeading2Title = { fg = c.headings.h2, style = 'bold' }, + NeorgHeading3Title = { fg = c.headings.h3, style = 'bold' }, + NeorgHeading4Title = { fg = c.headings.h4, style = 'bold' }, + NeorgHeading5Title = { fg = c.headings.h5, style = 'bold' }, + NeorgHeading6Title = { fg = c.headings.h6, style = 'bold' }, NeorgMarkerTitle = { fg = p.text, style = 'bold' }, -- LspSaga @@ -442,33 +443,27 @@ local theme = { fg = p.gold, style = 'bold', }, - LspSagaCodeActionBorder = { fg = p.subtle }, + LspSagaCodeActionBorder = { fg = c.border }, LspSagaCodeActionTruncateLine = { link = 'LspSagaCodeActionBorder' }, LspSagaCodeActionContent = { fg = p.foam }, - LspSagaDiagnosticBorder = { fg = p.subtle }, - LspSagaDiagnosticHeader = { - fg = p.gold, - style = 'bold', - }, + LspSagaDiagnosticBorder = { fg = c.border }, + LspSagaDiagnosticHeader = { fg = p.gold, style = 'bold' }, LspSagaDiagnosticTruncateLine = { link = 'LspSagaDiagnosticBorder' }, LspSagaFinderSelection = { fg = p.gold }, - LspSagaLspFinderBorder = { fg = p.subtle }, + LspSagaLspFinderBorder = { fg = c.border }, LspSagaAutoPreview = { fg = p.subtle }, - LspSagaDefPreviewBorder = { fg = p.subtle }, + LspSagaDefPreviewBorder = { fg = c.border }, DefinitionIcon = { fg = p.rose }, DefinitionCount = { fg = p.rose }, ReferencesCount = { fg = p.rose }, ReferencesIcon = { fg = p.rose }, - DefintionPreviewTitle = { - fg = p.rose, - style = 'bold', - }, + DefintionPreviewTitle = { fg = p.rose, style = 'bold' }, LspSagaRenamePromptPrefix = { fg = p.love }, LspSagaRenameBorder = { fg = p.pine }, LspFloatWinNormal = { bg = p.base }, - LspFloatWinBorder = { fg = p.subtle }, + LspFloatWinBorder = { fg = c.border }, LspSagaDocTruncateLine = { link = 'LspSagaHoverBorder' }, - LspSagaHoverBorder = { fg = p.subtle }, + LspSagaHoverBorder = { fg = c.border }, LspSagaSignatureHelpBorder = { fg = p.pine }, LspSagaShTruncateLine = { link = 'LspSagaSignatureHelpBorder' }, TargetWord = { fg = p.iris }, @@ -485,6 +480,17 @@ local theme = { PounceGap = { link = 'Search' }, PounceAccept = { fg = p.love, bg = p.highlight_high }, PounceAcceptBest = { fg = p.base, bg = p.gold }, + + -- telescope.nvim + -- https://github.com/nvim-telescope/telescope.nvim + TelescopeNormal = { fg = p.subtle }, + TelescopePromptNormal = { fg = p.text }, + TelescopeBorder = { fg = c.border }, + TelescopeMatching = { fg = p.rose }, + TelescopePromptPrefix = { fg = p.subtle }, + TelescopeSelection = { fg = p.text, bg = p.highlight_low }, + TelescopeSelectionCaret = { fg = p.rose }, + TelescopeTitle = { fg = p.subtle }, } vim.g.terminal_color_0 = p.overlay -- black diff --git a/readme.md b/readme.md index a000008..53ca434 100644 --- a/readme.md +++ b/readme.md @@ -40,6 +40,7 @@ use({ - **[Neorg](https://github.com/nvim-neorg/neorg)** - **[Lspsaga](https://github.com/tami5/lspsaga.nvim)** - **[Pounce](https://github.com/rlane/pounce.nvim)** +- **[Telescope](https://github.com/nvim-telescope/telescope.nvim)** - **[Lualine](https://github.com/hoob3rt/lualine.nvim)** ```lua @@ -47,6 +48,7 @@ use({ options = { theme = 'rose-pine' } }) ``` + - **[Galaxyline fork](https://github.com/NTBBloodbath/galaxyline.nvim)** > This fork by NTBBloodbath allows [custom colors](https://github.com/NTBBloodbath/galaxyline.nvim/blob/main/docs/themes.md#colors-standards) ```lua @@ -88,6 +90,7 @@ local p = require('rose-pine.palette') vim.g.rose_pine_colors = { punctuation = p.subtle, comment = p.subtle, + border = p.highlight_med, hint = p.iris, info = p.foam, warn = p.gold, From b1f5b18fdfa7daac798d6032377a3bb30cfa1864 Mon Sep 17 00:00:00 2001 From: mvllow Date: Fri, 28 Jan 2022 15:20:20 -0600 Subject: [PATCH 009/211] match telescope selection caret background --- lua/rose-pine/theme.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua index beb9622..af212f6 100644 --- a/lua/rose-pine/theme.lua +++ b/lua/rose-pine/theme.lua @@ -489,7 +489,7 @@ local theme = { TelescopeMatching = { fg = p.rose }, TelescopePromptPrefix = { fg = p.subtle }, TelescopeSelection = { fg = p.text, bg = p.highlight_low }, - TelescopeSelectionCaret = { fg = p.rose }, + TelescopeSelectionCaret = { fg = p.rose, bg = p.highlight_low }, TelescopeTitle = { fg = p.subtle }, } From 8a728cd0cde199660794913e9d754df3e792d0eb Mon Sep 17 00:00:00 2001 From: not Date: Fri, 28 Jan 2022 18:32:46 -0600 Subject: [PATCH 010/211] Update readme.md --- readme.md | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/readme.md b/readme.md index 53ca434..2a02672 100644 --- a/readme.md +++ b/readme.md @@ -28,33 +28,33 @@ use({ > PR's are more than welcome if your favourite plugin is missing -- **[Treesitter](https://github.com/nvim-treesitter/nvim-treesitter)** -- **[Diagnostics](https://neovim.io/doc/user/lsp.html)** -- **[Barbar](https://github.com/romgrk/barbar.nvim)** -- **[Gitsigns](https://github.com/lewis6991/gitsigns.nvim)** -- **[Modes](https://github.com/mvllow/modes.nvim)** -- **[NvimTree](https://github.com/kyazdani42/nvim-tree.lua)** -- **[WhichKey](https://github.com/folke/which-key.nvim)** -- **[Indent-Blankline.nvim](https://github.com/lukas-reineke/indent-blankline.nvim)** -- **[Neogit](https://github.com/TimUntersberger/neogit)** -- **[Neorg](https://github.com/nvim-neorg/neorg)** -- **[Lspsaga](https://github.com/tami5/lspsaga.nvim)** -- **[Pounce](https://github.com/rlane/pounce.nvim)** -- **[Telescope](https://github.com/nvim-telescope/telescope.nvim)** -- **[Lualine](https://github.com/hoob3rt/lualine.nvim)** +- [Treesitter](https://github.com/nvim-treesitter/nvim-treesitter) +- [Diagnostics](https://neovim.io/doc/user/lsp.html) +- [Barbar](https://github.com/romgrk/barbar.nvim) +- [Gitsigns](https://github.com/lewis6991/gitsigns.nvim) +- [Modes](https://github.com/mvllow/modes.nvim) +- [NvimTree](https://github.com/kyazdani42/nvim-tree.lua) +- [WhichKey](https://github.com/folke/which-key.nvim) +- [Indent-Blankline.nvim](https://github.com/lukas-reineke/indent-blankline.nvim) +- [Neogit](https://github.com/TimUntersberger/neogit) +- [Neorg](https://github.com/nvim-neorg/neorg) +- [Lspsaga](https://github.com/tami5/lspsaga.nvim) +- [Pounce](https://github.com/rlane/pounce.nvim) +- [Telescope](https://github.com/nvim-telescope/telescope.nvim) +- [Lualine](https://github.com/hoob3rt/lualine.nvim) - ```lua - require('lualine').setup({ - options = { theme = 'rose-pine' } - }) - ``` -- **[Galaxyline fork](https://github.com/NTBBloodbath/galaxyline.nvim)** - > This fork by NTBBloodbath allows [custom colors](https://github.com/NTBBloodbath/galaxyline.nvim/blob/main/docs/themes.md#colors-standards) - ```lua - -- Set colors in your galaxyline config - local colors = require("galaxyline.themes.colors")["rose-pine"] - ``` +```lua +require('lualine').setup({ + options = { theme = 'rose-pine' } +}) +``` + +- [Galaxyline fork](https://github.com/NTBBloodbath/galaxyline.nvim) + +```lua +local colors = require("galaxyline.themes.colors")["rose-pine"] +``` ## Gallery From 03ace10a49b54e23d6736cb1a1dd260cb797d39e Mon Sep 17 00:00:00 2001 From: not Date: Sat, 29 Jan 2022 14:48:23 -0600 Subject: [PATCH 011/211] Update config.lua --- lua/rose-pine/config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua index 5fc752d..cd5c0f0 100644 --- a/lua/rose-pine/config.lua +++ b/lua/rose-pine/config.lua @@ -1,7 +1,7 @@ local palette = require('rose-pine.palette') local config = { - bold_vert_split = vim.g.rose_pine_bold_verical_split_line or false, + bold_vert_split = vim.g.rose_pine_bold_vertical_split_line or false, inactive_background = vim.g.rose_pine_inactive_background or false, no_background = vim.g.rose_pine_disable_background or false, no_float_background = vim.g.rose_pine_disable_float_background or false, From 9fabaff219201c3ca0c1506a4a54a683db4d2abf Mon Sep 17 00:00:00 2001 From: mvllow Date: Sat, 29 Jan 2022 16:12:03 -0600 Subject: [PATCH 012/211] chore: update util function --- lua/rose-pine/util.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/rose-pine/util.lua b/lua/rose-pine/util.lua index 8ad79d4..67b5e08 100644 --- a/lua/rose-pine/util.lua +++ b/lua/rose-pine/util.lua @@ -16,17 +16,17 @@ end ---@param fg string foreground color ---@param bg string background color ----@param alpha number number between 0 and 1. 0 results in bg, 1 results in fg +---@param alpha number number between 0 (background) and 1 (foreground) function util.blend(fg, bg, alpha) bg = get_color(bg) fg = get_color(fg) - local blendChannel = function(i) + local function blend_channel(i) local ret = (alpha * fg[i] + ((1 - alpha) * bg[i])) return math.floor(math.min(math.max(0, ret), 255) + 0.5) end - return string.format('#%02X%02X%02X', blendChannel(1), blendChannel(2), blendChannel(3)) + return string.format('#%02X%02X%02X', blend_channel(1), blend_channel(2), blend_channel(3)) end return util From 0ac6c6c09122630e7858a1c7433dfd68fde20fb3 Mon Sep 17 00:00:00 2001 From: mvllow Date: Sat, 29 Jan 2022 16:12:12 -0600 Subject: [PATCH 013/211] chore: update stylua config --- .stylua.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.stylua.toml b/.stylua.toml index ffab677..48e35ae 100644 --- a/.stylua.toml +++ b/.stylua.toml @@ -1,3 +1,6 @@ column_width = 100 indent_type = "Tabs" +indent_width = 3 +line_endings = "Unix" quote_style = "AutoPreferSingle" + From b1069203d144b59dd210bc5922a5c94c69ea7274 Mon Sep 17 00:00:00 2001 From: mvllow Date: Wed, 2 Feb 2022 17:44:07 -0600 Subject: [PATCH 014/211] feat: add link override - refactor config and readme --- lua/rose-pine/config.lua | 50 ++- lua/rose-pine/palette.lua | 3 + lua/rose-pine/theme.lua | 759 ++++++++++++++++++-------------------- readme.md | 80 ++-- 4 files changed, 429 insertions(+), 463 deletions(-) diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua index 5fc752d..6b3ac12 100644 --- a/lua/rose-pine/config.lua +++ b/lua/rose-pine/config.lua @@ -1,26 +1,48 @@ local palette = require('rose-pine.palette') +local function opt(key, default) + key = 'rose_pine_' .. key + + if vim.g[key] == nil then + return default + end + + if vim.g[key] == 0 or vim.g[key] == false then + return false + end + + return vim.g[key] +end + local config = { - bold_vert_split = vim.g.rose_pine_bold_verical_split_line or false, - inactive_background = vim.g.rose_pine_inactive_background or false, - no_background = vim.g.rose_pine_disable_background or false, - no_float_background = vim.g.rose_pine_disable_float_background or false, - no_italics = vim.g.rose_pine_disable_italics or false, + variant = opt('variant', 'main'), + + bold_vertical_split_line = opt('bold_vertical_split_line', false), + disable_italics = opt('disable_italics', false), + disable_background = opt('disable_background', false), + disable_float_background = opt('disable_float_background', false), + inactive_background = opt('inactive_background', false), + colors = { - punctuation = palette.subtle, - comment = palette.subtle, border = palette.highlight_med, + comment = palette.muted, + link = palette.iris, + punctuation = palette.subtle, + + error = palette.love, hint = palette.iris, info = palette.foam, warn = palette.gold, - error = palette.love, - -- TODO: Expose these once matched with syntax and cmp kind - -- variable = '', - -- class = '', - -- interface = '', - -- ['function'] = '', - -- method = '', + git_add = palette.foam, + git_change = palette.rose, + git_delete = palette.love, + git_dirty = palette.rose, + git_ignore = palette.muted, + git_merge = palette.iris, + git_rename = palette.pine, + git_stage = palette.iris, + git_text = palette.rose, ---@type string|table headings = { diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua index 25216f5..0b24973 100644 --- a/lua/rose-pine/palette.lua +++ b/lua/rose-pine/palette.lua @@ -15,6 +15,7 @@ local variants = { highlight_low = '#21202e', highlight_med = '#403d52', highlight_high = '#524f67', + opacity = 0.1, }, moon = { base = '#232136', @@ -32,6 +33,7 @@ local variants = { highlight_low = '#2a283e', highlight_med = '#44415a', highlight_high = '#56526e', + opacity = 0.1, }, dawn = { base = '#faf4ed', @@ -49,6 +51,7 @@ local variants = { highlight_low = '#f4ede8', highlight_med = '#dfdad9', highlight_high = '#cecacd', + opacity = 0.05, }, } diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua index af212f6..ab8e68c 100644 --- a/lua/rose-pine/theme.lua +++ b/lua/rose-pine/theme.lua @@ -1,215 +1,194 @@ +local palette = require('rose-pine.palette') local config = require('rose-pine.config') local util = require('rose-pine.util') -local p = require('rose-pine.palette') -local c = config.colors --- TODO: Refactor `maybe` logic -local maybe_inactive_background = p.none -local maybe_background = p.base -local maybe_float_background = p.surface +local group = config.colors + local maybe_italic = 'italic' -local maybe_bold_vert_split = { fg = p.overlay } - -if config.bold_vert_split then - maybe_bold_vert_split = { fg = p.surface, bg = p.surface } -end - -if config.inactive_background then - maybe_inactive_background = p.surface -end - -if config.no_background then - maybe_background = p.none -end - -if config.no_float_background then - maybe_float_background = p.none -end - -if config.no_italics then +if config.disable_italics == true then maybe_italic = nil end +local background = config.disable_background and palette.base or palette.none +local float_background = config.disable_float_background and palette.surface or palette.none +local inactive_background = config.inactive_background + and util.blend('#000000', palette.base, palette.opacity) + or palette.none +local vert_split_background = config.bold_vertical_split_line and palette.overlay or palette.none + local theme = { - ColorColumn = { bg = p.highlight_high }, - Conceal = { bg = p.none }, + ColorColumn = { bg = palette.highlight_high }, + Conceal = { bg = palette.none }, -- Cursor = {}, - CursorColumn = { bg = p.highlight_med }, + CursorColumn = { bg = group.border }, -- CursorIM = {}, - CursorLine = { bg = p.highlight_low }, - CursorLineNr = { fg = p.text }, - DarkenedPanel = { bg = p.surface }, - DarkenedStatusline = { bg = p.surface }, - -- TODO: Allow diff overrides. This is a good reason to refactor our config logic to allow setting both fg and bg - DiffAdd = { bg = util.blend(p.foam, p.base, 0.5) }, - DiffChange = { bg = p.overlay }, - DiffDelete = { bg = util.blend(p.love, p.base, 0.5) }, - DiffText = { bg = util.blend(p.rose, p.base, 0.5) }, + CursorLine = { bg = palette.highlight_low }, + CursorLineNr = { fg = palette.text }, + DarkenedPanel = { bg = palette.surface }, + DarkenedStatusline = { bg = palette.surface }, + DiffAdd = { bg = util.blend(group.git_add, palette.base, 0.5) }, + DiffChange = { bg = palette.overlay }, + DiffDelete = { bg = util.blend(group.git_delete, palette.base, 0.5) }, + DiffText = { bg = util.blend(group.git_text, palette.base, 0.5) }, diffAdded = { link = 'DiffAdd' }, diffChanged = { link = 'DiffChange' }, diffRemoved = { link = 'DiffDelete' }, - Directory = { fg = p.foam, bg = p.none }, + Directory = { fg = palette.foam, bg = palette.none }, -- EndOfBuffer = {}, - ErrorMsg = { fg = p.love, style = 'bold' }, - FloatBorder = { fg = c.border }, - FoldColumn = { fg = p.muted }, - Folded = { fg = p.text, bg = p.surface }, - IncSearch = { bg = p.highlight_high }, - LineNr = { fg = p.muted }, - MatchParen = { fg = p.text, bg = p.highlight_med }, - ModeMsg = { fg = p.subtle }, - MoreMsg = { fg = p.iris }, - NonText = { fg = p.muted }, - Normal = { fg = p.text, bg = maybe_background }, - NormalNC = { fg = p.text, bg = maybe_inactive_background }, - NormalFloat = { fg = p.text, bg = maybe_float_background }, - Pmenu = { fg = p.subtle, bg = maybe_float_background }, - PmenuSbar = { bg = p.overlay }, - PmenuSel = { fg = p.text, bg = p.overlay }, - PmenuThumb = { bg = p.muted }, - Question = { fg = p.gold }, + ErrorMsg = { fg = palette.love, style = 'bold' }, + FloatBorder = { fg = group.border }, + FoldColumn = { fg = palette.muted }, + Folded = { fg = palette.text, bg = palette.surface }, + IncSearch = { bg = palette.highlight_high }, + LineNr = { fg = palette.muted }, + MatchParen = { fg = palette.text, bg = palette.highlight_med }, + ModeMsg = { fg = palette.subtle }, + 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 }, + Pmenu = { fg = palette.subtle, bg = float_background }, + PmenuSbar = { bg = palette.overlay }, + PmenuSel = { fg = palette.text, bg = palette.overlay }, + PmenuThumb = { bg = palette.muted }, + Question = { fg = palette.gold }, -- QuickFixLine = {}, - Search = { bg = p.highlight_med }, - SpecialKey = { fg = p.foam }, - SpellBad = { style = 'undercurl', sp = p.love }, - SpellCap = { style = 'undercurl', sp = p.subtle }, - SpellLocal = { style = 'undercurl', sp = p.subtle }, - SpellRare = { style = 'undercurl', sp = p.subtle }, - SignColumn = { fg = p.text, bg = maybe_background }, - StatusLine = { fg = p.subtle, bg = p.surface }, - StatusLineNC = { fg = p.muted, bg = p.surface }, + Search = { bg = palette.highlight_med }, + SpecialKey = { fg = palette.foam }, + SpellBad = { sp = palette.love, style = 'undercurl' }, + SpellCap = { sp = palette.subtle, style = 'undercurl' }, + SpellLocal = { sp = palette.subtle, style = 'undercurl' }, + SpellRare = { sp = palette.subtle, style = 'undercurl' }, + SignColumn = { fg = palette.text, bg = background }, + StatusLine = { fg = palette.subtle, bg = palette.surface }, + StatusLineNC = { fg = palette.muted, bg = palette.base }, -- StatusLineTerm = {}, -- StatusLineTermNC = {}, - TabLine = { fg = p.subtle, bg = p.overlay }, - TabLineFill = { bg = p.surface }, - TabLineSel = { fg = p.text, bg = p.muted }, - Title = { fg = p.text }, - VertSplit = maybe_bold_vert_split, - Visual = { bg = p.highlight_med }, + TabLine = { fg = palette.subtle, bg = palette.overlay }, + TabLineFill = { bg = palette.surface }, + TabLineSel = { fg = palette.text, bg = palette.muted }, + Title = { fg = palette.text }, + VertSplit = { fg = palette.overlay, bg = vert_split_background }, + Visual = { bg = palette.highlight_med }, -- VisualNOS = {}, - WarningMsg = { fg = p.gold }, + WarningMsg = { fg = palette.gold }, -- Whitespace = {}, -- WildMenu = {}, - Boolean = { fg = p.gold }, - Character = { fg = p.gold }, - Comment = { - fg = c.comment, - style = maybe_italic, - }, - Conditional = { fg = p.pine }, - Constant = { fg = p.gold }, - Debug = { fg = p.rose }, - Define = { fg = p.iris }, - Delimiter = { fg = p.subtle }, - Error = { fg = p.love }, - Exception = { fg = p.pine }, - Float = { fg = p.gold }, - Function = { fg = p.rose }, - Identifier = { fg = p.rose }, - -- Ignore = { fg = '' }, - Include = { fg = p.iris }, - Keyword = { fg = p.pine }, - Label = { fg = p.foam }, - Macro = { fg = p.iris }, - Number = { fg = p.gold }, - Operator = { fg = p.subtle }, - PreCondit = { fg = p.iris }, - PreProc = { fg = p.iris }, - Repeat = { fg = p.pine }, - Special = { fg = p.rose }, - SpecialChar = { fg = p.rose }, - SpecialComment = { fg = p.iris }, - Statement = { fg = p.pine }, - StorageClass = { fg = p.foam }, - String = { fg = p.gold }, - Structure = { fg = p.foam }, - Tag = { fg = p.rose }, - Todo = { fg = p.iris }, - Type = { fg = p.foam }, - Typedef = { fg = p.foam }, - Underlined = { fg = p.foam, style = 'underline' }, + Boolean = { fg = palette.gold }, + Character = { fg = palette.gold }, + Comment = { fg = group.comment, style = maybe_italic }, + Conditional = { fg = palette.pine }, + Constant = { fg = palette.gold }, + Debug = { fg = palette.rose }, + Define = { fg = palette.iris }, + Delimiter = { fg = palette.subtle }, + Error = { fg = palette.love }, + Exception = { fg = palette.pine }, + Float = { fg = palette.gold }, + Function = { fg = palette.rose }, + Identifier = { fg = palette.rose }, + -- Ignore = {}, + Include = { fg = palette.iris }, + Keyword = { fg = palette.pine }, + Label = { fg = palette.foam }, + Macro = { fg = palette.iris }, + Number = { fg = palette.gold }, + Operator = { fg = palette.subtle }, + PreCondit = { fg = palette.iris }, + PreProc = { fg = palette.iris }, + Repeat = { fg = palette.pine }, + Special = { fg = palette.rose }, + SpecialChar = { fg = palette.rose }, + SpecialComment = { fg = palette.iris }, + Statement = { fg = palette.pine }, + StorageClass = { fg = palette.foam }, + String = { fg = palette.gold }, + Structure = { fg = palette.foam }, + Tag = { fg = palette.rose }, + Todo = { fg = palette.iris }, + Type = { fg = palette.foam }, + Typedef = { fg = palette.foam }, + Underlined = { fg = palette.foam, style = 'underline' }, - htmlArg = { fg = p.iris }, - htmlBold = { fg = p.text, style = 'bold' }, - htmlEndTag = { fg = p.subtle }, - htmlH1 = { fg = c.headings.h1, style = 'bold' }, - htmlH2 = { fg = c.headings.h2, style = 'bold' }, - htmlH3 = { fg = c.headings.h3, style = 'bold' }, - htmlH4 = { fg = c.headings.h4, style = 'bold' }, - htmlH5 = { fg = c.headings.h5, style = 'bold' }, - htmlItalic = { fg = p.text, style = maybe_italic }, - htmlLink = { fg = p.text }, - htmlTag = { fg = p.subtle }, - htmlTagN = { fg = p.text }, - htmlTagName = { fg = p.foam }, + htmlArg = { fg = palette.iris }, + htmlBold = { fg = palette.text, 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 }, + htmlLink = { fg = group.link }, + htmlTag = { fg = palette.subtle }, + htmlTagN = { fg = palette.text }, + htmlTagName = { fg = palette.foam }, - markdownH1 = { fg = c.headings.h1, style = 'bold' }, - markdownH1Delimiter = { fg = c.headings.h1 }, - markdownH2 = { fg = c.headings.h2, style = 'bold' }, - markdownH2Delimiter = { fg = c.headings.h2 }, - markdownH3 = { fg = c.headings.h3, style = 'bold' }, - markdownH3Delimiter = { fg = c.headings.h3 }, - markdownH4 = { fg = c.headings.h4, style = 'bold' }, - markdownH4Delimiter = { fg = c.headings.h4 }, - markdownH5 = { fg = c.headings.h5, style = 'bold' }, - markdownH5Delimiter = { fg = c.headings.h5 }, - markdownH6 = { fg = c.headings.h6, style = 'bold' }, - markdownH6Delimiter = { fg = c.headings.h6 }, - markdownDelimiter = { fg = p.subtle }, - markdownLinkText = { fg = p.iris, style = 'underline' }, - markdownUrl = { fg = p.iris, style = 'underline' }, - mkdCode = { fg = p.foam, style = maybe_italic }, - mkdCodeDelimiter = { fg = p.rose }, - mkdCodeEnd = { fg = p.foam }, - mkdCodeStart = { fg = p.foam }, - mkdFootnotes = { fg = p.foam }, - mkdID = { fg = p.foam, style = 'underline' }, - mkdInlineURL = { fg = p.foam, style = 'underline' }, - mkdLink = { fg = p.rose, style = 'bold' }, - mkdLinkDef = { fg = p.rose, style = 'bold' }, - mkdListItemLine = { fg = p.text }, - mkdRule = { fg = p.subtle }, - mkdURL = { fg = p.foam, style = 'underline' }, + 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 }, + markdownLinkText = { fg = group.link, style = 'underline' }, + markdownUrl = { fg = palette.iris, style = 'underline' }, + mkdCode = { fg = palette.foam, style = maybe_italic }, + mkdCodeDelimiter = { fg = palette.rose }, + mkdCodeEnd = { fg = palette.foam }, + mkdCodeStart = { fg = palette.foam }, + 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' }, + 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 = p.none }, + typescriptParens = { bg = palette.none }, - DiagnosticHint = { fg = c.hint }, - DiagnosticInfo = { fg = c.info }, + DiagnosticHint = { fg = group.hint }, + DiagnosticInfo = { fg = group.info }, DiagnosticInformation = { link = 'DiagnosticInfo' }, - DiagnosticWarn = { fg = c.warn }, + DiagnosticWarn = { fg = group.warn }, DiagnosticWarning = { link = 'DiagnosticWarn' }, - DiagnosticError = { fg = c.error }, - DiagnosticDefaultHint = { fg = c.hint }, - DiagnosticDefaultInfo = { fg = c.info }, - DiagnosticDefaultWarn = { fg = c.warn }, - DiagnosticDefaultError = { fg = c.error }, - DiagnosticFloatingHint = { fg = c.hint }, - DiagnosticFloatingInfo = { fg = c.info }, - DiagnosticFloatingWarn = { fg = c.warn }, - DiagnosticFloatingError = { fg = c.error }, - DiagnosticSignHint = { fg = c.hint }, - DiagnosticSignInfo = { fg = c.info }, - DiagnosticSignWarn = { fg = c.warn }, - DiagnosticSignError = { fg = c.error }, - DiagnosticUnderlineHint = { style = 'undercurl', sp = c.hint }, - DiagnosticUnderlineInfo = { style = 'undercurl', sp = c.info }, - DiagnosticUnderlineWarn = { style = 'undercurl', sp = c.warn }, - DiagnosticUnderlineError = { - style = 'undercurl', - sp = c.error, - }, - DiagnosticVirtualTextHint = { fg = c.hint }, - DiagnosticVirtualTextInfo = { fg = c.info }, - DiagnosticVirtualTextWarn = { fg = c.warn }, - DiagnosticVirtualTextError = { fg = c.error }, + DiagnosticError = { fg = group.error }, + DiagnosticDefaultHint = { fg = group.hint }, + DiagnosticDefaultInfo = { fg = group.info }, + DiagnosticDefaultWarn = { fg = group.warn }, + DiagnosticDefaultError = { fg = group.error }, + DiagnosticFloatingHint = { fg = group.hint }, + DiagnosticFloatingInfo = { fg = group.info }, + DiagnosticFloatingWarn = { fg = group.warn }, + DiagnosticFloatingError = { fg = group.error }, + DiagnosticSignHint = { fg = group.hint }, + DiagnosticSignInfo = { fg = group.info }, + DiagnosticSignWarn = { fg = group.warn }, + DiagnosticSignError = { fg = group.error }, + DiagnosticUnderlineHint = { sp = group.hint, style = 'undercurl' }, + DiagnosticUnderlineInfo = { sp = group.info, style = 'undercurl' }, + DiagnosticUnderlineWarn = { sp = group.warn, style = 'undercurl' }, + DiagnosticUnderlineError = { sp = group.error, style = 'undercurl' }, + DiagnosticVirtualTextHint = { fg = group.hint }, + DiagnosticVirtualTextInfo = { fg = group.info }, + DiagnosticVirtualTextWarn = { fg = group.warn }, + DiagnosticVirtualTextError = { fg = group.error }, - LspReferenceText = { fg = p.rose, bg = p.highlight_med }, - LspReferenceRead = { fg = p.rose, bg = p.highlight_med }, - LspReferenceWrite = { fg = p.rose, bg = p.highlight_med }, + LspReferenceText = { fg = palette.rose, bg = palette.highlight_med }, + LspReferenceRead = { fg = palette.rose, bg = palette.highlight_med }, + LspReferenceWrite = { fg = palette.rose, bg = palette.highlight_med }, -- TODO: Deprecate in favour of 0.6.0 groups LspDiagnosticsSignWarning = { link = 'DiagnosticSignWarn' }, @@ -230,284 +209,248 @@ local theme = { LspDiagnosticsSignInformation = { link = 'DiagnosticSignInfo' }, LspDiagnosticsDefaultInformation = { link = 'DiagnosticDefaultInfo' }, LspDiagnosticsFloatingInformation = { link = 'DiagnosticFloatingInfo' }, - LspDiagnosticsVirtualTextInformation = { - link = 'DiagnosticVirtualTextInfo', - }, + LspDiagnosticsVirtualTextInformation = { link = 'DiagnosticVirtualTextInfo' }, LspDiagnosticsUnderlineInformation = { link = 'DiagnosticUnderlineInfo' }, -- RedrawDebugNormal - RedrawDebugClear = { fg = '#ffffff', bg = p.gold }, - RedrawDebugComposed = { fg = '#ffffff', bg = p.pine }, - RedrawDebugRecompose = { fg = '#ffffff', bg = p.love }, + RedrawDebugClear = { fg = '#ffffff', bg = palette.gold }, + RedrawDebugComposed = { fg = '#ffffff', bg = palette.pine }, + RedrawDebugRecompose = { fg = '#ffffff', bg = palette.love }, - NvimInternalError = { fg = '#ffffff', bg = p.love }, + NvimInternalError = { fg = '#ffffff', bg = palette.love }, -- TSAnnotation = {}, -- TSAttribute = {}, - TSBoolean = { fg = p.rose }, + TSBoolean = { fg = palette.rose }, -- TSCharacter = {}, - TSComment = { - fg = c.comment, - style = maybe_italic, - }, + TSComment = { fg = group.comment, style = maybe_italic }, -- TSConditional = {}, - TSConstBuiltin = { fg = p.love }, + TSConstBuiltin = { fg = palette.love }, -- TSConstMacro = {}, - TSConstant = { fg = p.foam }, - TSConstructor = { fg = p.foam }, + TSConstant = { fg = palette.foam }, + TSConstructor = { fg = palette.foam }, -- TSEmphasis = {}, -- TSError = {}, -- TSException = {}, - TSField = { fg = p.foam }, + TSField = { fg = palette.foam }, -- TSFloat = {}, - TSFuncBuiltin = { fg = p.love }, + TSFuncBuiltin = { fg = palette.love }, -- TSFuncMacro = {}, - TSFunction = { fg = p.rose }, - TSInclude = { fg = p.pine }, - TSKeyword = { fg = p.pine }, + TSFunction = { fg = palette.rose }, + TSInclude = { fg = palette.pine }, + TSKeyword = { fg = palette.pine }, -- TSKeywordFunction = {}, - TSKeywordOperator = { fg = p.subtle }, - TSLabel = { fg = p.foam }, + TSKeywordOperator = { fg = palette.subtle }, + TSLabel = { fg = palette.foam }, -- TSLiteral = {}, -- TSMethod = {}, -- TSNamespace = {}, -- TSNone = {}, -- TSNumber = {}, - TSOperator = { fg = p.subtle }, - TSParameter = { - fg = p.iris, - style = maybe_italic, - }, + TSOperator = { fg = palette.subtle }, + TSParameter = { fg = palette.iris, style = maybe_italic }, -- TSParameterReference = {}, - TSProperty = { - fg = p.iris, - style = maybe_italic, - }, - TSPunctBracket = { fg = c.punctuation }, - TSPunctDelimiter = { fg = c.punctuation }, - TSPunctSpecial = { fg = c.punctuation }, + TSProperty = { fg = palette.iris, style = maybe_italic }, + TSPunctBracket = { fg = group.punctuation }, + TSPunctDelimiter = { fg = group.punctuation }, + TSPunctSpecial = { fg = group.punctuation }, -- TSRepeat = {}, -- TSStrike = {}, - TSString = { fg = p.gold }, - TSStringEscape = { fg = p.pine }, + TSString = { fg = palette.gold }, + TSStringEscape = { fg = palette.pine }, -- TSStringRegex = {}, TSStringSpecial = { link = 'TSString' }, -- TSSymbol = {}, - TSTag = { fg = p.foam }, - TSTagDelimiter = { fg = p.subtle }, - TSText = { fg = p.text }, - TSTitle = { fg = c.headings.h1, style = 'bold' }, + TSTag = { fg = palette.foam }, + TSTagDelimiter = { fg = palette.subtle }, + TSText = { fg = palette.text }, + TSTitle = { fg = group.headings.h1, style = 'bold' }, -- TSType = {}, -- TSTypeBuiltin = {}, - TSURI = { fg = p.gold }, + TSURI = { fg = palette.gold }, -- TSUnderline = {}, - TSVariable = { - fg = p.text, - style = maybe_italic, - }, - TSVariableBuiltin = { fg = p.love }, + TSVariable = { fg = palette.text, style = maybe_italic }, + TSVariableBuiltin = { fg = palette.love }, - -- barbar.nvim - -- https://github.com/romgrk/barbar.nvim - BufferTabpageFill = { fg = p.base, bg = p.base }, - BufferCurrent = { fg = p.text, bg = p.overlay }, - BufferCurrentIndex = { fg = p.text, bg = p.overlay }, - BufferCurrentMod = { fg = p.foam, bg = p.overlay }, - BufferCurrentSign = { fg = p.subtle, bg = p.overlay }, - BufferCurrentTarget = { fg = p.gold, bg = p.overlay }, - BufferInactive = { fg = p.subtle }, - BufferInactiveIndex = { fg = p.subtle }, - BufferInactiveMod = { fg = p.foam }, - BufferInactiveSign = { fg = p.muted }, - BufferInactiveTarget = { fg = p.gold }, - BufferVisible = { fg = p.subtle }, - BufferVisibleIndex = { fg = p.subtle }, - BufferVisibleMod = { fg = p.foam }, - BufferVisibleSign = { fg = p.muted }, - BufferVisibleTarget = { fg = p.gold }, + -- 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 }, + BufferCurrentSign = { fg = palette.subtle, bg = palette.overlay }, + BufferCurrentTarget = { fg = palette.gold, bg = palette.overlay }, + BufferInactive = { fg = palette.subtle }, + BufferInactiveIndex = { fg = palette.subtle }, + BufferInactiveMod = { fg = palette.foam }, + BufferInactiveSign = { fg = palette.muted }, + BufferInactiveTarget = { fg = palette.gold }, + BufferVisible = { fg = palette.subtle }, + BufferVisibleIndex = { fg = palette.subtle }, + BufferVisibleMod = { fg = palette.foam }, + BufferVisibleSign = { fg = palette.muted }, + BufferVisibleTarget = { fg = palette.gold }, - -- gitsigns.nvim - -- https://github.com/lewis6991/gitsigns.nvim - SignAdd = { fg = p.foam }, - SignChange = { fg = p.rose }, - SignDelete = { fg = p.love }, - GitSignsAdd = { fg = p.foam }, - GitSignsChange = { fg = p.rose }, - GitSignsDelete = { fg = p.love }, + -- 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 }, - -- modes.nvim - -- https://github.com/mvllow/modes.nvim - ModesCopy = { bg = p.gold }, - ModesDelete = { bg = p.love }, - ModesInsert = { bg = p.foam }, - ModesVisual = { bg = p.iris }, + -- mvllow/modes.nvim + ModesCopy = { bg = palette.gold }, + ModesDelete = { bg = palette.love }, + ModesInsert = { bg = palette.foam }, + ModesVisual = { bg = palette.iris }, - -- nvim-tree.lua - -- https://github.com/kyazdani42/nvim-tree.lua - NvimTreeNormal = { fg = p.text }, - NvimTreeFileDeleted = { fg = p.love }, - NvimTreeFileDirty = { fg = p.rose }, - NvimTreeFileMerge = { fg = p.iris }, - NvimTreeFileNew = { fg = p.foam }, - NvimTreeFileRenamed = { fg = p.pine }, - NvimTreeFileStaged = { fg = p.iris }, - NvimTreeEmptyFolderName = { fg = p.muted }, - NvimTreeFolderIcon = { fg = p.subtle }, - NvimTreeFolderName = { fg = p.foam }, - NvimTreeImageFile = { fg = p.text }, - NvimTreeOpenedFile = { fg = p.text, bg = p.highlight_med }, - NvimTreeOpenedFolderName = { fg = p.foam }, - NvimTreeRootFolder = { fg = p.iris }, + -- kyazdani42/nvim-tree.lua + NvimTreeNormal = { fg = palette.text }, + 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 = p.love }, - NvimTreeGitDirty = { fg = p.rose }, - NvimTreeGitIgnored = { fg = p.subtle }, - NvimTreeGitMerge = { fg = p.iris }, - NvimTreeGitNew = { fg = p.foam }, - NvimTreeGitRenamed = { fg = p.pine }, - NvimTreeGitStaged = { fg = p.iris }, - NvimTreeWindowPicker = { fg = p.base, bg = p.iris }, + NvimTreeGitDeleted = { fg = group.git_delete }, + NvimTreeGitDirty = { fg = group.git_dirty }, + NvimTreeGitIgnored = { fg = group.git_ignore }, + NvimTreeGitMerge = { fg = group.git_merge }, + NvimTreeGitNew = { fg = group.git_add }, + NvimTreeGitRenamed = { fg = group.git_rename }, + NvimTreeGitStaged = { fg = group.git_stage }, + NvimTreeWindowPicker = { fg = palette.base, bg = palette.iris }, - -- which-key.nvim - -- https://github.com/folke/which-key.nvim - WhichKey = { fg = p.iris }, - WhichKeyGroup = { fg = p.foam }, - WhichKeySeparator = { fg = p.subtle }, - WhichKeyDesc = { fg = p.gold }, - WhichKeyFloat = { bg = p.surface }, - WhichKeyValue = { fg = p.rose }, + -- folke/which-key.nvim + WhichKey = { fg = palette.iris }, + WhichKeyGroup = { fg = palette.foam }, + WhichKeySeparator = { fg = palette.subtle }, + WhichKeyDesc = { fg = palette.gold }, + WhichKeyFloat = { bg = palette.surface }, + WhichKeyValue = { fg = palette.rose }, - -- indent-blankline.nvim - -- https://github.com/lukas-reineke/indent-blankline.nvim - IndentBlanklineChar = { fg = p.subtle }, + -- luka-reineke/indent-blankline.nvim + IndentBlanklineChar = { fg = palette.muted }, - -- nvim-cmp - -- https://github.com/hrsh7th/nvim-cmp - CmpItemKind = { fg = p.iris }, - CmpItemAbbr = { fg = p.subtle }, - CmpItemAbbrMatch = { fg = p.text, style = 'bold' }, - CmpItemAbbrMatchFuzzy = { fg = p.text, style = 'bold' }, - CmpItemAbbrDeprecated = { fg = p.subtle, style = 'strikethrough' }, - CmpItemKindVariable = { fg = p.foam }, - CmpItemKindClass = { fg = p.gold }, - CmpItemKindInterface = { fg = p.gold }, - CmpItemKindFunction = { fg = p.iris }, - CmpItemKindMethod = { fg = p.iris }, - CmpItemKindSnippet = { fg = p.iris }, + -- hrsh7th/nvim-cmp + CmpItemKind = { fg = palette.iris }, + CmpItemAbbr = { fg = palette.subtle }, + CmpItemAbbrMatch = { fg = palette.text, style = 'bold' }, + CmpItemAbbrMatchFuzzy = { fg = palette.text, style = 'bold' }, + CmpItemAbbrDeprecated = { fg = palette.subtle, style = 'strikethrough' }, + CmpItemKindVariable = { fg = palette.foam }, + CmpItemKindClass = { fg = palette.gold }, + CmpItemKindInterface = { fg = palette.gold }, + CmpItemKindFunction = { fg = palette.iris }, + CmpItemKindMethod = { fg = palette.iris }, + CmpItemKindSnippet = { fg = palette.iris }, - -- neogit - -- https://github.com/TimUntersberger/neogit - NeogitDiffAddHighlight = { fg = p.foam, bg = p.highlight_med }, - NeogitDiffDeleteHighlight = { - fg = p.love, - bg = p.highlight_med, - }, - NeogitDiffContextHighlight = { bg = p.highlight_low }, - NeogitHunkHeader = { bg = p.highlight_low }, - NeogitHunkHeaderHighlight = { bg = p.highlight_low }, + -- TimUntersberger/neogit + NeogitDiffAddHighlight = { fg = palette.foam, bg = palette.highlight_med }, + NeogitDiffDeleteHighlight = { fg = palette.love, bg = palette.highlight_med }, + NeogitDiffContextHighlight = { bg = palette.highlight_low }, + NeogitHunkHeader = { bg = palette.highlight_low }, + NeogitHunkHeaderHighlight = { bg = palette.highlight_low }, - -- VimWiki - -- https://github.com/vimwiki/vimwiki - VimwikiHR = { fg = p.subtle }, - VimwikiHeader1 = { fg = c.headings.h1, style = 'bold' }, - VimwikiHeader2 = { fg = c.headings.h2, style = 'bold' }, - VimwikiHeader3 = { fg = c.headings.h3, style = 'bold' }, - VimwikiHeader4 = { fg = c.headings.h4, style = 'bold' }, - VimwikiHeader5 = { fg = c.headings.h5, style = 'bold' }, - VimwikiHeader6 = { fg = c.headings.h6, style = 'bold' }, - VimwikiHeaderChar = { fg = p.pine }, - VimwikiLink = { fg = p.rose, style = 'underline' }, - VimwikiList = { fg = p.iris }, - VimwikiNoExistsLink = { fg = p.love }, + -- vimwiki/vimwiki + VimwikiHR = { fg = palette.subtle }, + VimwikiHeader1 = { fg = group.headings.h1, style = 'bold' }, + VimwikiHeader2 = { fg = group.headings.h2, style = 'bold' }, + VimwikiHeader3 = { fg = group.headings.h3, style = 'bold' }, + VimwikiHeader4 = { fg = group.headings.h4, style = 'bold' }, + VimwikiHeader5 = { fg = group.headings.h5, style = 'bold' }, + VimwikiHeader6 = { fg = group.headings.h6, style = 'bold' }, + VimwikiHeaderChar = { fg = palette.pine }, + VimwikiLink = { fg = group.link, style = 'underline' }, + VimwikiList = { fg = palette.iris }, + VimwikiNoExistsLink = { fg = palette.love }, - -- Neorg - -- https://github.com/nvim-neorg/neorg - NeorgHeading1Prefix = { fg = c.headings.h1, style = 'bold' }, - NeorgHeading2Prefix = { fg = c.headings.h2, style = 'bold' }, - NeorgHeading3Prefix = { fg = c.headings.h3, style = 'bold' }, - NeorgHeading4Prefix = { fg = c.headings.h4, style = 'bold' }, - NeorgHeading5Prefix = { fg = c.headings.h5, style = 'bold' }, - NeorgHeading6Prefix = { fg = c.headings.h6, style = 'bold' }, + -- nvim-neorg/neorg + NeorgHeading1Prefix = { fg = group.headings.h1, style = 'bold' }, + NeorgHeading1Title = { fg = group.headings.h1, style = 'bold' }, + NeorgHeading2Prefix = { fg = group.headings.h2, style = 'bold' }, + NeorgHeading2Title = { fg = group.headings.h2, style = 'bold' }, + NeorgHeading3Prefix = { fg = group.headings.h3, style = 'bold' }, + NeorgHeading3Title = { fg = group.headings.h3, style = 'bold' }, + NeorgHeading4Prefix = { fg = group.headings.h4, style = 'bold' }, + NeorgHeading4Title = { fg = group.headings.h4, style = 'bold' }, + NeorgHeading5Prefix = { fg = group.headings.h5, style = 'bold' }, + NeorgHeading5Title = { fg = group.headings.h5, style = 'bold' }, + NeorgHeading6Prefix = { fg = group.headings.h6, style = 'bold' }, + NeorgHeading6Title = { fg = group.headings.h6, style = 'bold' }, + NeorgMarkerTitle = { fg = palette.text, style = 'bold' }, - NeorgHeading1Title = { fg = c.headings.h1, style = 'bold' }, - NeorgHeading2Title = { fg = c.headings.h2, style = 'bold' }, - NeorgHeading3Title = { fg = c.headings.h3, style = 'bold' }, - NeorgHeading4Title = { fg = c.headings.h4, style = 'bold' }, - NeorgHeading5Title = { fg = c.headings.h5, style = 'bold' }, - NeorgHeading6Title = { fg = c.headings.h6, style = 'bold' }, - - NeorgMarkerTitle = { fg = p.text, style = 'bold' }, - -- LspSaga - -- https://github.com/tami5/lspsaga.nvim (fork of https://github.com/glepnir/lspsaga.nvim) - LspSagaCodeActionTitle = { - fg = p.gold, - style = 'bold', - }, - LspSagaCodeActionBorder = { fg = c.border }, + -- tami5/lspsaga.nvim (fork of glepnir/lspsaga.nvim) + DefinitionCount = { fg = palette.rose }, + DefinitionIcon = { fg = palette.rose }, + DefintionPreviewTitle = { fg = palette.rose, style = 'bold' }, + LspFloatWinBorder = { fg = group.border }, + LspFloatWinNormal = { bg = palette.base }, + LspSagaAutoPreview = { fg = palette.subtle }, + LspSagaCodeActionBorder = { fg = group.border }, + LspSagaCodeActionContent = { fg = palette.foam }, + LspSagaCodeActionTitle = { fg = palette.gold, style = 'bold' }, LspSagaCodeActionTruncateLine = { link = 'LspSagaCodeActionBorder' }, - LspSagaCodeActionContent = { fg = p.foam }, - LspSagaDiagnosticBorder = { fg = c.border }, - LspSagaDiagnosticHeader = { fg = p.gold, style = 'bold' }, + LspSagaDefPreviewBorder = { fg = group.border }, + LspSagaDiagnosticBorder = { fg = group.border }, + LspSagaDiagnosticHeader = { fg = palette.gold, style = 'bold' }, LspSagaDiagnosticTruncateLine = { link = 'LspSagaDiagnosticBorder' }, - LspSagaFinderSelection = { fg = p.gold }, - LspSagaLspFinderBorder = { fg = c.border }, - LspSagaAutoPreview = { fg = p.subtle }, - LspSagaDefPreviewBorder = { fg = c.border }, - DefinitionIcon = { fg = p.rose }, - DefinitionCount = { fg = p.rose }, - ReferencesCount = { fg = p.rose }, - ReferencesIcon = { fg = p.rose }, - DefintionPreviewTitle = { fg = p.rose, style = 'bold' }, - LspSagaRenamePromptPrefix = { fg = p.love }, - LspSagaRenameBorder = { fg = p.pine }, - LspFloatWinNormal = { bg = p.base }, - LspFloatWinBorder = { fg = c.border }, LspSagaDocTruncateLine = { link = 'LspSagaHoverBorder' }, - LspSagaHoverBorder = { fg = c.border }, - LspSagaSignatureHelpBorder = { fg = p.pine }, + LspSagaFinderSelection = { fg = palette.gold }, + LspSagaHoverBorder = { fg = group.border }, + LspSagaLspFinderBorder = { fg = group.border }, + LspSagaRenameBorder = { fg = palette.pine }, + LspSagaRenamePromptPrefix = { fg = palette.love }, LspSagaShTruncateLine = { link = 'LspSagaSignatureHelpBorder' }, - TargetWord = { fg = p.iris }, + LspSagaSignatureHelpBorder = { fg = palette.pine }, + ReferencesCount = { fg = palette.rose }, + ReferencesIcon = { fg = palette.rose }, + SagaShadow = { bg = palette.overlay }, + TargetWord = { fg = palette.iris }, - SagaShadow = { bg = p.overlay }, + -- ray-x/lsp_signature.nvim + LspSignatureActiveParameter = { bg = palette.overlay }, - -- Lsp_Signature - -- https://github.com/ray-x/lsp_signature.nvim - LspSignatureActiveParameter = { bg = p.overlay }, - - -- pounce - -- https://github.com/rlane/pounce.nvim - PounceMatch = { link = 'Search' }, + -- rlane/pounce.nvim + PounceAccept = { fg = palette.love, bg = palette.highlight_high }, + PounceAcceptBest = { fg = palette.base, bg = palette.gold }, PounceGap = { link = 'Search' }, - PounceAccept = { fg = p.love, bg = p.highlight_high }, - PounceAcceptBest = { fg = p.base, bg = p.gold }, + PounceMatch = { link = 'Search' }, - -- telescope.nvim - -- https://github.com/nvim-telescope/telescope.nvim - TelescopeNormal = { fg = p.subtle }, - TelescopePromptNormal = { fg = p.text }, - TelescopeBorder = { fg = c.border }, - TelescopeMatching = { fg = p.rose }, - TelescopePromptPrefix = { fg = p.subtle }, - TelescopeSelection = { fg = p.text, bg = p.highlight_low }, - TelescopeSelectionCaret = { fg = p.rose, bg = p.highlight_low }, - TelescopeTitle = { fg = p.subtle }, + -- nvim-telescope/telescope.nvim + TelescopeBorder = { fg = group.border }, + TelescopeMatching = { fg = palette.rose }, + 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 }, + TelescopeTitle = { fg = palette.subtle }, } -vim.g.terminal_color_0 = p.overlay -- black -vim.g.terminal_color_8 = p.subtle -- bright black -vim.g.terminal_color_1 = p.love -- red -vim.g.terminal_color_9 = p.love -- bright red -vim.g.terminal_color_2 = p.pine -- green -vim.g.terminal_color_10 = p.pine -- bright green -vim.g.terminal_color_3 = p.gold -- yellow -vim.g.terminal_color_11 = p.gold -- bright yellow -vim.g.terminal_color_4 = p.foam -- blue -vim.g.terminal_color_12 = p.foam -- bright blue -vim.g.terminal_color_5 = p.iris -- magenta -vim.g.terminal_color_13 = p.iris -- bright magenta -vim.g.terminal_color_6 = p.rose -- cyan -vim.g.terminal_color_14 = p.rose -- bright cyan -vim.g.terminal_color_7 = p.text -- white -vim.g.terminal_color_15 = p.text -- bright white +vim.g.terminal_color_0 = palette.overlay -- black +vim.g.terminal_color_8 = palette.subtle -- bright black +vim.g.terminal_color_1 = palette.love -- red +vim.g.terminal_color_9 = palette.love -- bright red +vim.g.terminal_color_2 = palette.pine -- green +vim.g.terminal_color_10 = palette.pine -- bright green +vim.g.terminal_color_3 = palette.gold -- yellow +vim.g.terminal_color_11 = palette.gold -- bright yellow +vim.g.terminal_color_4 = palette.foam -- blue +vim.g.terminal_color_12 = palette.foam -- bright blue +vim.g.terminal_color_5 = palette.iris -- magenta +vim.g.terminal_color_13 = palette.iris -- bright magenta +vim.g.terminal_color_6 = palette.rose -- cyan +vim.g.terminal_color_14 = palette.rose -- bright cyan +vim.g.terminal_color_7 = palette.text -- white +vim.g.terminal_color_15 = palette.text -- bright white return theme diff --git a/readme.md b/readme.md index 2a02672..064f277 100644 --- a/readme.md +++ b/readme.md @@ -17,7 +17,7 @@ use({ 'rose-pine/neovim', as = 'rose-pine', - tag = 'v0.1.0', -- Optional tag release + -- tag = '...', config = function() vim.cmd('colorscheme rose-pine') end @@ -43,7 +43,6 @@ use({ - [Telescope](https://github.com/nvim-telescope/telescope.nvim) - [Lualine](https://github.com/hoob3rt/lualine.nvim) - ```lua require('lualine').setup({ options = { theme = 'rose-pine' } @@ -75,35 +74,46 @@ local colors = require("galaxyline.themes.colors")["rose-pine"] > Options should be set **before** colorscheme ```lua --- Set theme variant --- Matches terminal theme if unset +-- set theme variant, matching terminal theme if unset -- @usage 'main' | 'moon' | 'dawn' vim.g.rose_pine_variant = '' vim.g.rose_pine_bold_vertical_split_line = false -vim.g.rose_pine_inactive_background = false vim.g.rose_pine_disable_background = false vim.g.rose_pine_disable_float_background = false vim.g.rose_pine_disable_italics = false +vim.g.rose_pine_inactive_background = false -local p = require('rose-pine.palette') +local palette = require('rose-pine.palette') vim.g.rose_pine_colors = { - punctuation = p.subtle, - comment = p.subtle, - border = p.highlight_med, - hint = p.iris, - info = p.foam, - warn = p.gold, - error = p.love, + border = palette.highlight_med, + comment = palette.muted, + link = palette.iris, + punctuation = palette.subtle, - -- Or set all headings to one colour: `headings = p.text` + error = palette.love, + hint = palette.iris, + info = palette.foam, + warn = palette.gold, + + git_add = palette.foam, + git_change = palette.rose, + git_delete = palette.love, + git_dirty = palette.rose, + git_ignore = palette.muted, + git_merge = palette.iris, + git_rename = palette.pine, + git_stage = palette.iris, + git_text = palette.rose, + + -- or set all headings to one colour: `headings = palette.text` headings = { - h1 = p.iris, - h2 = p.foam, - h3 = p.rose, - h4 = p.gold, - h5 = p.pine, - h6 = p.foam, + h1 = palette.iris, + h2 = palette.foam, + h3 = palette.rose, + h4 = palette.gold, + h5 = palette.pine, + h6 = palette.foam, }, } @@ -111,31 +121,19 @@ vim.g.rose_pine_colors = { vim.cmd('colorscheme rose-pine') ``` -## Functions +## Suggested keymaps ```lua --- Toggle between all variants -require('rose-pine').toggle() +-- toggle between all variants +vim.keymap.set('n', 'tt', require('rose-pine').toggle) --- Toggle between some variants -require('rose-pine').toggle({'main', 'dawn'}) +-- or toggle between some variants +vim.keymap.set('n', 'tt', function() return require('rose-pine').toggle({'moon', 'dawn'}) end) --- Set specific variant -require('rose-pine').set('moon') -``` - -## Keymaps - -> These are only suggestions; no keymaps are set by the theme - -```lua --- Toggle variants -vim.api.nvim_set_keymap('n', '', [[lua require('rose-pine').toggle()]], { noremap = true, silent = true }) - --- Set variant -vim.api.nvim_set_keymap('n', '', [[lua require('rose-pine').set('main')]], { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', '', [[lua require('rose-pine').set('moon')]], { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', '', [[lua require('rose-pine').set('dawn')]], { noremap = true, silent = true }) +-- set variant +vim.keymap.set('n', 't1', function() return require('rose-pine').set('main') end) +vim.keymap.set('n', 't2', function() return require('rose-pine').set('moon') end) +vim.keymap.set('n', 't3', function() return require('rose-pine').set('dawn') end) ``` ## Contributing From 1a3d0c279ea004605d99133c7b720f007e203371 Mon Sep 17 00:00:00 2001 From: mvllow Date: Thu, 3 Feb 2022 19:35:16 -0600 Subject: [PATCH 015/211] update config logic --- lua/rose-pine/theme.lua | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua index ab8e68c..6eb9344 100644 --- a/lua/rose-pine/theme.lua +++ b/lua/rose-pine/theme.lua @@ -9,12 +9,25 @@ if config.disable_italics == true then maybe_italic = nil end -local background = config.disable_background and palette.base or palette.none -local float_background = config.disable_float_background and palette.surface or palette.none -local inactive_background = config.inactive_background - and util.blend('#000000', palette.base, palette.opacity) - or palette.none -local vert_split_background = config.bold_vertical_split_line and palette.overlay or palette.none +local background = palette.base +if config.disable_background then + background = palette.none +end + +local float_background = palette.surface +if config.disable_float_background then + float_background = palette.none +end + +local inactive_background = palette.none +if config.inactive_background then + inactive_background = util.blend('#000000', palette.base, palette.opacity) +end + +local vert_split_background = palette.none +if config.bold_vertical_split_line then + vert_split_background = palette.overlay +end local theme = { ColorColumn = { bg = palette.highlight_high }, From f520ece741fccc9dcd903f9e23025b769ddd8d74 Mon Sep 17 00:00:00 2001 From: fvrests Date: Sat, 5 Feb 2022 14:38:15 -0600 Subject: [PATCH 016/211] add inverse theme --- lua/lualine/themes/rose-pine-inverse.lua | 26 ++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 lua/lualine/themes/rose-pine-inverse.lua diff --git a/lua/lualine/themes/rose-pine-inverse.lua b/lua/lualine/themes/rose-pine-inverse.lua new file mode 100644 index 0000000..1e1ee36 --- /dev/null +++ b/lua/lualine/themes/rose-pine-inverse.lua @@ -0,0 +1,26 @@ +local p = require('rose-pine.palette') + +return { + normal = { + a = { bg = p.surface, fg = p.rose, gui = 'bold' }, + b = { bg = p.surface, fg = p.text }, + c = { bg = p.surface, fg = p.subtle, gui = 'italic' }, + }, + insert = { + a = { bg = p.surface, fg = p.foam, gui = 'bold' }, + }, + visual = { + a = { bg = p.surface, fg = p.iris, gui = 'bold' }, + }, + replace = { + a = { bg = p.surface, fg = p.pine, gui = 'bold' }, + }, + command = { + a = { bg = p.surface, fg = p.love, gui = 'bold' }, + }, + inactive = { + a = { bg = p.base, fg = p.subtle, gui = 'bold' }, + b = { bg = p.base, fg = p.subtle }, + c = { bg = p.base, fg = p.subtle, gui = 'italic' }, + }, +} From 5d1388889e120de99e28f3dcf98d82cefb9fabaa Mon Sep 17 00:00:00 2001 From: fvrests Date: Sat, 5 Feb 2022 17:46:43 -0600 Subject: [PATCH 017/211] update dawn overlay --- lua/rose-pine/palette.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua index 0b24973..1b27e8b 100644 --- a/lua/rose-pine/palette.lua +++ b/lua/rose-pine/palette.lua @@ -38,7 +38,7 @@ local variants = { dawn = { base = '#faf4ed', surface = '#fffaf3', - overlay = '#f2e9de', + overlay = '#f2e9e1', muted = '#9893a5', subtle = '#797593', text = '#575279', From 3835d280107478e7c2a7b132de6fa72579e4a577 Mon Sep 17 00:00:00 2001 From: mvllow Date: Sun, 6 Feb 2022 16:49:13 -0600 Subject: [PATCH 018/211] rename alternative lualine theme --- lua/lualine/themes/{rose-pine-inverse.lua => rose-pine-alt.lua} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename lua/lualine/themes/{rose-pine-inverse.lua => rose-pine-alt.lua} (100%) diff --git a/lua/lualine/themes/rose-pine-inverse.lua b/lua/lualine/themes/rose-pine-alt.lua similarity index 100% rename from lua/lualine/themes/rose-pine-inverse.lua rename to lua/lualine/themes/rose-pine-alt.lua From da1c6111a34eea6c3d48bd7b74e58788fc71e1d7 Mon Sep 17 00:00:00 2001 From: mvllow Date: Sun, 6 Feb 2022 16:49:36 -0600 Subject: [PATCH 019/211] docs: add alt lualine theme --- readme.md | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/readme.md b/readme.md index 064f277..bd14ad4 100644 --- a/readme.md +++ b/readme.md @@ -28,28 +28,38 @@ use({ > PR's are more than welcome if your favourite plugin is missing -- [Treesitter](https://github.com/nvim-treesitter/nvim-treesitter) -- [Diagnostics](https://neovim.io/doc/user/lsp.html) -- [Barbar](https://github.com/romgrk/barbar.nvim) -- [Gitsigns](https://github.com/lewis6991/gitsigns.nvim) -- [Modes](https://github.com/mvllow/modes.nvim) -- [NvimTree](https://github.com/kyazdani42/nvim-tree.lua) -- [WhichKey](https://github.com/folke/which-key.nvim) -- [Indent-Blankline.nvim](https://github.com/lukas-reineke/indent-blankline.nvim) -- [Neogit](https://github.com/TimUntersberger/neogit) -- [Neorg](https://github.com/nvim-neorg/neorg) -- [Lspsaga](https://github.com/tami5/lspsaga.nvim) -- [Pounce](https://github.com/rlane/pounce.nvim) -- [Telescope](https://github.com/nvim-telescope/telescope.nvim) -- [Lualine](https://github.com/hoob3rt/lualine.nvim) +- [neovim diagnostics](https://neovim.io/doc/user/lsp.html) +- [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) +- [barbar.nvim](https://github.com/romgrk/barbar.nvim) +- [gitsigns.nvim](https://github.com/lewis6991/gitsigns.nvim) +- [mode.nvim](https://github.com/mvllow/modes.nvim) +- [nvim-tree.lua](https://github.com/kyazdani42/nvim-tree.lua) +- [which-key.nvim](https://github.com/folke/which-key.nvim) +- [indent-blankline.nvim](https://github.com/lukas-reineke/indent-blankline.nvim) +- [neogit](https://github.com/TimUntersberger/neogit) +- [neorg](https://github.com/nvim-neorg/neorg) +- [lspsaga.nvim](https://github.com/tami5/lspsaga.nvim) +- [pounce.nvim](https://github.com/rlane/pounce.nvim) +- [telescope.nvim](https://github.com/nvim-telescope/telescope.nvim) +- [lualine.nvim](https://github.com/nvim-lualine/lualine.nvim) ```lua -require('lualine').setup({ - options = { theme = 'rose-pine' } +use({ + 'nvim-lualine/lualine.nvim', + -- Fix mismatch palette between variants + event = 'ColorScheme', + config = function() + require('lualine').setup({ + options = { + ---@usage 'rose-pine' | 'rose-pine-alt' + theme = 'rose-pine' + } + }) + end }) ``` -- [Galaxyline fork](https://github.com/NTBBloodbath/galaxyline.nvim) +- [galaxyline.nvim fork](https://github.com/NTBBloodbath/galaxyline.nvim) ```lua local colors = require("galaxyline.themes.colors")["rose-pine"] From 8b704ffdf4670e3743dceb393ae5e581ed12aeba Mon Sep 17 00:00:00 2001 From: mvllow Date: Mon, 7 Feb 2022 11:44:56 -0600 Subject: [PATCH 020/211] 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 }, } From a42c0e69dfdd9749b23e402e5872637010a91ec9 Mon Sep 17 00:00:00 2001 From: mvllow Date: Mon, 7 Feb 2022 11:48:04 -0600 Subject: [PATCH 021/211] update active match highlight --- lua/rose-pine/theme.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua index 484ce60..0c9e423 100644 --- a/lua/rose-pine/theme.lua +++ b/lua/rose-pine/theme.lua @@ -52,7 +52,7 @@ local theme = { FloatBorder = { fg = group.border }, FoldColumn = { fg = palette.muted }, Folded = { fg = palette.text, bg = palette.surface }, - IncSearch = { bg = palette.highlight_high }, + IncSearch = { fg = palette.base, bg = palette.rose }, LineNr = { fg = palette.muted }, MatchParen = { fg = palette.text, bg = palette.highlight_med }, ModeMsg = { fg = palette.subtle }, From 73c5046bf3dab3353490fbb9796342a75157f72e Mon Sep 17 00:00:00 2001 From: mvllow Date: Mon, 7 Feb 2022 12:12:17 -0600 Subject: [PATCH 022/211] docs: update tag --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index bd14ad4..c9f8619 100644 --- a/readme.md +++ b/readme.md @@ -17,7 +17,7 @@ use({ 'rose-pine/neovim', as = 'rose-pine', - -- tag = '...', + tag = '0.5.0', config = function() vim.cmd('colorscheme rose-pine') end From acee7a0b0936b93c72d861239ab66f6f3604a44b Mon Sep 17 00:00:00 2001 From: mvllow Date: Tue, 8 Feb 2022 08:58:53 -0600 Subject: [PATCH 023/211] reduce contrast of cursorline and cursorcolumn closes #65 --- lua/rose-pine/theme.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua index 0c9e423..36d393a 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 = palette.overlay }, + CursorColumn = { bg = palette.highlight_low }, -- CursorIM = {}, - CursorLine = { bg = palette.overlay }, + CursorLine = { bg = palette.highlight_low }, CursorLineNr = { fg = palette.text }, DarkenedPanel = { bg = palette.surface }, DarkenedStatusline = { bg = palette.surface }, From 0e23ee652d7b5430e06c288faae3cc16d3b36d06 Mon Sep 17 00:00:00 2001 From: Daniel Mathiot Date: Tue, 8 Feb 2022 19:47:47 +0100 Subject: [PATCH 024/211] feat: Add nvim-notify highlights (#66) --- lua/rose-pine/theme.lua | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua index 36d393a..4a2aafa 100644 --- a/lua/rose-pine/theme.lua +++ b/lua/rose-pine/theme.lua @@ -438,6 +438,23 @@ local theme = { TelescopeSelection = { fg = palette.text, bg = palette.overlay }, TelescopeSelectionCaret = { fg = palette.rose, bg = palette.overlay }, TelescopeTitle = { fg = palette.subtle }, + + -- rcarriga/nvim-notify + NotifyINFOBorder = { fg = palette.foam }, + NotifyINFOTitle = { link = 'NotifyINFOBorder' }, + NotifyINFOIcon = { link = 'NotifyINFOBorder' }, + NotifyWARNBorder = { fg = palette.gold }, + NotifyWARNTitle = { link = 'NotifyWARNBorder' }, + NotifyWARNIcon = { link = 'NotifyWARNBorder' }, + NotifyDEBUGBorder = { fg = palette.muted }, + NotifyDEBUGTitle = { link = 'NotifyDEBUGBorder' }, + NotifyDEBUGIcon = { link = 'NotifyDEBUGBorder' }, + NotifyTRACEBorder = { fg = palette.iris }, + NotifyTRACETitle = { link = 'NotifyTRACEBorder' }, + NotifyTRACEIcon = { link = 'NotifyTRACEBorder' }, + NotifyERRORBorder = { fg = palette.love }, + NotifyERRORTitle = { link = 'NotifyERRORBorder' }, + NotifyERRORIcon = { link = 'NotifyERRORBorder' }, } vim.g.terminal_color_0 = palette.overlay -- black From 6cbc72a75dd8a50382ac63fe8fb0734772d92cee Mon Sep 17 00:00:00 2001 From: not Date: Thu, 10 Feb 2022 10:31:12 -0600 Subject: [PATCH 025/211] Update readme.md --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index c9f8619..9de2413 100644 --- a/readme.md +++ b/readme.md @@ -41,6 +41,7 @@ use({ - [lspsaga.nvim](https://github.com/tami5/lspsaga.nvim) - [pounce.nvim](https://github.com/rlane/pounce.nvim) - [telescope.nvim](https://github.com/nvim-telescope/telescope.nvim) +- [nvim-notify](https://github.com/rcarriga/nvim-notify) - [lualine.nvim](https://github.com/nvim-lualine/lualine.nvim) ```lua From c207a62f52f7af096aa3fe00a751ed5869ed6a62 Mon Sep 17 00:00:00 2001 From: not Date: Thu, 10 Feb 2022 16:04:33 -0600 Subject: [PATCH 026/211] Update readme.md --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 9de2413..db9452a 100644 --- a/readme.md +++ b/readme.md @@ -17,7 +17,7 @@ use({ 'rose-pine/neovim', as = 'rose-pine', - tag = '0.5.0', + tag = 'v0.*', config = function() vim.cmd('colorscheme rose-pine') end From 317a7c8473c16ced00a876c3742635975a71a1c9 Mon Sep 17 00:00:00 2001 From: not Date: Sun, 13 Feb 2022 16:06:19 -0600 Subject: [PATCH 027/211] breaking: move to lua config (#64) Co-authored-by: fvrests --- colors/rose-pine.vim | 3 - lua/rose-pine/bufferline/init.lua | 23 - lua/rose-pine/config.lua | 74 --- lua/rose-pine/galaxyline/theme.lua | 22 +- lua/rose-pine/init.lua | 204 +++++-- lua/rose-pine/palette.lua | 8 +- lua/rose-pine/theme.lua | 896 ++++++++++++++--------------- readme.md | 91 ++- 8 files changed, 643 insertions(+), 678 deletions(-) delete mode 100644 lua/rose-pine/bufferline/init.lua delete mode 100644 lua/rose-pine/config.lua diff --git a/colors/rose-pine.vim b/colors/rose-pine.vim index af1ddba..0df6221 100644 --- a/colors/rose-pine.vim +++ b/colors/rose-pine.vim @@ -1,6 +1,3 @@ -lua package.loaded['rose-pine'] = nil -lua package.loaded['rose-pine.config'] = nil lua package.loaded['rose-pine.palette'] = nil -lua package.loaded['rose-pine.theme'] = nil lua require('rose-pine').colorscheme() diff --git a/lua/rose-pine/bufferline/init.lua b/lua/rose-pine/bufferline/init.lua deleted file mode 100644 index 3ae77b4..0000000 --- a/lua/rose-pine/bufferline/init.lua +++ /dev/null @@ -1,23 +0,0 @@ -local p = require('rose-pine.palette') - --- TODO: Someone who uses bufferline.nvim is free to PR with this addition --- `:h bufferline-highlights` --- --- The intended use would be (or any better solution): --- --- ``` --- local highlights = require('rose-pine.bufferline') --- require('bufferline').setup({ --- highlights = highlights --- }) --- ``` -return { - fill = { - guifg = p.text, - guibg = p.base, - }, - background = { - guifg = p.text, - guibg = p.base, - }, -} diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua deleted file mode 100644 index 6b3ac12..0000000 --- a/lua/rose-pine/config.lua +++ /dev/null @@ -1,74 +0,0 @@ -local palette = require('rose-pine.palette') - -local function opt(key, default) - key = 'rose_pine_' .. key - - if vim.g[key] == nil then - return default - end - - if vim.g[key] == 0 or vim.g[key] == false then - return false - end - - return vim.g[key] -end - -local config = { - variant = opt('variant', 'main'), - - bold_vertical_split_line = opt('bold_vertical_split_line', false), - disable_italics = opt('disable_italics', false), - disable_background = opt('disable_background', false), - disable_float_background = opt('disable_float_background', false), - inactive_background = opt('inactive_background', false), - - colors = { - border = palette.highlight_med, - comment = palette.muted, - link = palette.iris, - punctuation = palette.subtle, - - error = palette.love, - hint = palette.iris, - info = palette.foam, - warn = palette.gold, - - git_add = palette.foam, - git_change = palette.rose, - git_delete = palette.love, - git_dirty = palette.rose, - git_ignore = palette.muted, - git_merge = palette.iris, - git_rename = palette.pine, - git_stage = palette.iris, - git_text = palette.rose, - - ---@type string|table - headings = { - h1 = palette.iris, - h2 = palette.foam, - h3 = palette.rose, - h4 = palette.gold, - h5 = palette.pine, - h6 = palette.foam, - }, - }, -} - -local colors = vim.g.rose_pine_colors or {} - -if type(colors.headings) == 'string' then - colors.headings = { - h1 = colors.headings, - h2 = colors.headings, - h3 = colors.headings, - h4 = colors.headings, - h5 = colors.headings, - h6 = colors.headings, - } -end - -config.colors = vim.tbl_deep_extend('force', config.colors, colors) - -return config diff --git a/lua/rose-pine/galaxyline/theme.lua b/lua/rose-pine/galaxyline/theme.lua index 5142949..1183aa9 100644 --- a/lua/rose-pine/galaxyline/theme.lua +++ b/lua/rose-pine/galaxyline/theme.lua @@ -3,17 +3,17 @@ if not present then return end -local palette = require('rose-pine.palette') +local p = require('rose-pine.palette') galaxyline_colors['rose-pine'] = { - bg = palette.overlay, - fg = palette.text, - fg_alt = palette.subtle, - blue = palette.foam, - cyan = palette.foam, - green = palette.muted, - magenta = palette.iris, - orange = palette.rose, - red = palette.love, - yellow = palette.gold, + bg = p.overlay, + fg = p.text, + fg_alt = p.subtle, + blue = p.foam, + cyan = p.foam, + green = p.muted, + magenta = p.iris, + orange = p.rose, + red = p.love, + yellow = p.gold, } diff --git a/lua/rose-pine/init.lua b/lua/rose-pine/init.lua index f872457..4e10311 100644 --- a/lua/rose-pine/init.lua +++ b/lua/rose-pine/init.lua @@ -1,4 +1,156 @@ local M = {} +local show_init_messages = true + +local function check_for_deprecated_opts() + local alerts = {} + local should_alert = false + + -- Deprecated options + if vim.g.rose_pine_bold_vertical_split_line ~= nil then + should_alert = true + table.insert(alerts, 'vim.g.rose_pine_bold_vertical_split_line renamed to bold_vert_split') + end + + if vim.g.rose_pine_inactive_background ~= nil then + should_alert = true + table.insert(alerts, 'vim.g.rose_pine_inactive_background renamed to dim_nc_background') + end + + if vim.g.rose_pine_disable_background ~= nil then + should_alert = true + table.insert(alerts, 'vim.g.rose_pine_disable_background renamed to disable_background') + end + + if vim.g.rose_pine_disable_float_background ~= nil then + should_alert = true + table.insert( + alerts, + 'vim.g.rose_pine_disable_float_background renamed to disable_float_background' + ) + end + + if vim.g.rose_pine_disable_italics ~= nil then + should_alert = true + table.insert(alerts, 'vim.g.rose_pine_disable_italics renamed to disable_italics') + end + + if vim.g.rose_pine_colors ~= nil then + should_alert = true + table.insert(alerts, 'vim.g.rose_pine_colors renamed to groups') + end + + if should_alert then + local prefix = ' ' + print('Rosé Pine – https://github.com/rose-pine/neovim') + print(prefix .. 'vim.g.rose_pine_