Merge branch 'rose-pine:main' into main

This commit is contained in:
benjamin 2025-01-19 00:02:28 +00:00 committed by GitHub
commit 69ff130cb2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 39 additions and 13 deletions

View file

@ -1,4 +1,10 @@
local p = require("rose-pine.palette") local p = require("rose-pine.palette")
local config = require("rose-pine.config")
local bg_base = p.base
if config.options.styles.transparency then
bg_base = "NONE"
end
return { return {
normal = { normal = {
@ -19,8 +25,8 @@ return {
a = { bg = p.surface, fg = p.love, gui = "bold" }, a = { bg = p.surface, fg = p.love, gui = "bold" },
}, },
inactive = { inactive = {
a = { bg = p.base, fg = p.subtle, gui = "bold" }, a = { bg = bg_base, fg = p.subtle, gui = "bold" },
b = { bg = p.base, fg = p.subtle }, b = { bg = bg_base, fg = p.subtle },
c = { bg = p.base, fg = p.subtle, gui = "italic" }, c = { bg = bg_base, fg = p.subtle, gui = "italic" },
}, },
} }

View file

@ -1,34 +1,40 @@
local p = require("rose-pine.palette") local p = require("rose-pine.palette")
local config = require("rose-pine.config")
local bg_base = p.base
if config.options.styles.transparency then
bg_base = "NONE"
end
return { return {
normal = { normal = {
a = { bg = p.rose, fg = p.base, gui = "bold" }, a = { bg = p.rose, fg = p.base, gui = "bold" },
b = { bg = p.overlay, fg = p.rose }, b = { bg = p.overlay, fg = p.rose },
c = { bg = p.base, fg = p.text }, c = { bg = bg_base, fg = p.text },
}, },
insert = { insert = {
a = { bg = p.foam, fg = p.base, gui = "bold" }, a = { bg = p.foam, fg = p.base, gui = "bold" },
b = { bg = p.overlay, fg = p.foam }, b = { bg = p.overlay, fg = p.foam },
c = { bg = p.base, fg = p.text }, c = { bg = bg_base, fg = p.text },
}, },
visual = { visual = {
a = { bg = p.iris, fg = p.base, gui = "bold" }, a = { bg = p.iris, fg = p.base, gui = "bold" },
b = { bg = p.overlay, fg = p.iris }, b = { bg = p.overlay, fg = p.iris },
c = { bg = p.base, fg = p.text }, c = { bg = bg_base, fg = p.text },
}, },
replace = { replace = {
a = { bg = p.pine, fg = p.base, gui = "bold" }, a = { bg = p.pine, fg = p.base, gui = "bold" },
b = { bg = p.overlay, fg = p.pine }, b = { bg = p.overlay, fg = p.pine },
c = { bg = p.base, fg = p.text }, c = { bg = bg_base, fg = p.text },
}, },
command = { command = {
a = { bg = p.love, fg = p.base, gui = "bold" }, a = { bg = p.love, fg = p.base, gui = "bold" },
b = { bg = p.overlay, fg = p.love }, b = { bg = p.overlay, fg = p.love },
c = { bg = p.base, fg = p.text }, c = { bg = bg_base, fg = p.text },
}, },
inactive = { inactive = {
a = { bg = p.base, fg = p.muted, gui = "bold" }, a = { bg = bg_base, fg = p.muted, gui = "bold" },
b = { bg = p.base, fg = p.muted }, b = { bg = bg_base, fg = p.muted },
c = { bg = p.base, fg = p.muted }, c = { bg = bg_base, fg = p.muted },
}, },
} }

View file

@ -143,7 +143,7 @@ local function set_highlights()
TabLineSel = { fg = palette.text, bg = palette.overlay, bold = styles.bold }, TabLineSel = { fg = palette.text, bg = palette.overlay, bold = styles.bold },
Title = { fg = palette.foam, bold = styles.bold }, Title = { fg = palette.foam, bold = styles.bold },
VertSplit = { fg = groups.border }, VertSplit = { fg = groups.border },
Visual = { bg = palette.highlight_med }, Visual = { bg = palette.iris, blend = 15 },
-- VisualNOS = {}, -- VisualNOS = {},
WarningMsg = { fg = groups.warn, bold = styles.bold }, WarningMsg = { fg = groups.warn, bold = styles.bold },
-- Whitespace = {}, -- Whitespace = {},
@ -692,22 +692,28 @@ local function set_highlights()
FzfLuaTitle = { link = "FloatTitle" }, FzfLuaTitle = { link = "FloatTitle" },
-- rcarriga/nvim-notify -- rcarriga/nvim-notify
NotifyBackground = { link = "NormalFloat" },
NotifyDEBUGBody = { link = "NormalFloat" },
NotifyDEBUGBorder = make_border(), NotifyDEBUGBorder = make_border(),
NotifyDEBUGIcon = { link = "NotifyDEBUGTitle" }, NotifyDEBUGIcon = { link = "NotifyDEBUGTitle" },
NotifyDEBUGTitle = { fg = palette.muted }, NotifyDEBUGTitle = { fg = palette.muted },
NotifyERRORBody = { link = "NormalFloat" },
NotifyERRORBorder = make_border(groups.error), NotifyERRORBorder = make_border(groups.error),
NotifyERRORIcon = { link = "NotifyERRORTitle" }, NotifyERRORIcon = { link = "NotifyERRORTitle" },
NotifyERRORTitle = { fg = groups.error }, NotifyERRORTitle = { fg = groups.error },
NotifyINFOBody = { link = "NormalFloat" },
NotifyINFOBorder = make_border(groups.info), NotifyINFOBorder = make_border(groups.info),
NotifyINFOIcon = { link = "NotifyINFOTitle" }, NotifyINFOIcon = { link = "NotifyINFOTitle" },
NotifyINFOTitle = { fg = groups.info }, NotifyINFOTitle = { fg = groups.info },
NotifyTRACEBody = { link = "NormalFloat" },
NotifyTRACEBorder = make_border(palette.iris), NotifyTRACEBorder = make_border(palette.iris),
NotifyTRACEIcon = { link = "NotifyTRACETitle" }, NotifyTRACEIcon = { link = "NotifyTRACETitle" },
NotifyTRACETitle = { fg = palette.iris }, NotifyTRACETitle = { fg = palette.iris },
NotifyWARNBody = { link = "NormalFloat" },
NotifyWARNBorder = make_border(groups.warn), NotifyWARNBorder = make_border(groups.warn),
NotifyWARNIcon = { link = "NotifyWARNTitle" }, NotifyWARNIcon = { link = "NotifyWARNTitle" },
NotifyWARNTitle = { fg = groups.warn }, NotifyWARNTitle = { fg = groups.warn },
NotifyBackground = { bg = palette.surface },
-- rcarriga/nvim-dap-ui -- rcarriga/nvim-dap-ui
DapUIBreakpointsCurrentLine = { fg = palette.gold, bold = styles.bold }, DapUIBreakpointsCurrentLine = { fg = palette.gold, bold = styles.bold },
DapUIBreakpointsDisabledLine = { fg = palette.muted }, DapUIBreakpointsDisabledLine = { fg = palette.muted },
@ -1030,6 +1036,14 @@ local function set_highlights()
BlinkCmpKindCopilot = { fg = palette.foam }, BlinkCmpKindCopilot = { fg = palette.foam },
BlinkCmpKindSupermaven = { fg = palette.foam }, BlinkCmpKindSupermaven = { fg = palette.foam },
BlinkCmpKindTabNine = { fg = palette.foam }, BlinkCmpKindTabNine = { fg = palette.foam },
-- folke/snacks.nvim
SnacksIndent = { fg = palette.overlay },
SnacksIndentChunk = { fg = palette.overlay },
SnacksIndentBlank = { fg = palette.overlay },
SnacksIndentScope = { fg = palette.foam },
SnacksPickerMatch = { fg = palette.rose, bold = styles.bold },
} }
local transparency_highlights = { local transparency_highlights = {
DiagnosticVirtualTextError = { fg = groups.error }, DiagnosticVirtualTextError = { fg = groups.error },