From 66aabf210b5e736a3df5006648d4201016e05a2a Mon Sep 17 00:00:00 2001 From: mvllow Date: Tue, 7 Jan 2025 09:47:00 -0600 Subject: [PATCH 1/5] fix: lualine transparency Fixes #333 --- lua/lualine/themes/rose-pine-alt.lua | 12 +++++++++--- lua/lualine/themes/rose-pine.lua | 22 ++++++++++++++-------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/lua/lualine/themes/rose-pine-alt.lua b/lua/lualine/themes/rose-pine-alt.lua index 05d8af7..287144f 100644 --- a/lua/lualine/themes/rose-pine-alt.lua +++ b/lua/lualine/themes/rose-pine-alt.lua @@ -1,4 +1,10 @@ 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 { normal = { @@ -19,8 +25,8 @@ return { 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" }, + a = { bg = bg_base, fg = p.subtle, gui = "bold" }, + b = { bg = bg_base, fg = p.subtle }, + c = { bg = bg_base, fg = p.subtle, gui = "italic" }, }, } diff --git a/lua/lualine/themes/rose-pine.lua b/lua/lualine/themes/rose-pine.lua index 96d6b92..4c2c9a6 100644 --- a/lua/lualine/themes/rose-pine.lua +++ b/lua/lualine/themes/rose-pine.lua @@ -1,34 +1,40 @@ 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 { normal = { a = { bg = p.rose, fg = p.base, gui = "bold" }, b = { bg = p.overlay, fg = p.rose }, - c = { bg = p.base, fg = p.text }, + c = { bg = bg_base, fg = p.text }, }, insert = { a = { bg = p.foam, fg = p.base, gui = "bold" }, b = { bg = p.overlay, fg = p.foam }, - c = { bg = p.base, fg = p.text }, + c = { bg = bg_base, fg = p.text }, }, visual = { a = { bg = p.iris, fg = p.base, gui = "bold" }, b = { bg = p.overlay, fg = p.iris }, - c = { bg = p.base, fg = p.text }, + c = { bg = bg_base, fg = p.text }, }, replace = { a = { bg = p.pine, fg = p.base, gui = "bold" }, b = { bg = p.overlay, fg = p.pine }, - c = { bg = p.base, fg = p.text }, + c = { bg = bg_base, fg = p.text }, }, command = { a = { bg = p.love, fg = p.base, gui = "bold" }, b = { bg = p.overlay, fg = p.love }, - c = { bg = p.base, fg = p.text }, + c = { bg = bg_base, fg = p.text }, }, inactive = { - a = { bg = p.base, fg = p.muted, gui = "bold" }, - b = { bg = p.base, fg = p.muted }, - c = { bg = p.base, fg = p.muted }, + a = { bg = bg_base, fg = p.muted, gui = "bold" }, + b = { bg = bg_base, fg = p.muted }, + c = { bg = bg_base, fg = p.muted }, }, } From fa220ae16f5127e0bdf2a55e54e81ee4accca25f Mon Sep 17 00:00:00 2001 From: mvllow Date: Wed, 8 Jan 2025 09:09:59 -0600 Subject: [PATCH 2/5] feat: use blended iris for visual Fixes #277 --- lua/rose-pine.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua index 39da9bc..8c1f782 100644 --- a/lua/rose-pine.lua +++ b/lua/rose-pine.lua @@ -143,7 +143,7 @@ local function set_highlights() TabLineSel = { fg = palette.text, bg = palette.overlay, bold = styles.bold }, Title = { fg = palette.foam, bold = styles.bold }, VertSplit = { fg = groups.border }, - Visual = { bg = palette.highlight_med }, + Visual = { bg = palette.iris, blend = 15 }, -- VisualNOS = {}, WarningMsg = { fg = groups.warn, bold = styles.bold }, -- Whitespace = {}, From 106f05aeab8277e97eda9649271b33f9f12d8db4 Mon Sep 17 00:00:00 2001 From: mvllow Date: Wed, 8 Jan 2025 09:37:09 -0600 Subject: [PATCH 3/5] feat: add `Notify*Body` highlights Fixes #331 --- lua/rose-pine.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua index 8c1f782..a8e297d 100644 --- a/lua/rose-pine.lua +++ b/lua/rose-pine.lua @@ -682,22 +682,28 @@ local function set_highlights() FzfLuaTitle = { link = "FloatTitle" }, -- rcarriga/nvim-notify + NotifyBackground = { link = "NormalFloat" }, + NotifyDEBUGBody = { link = 'NormalFloat' }, NotifyDEBUGBorder = make_border(), NotifyDEBUGIcon = { link = "NotifyDEBUGTitle" }, NotifyDEBUGTitle = { fg = palette.muted }, + NotifyERRORBody = { link = 'NormalFloat' }, NotifyERRORBorder = make_border(groups.error), NotifyERRORIcon = { link = "NotifyERRORTitle" }, NotifyERRORTitle = { fg = groups.error }, + NotifyINFOBody = { link = 'NormalFloat' }, NotifyINFOBorder = make_border(groups.info), NotifyINFOIcon = { link = "NotifyINFOTitle" }, NotifyINFOTitle = { fg = groups.info }, + NotifyTRACEBody = { link = 'NormalFloat' }, NotifyTRACEBorder = make_border(palette.iris), NotifyTRACEIcon = { link = "NotifyTRACETitle" }, NotifyTRACETitle = { fg = palette.iris }, + NotifyWARNBody = { link = 'NormalFloat' }, NotifyWARNBorder = make_border(groups.warn), NotifyWARNIcon = { link = "NotifyWARNTitle" }, NotifyWARNTitle = { fg = groups.warn }, - NotifyBackground = { bg = palette.surface }, + -- rcarriga/nvim-dap-ui DapUIBreakpointsCurrentLine = { fg = palette.gold, bold = styles.bold }, DapUIBreakpointsDisabledLine = { fg = palette.muted }, From 719ec67bf51efdd778c3a7855a135a8d6d362959 Mon Sep 17 00:00:00 2001 From: Federico Minaya Date: Tue, 14 Jan 2025 18:20:19 -0300 Subject: [PATCH 4/5] feat: add snacks indent highlights (#334) --- lua/rose-pine.lua | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua index a8e297d..2bf1aa2 100644 --- a/lua/rose-pine.lua +++ b/lua/rose-pine.lua @@ -683,23 +683,23 @@ local function set_highlights() -- rcarriga/nvim-notify NotifyBackground = { link = "NormalFloat" }, - NotifyDEBUGBody = { link = 'NormalFloat' }, + NotifyDEBUGBody = { link = "NormalFloat" }, NotifyDEBUGBorder = make_border(), NotifyDEBUGIcon = { link = "NotifyDEBUGTitle" }, NotifyDEBUGTitle = { fg = palette.muted }, - NotifyERRORBody = { link = 'NormalFloat' }, + NotifyERRORBody = { link = "NormalFloat" }, NotifyERRORBorder = make_border(groups.error), NotifyERRORIcon = { link = "NotifyERRORTitle" }, NotifyERRORTitle = { fg = groups.error }, - NotifyINFOBody = { link = 'NormalFloat' }, + NotifyINFOBody = { link = "NormalFloat" }, NotifyINFOBorder = make_border(groups.info), NotifyINFOIcon = { link = "NotifyINFOTitle" }, NotifyINFOTitle = { fg = groups.info }, - NotifyTRACEBody = { link = 'NormalFloat' }, + NotifyTRACEBody = { link = "NormalFloat" }, NotifyTRACEBorder = make_border(palette.iris), NotifyTRACEIcon = { link = "NotifyTRACETitle" }, NotifyTRACETitle = { fg = palette.iris }, - NotifyWARNBody = { link = 'NormalFloat' }, + NotifyWARNBody = { link = "NormalFloat" }, NotifyWARNBorder = make_border(groups.warn), NotifyWARNIcon = { link = "NotifyWARNTitle" }, NotifyWARNTitle = { fg = groups.warn }, @@ -1013,6 +1013,12 @@ local function set_highlights() BlinkCmpKindCopilot = { fg = palette.foam }, BlinkCmpKindSupermaven = { 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 }, } local transparency_highlights = { DiagnosticVirtualTextError = { fg = groups.error }, From 42f0724e0bca9f57f0bcfa688787c37b8d4befe8 Mon Sep 17 00:00:00 2001 From: Patrick Haun Date: Wed, 15 Jan 2025 21:28:37 +0100 Subject: [PATCH 5/5] More obvious match highlight in snacks.picker (#335) --- lua/rose-pine.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua index 2bf1aa2..5f4bf54 100644 --- a/lua/rose-pine.lua +++ b/lua/rose-pine.lua @@ -1019,6 +1019,8 @@ local function set_highlights() SnacksIndentChunk = { fg = palette.overlay }, SnacksIndentBlank = { fg = palette.overlay }, SnacksIndentScope = { fg = palette.foam }, + + SnacksPickerMatch = { fg = palette.rose, bold = styles.bold }, } local transparency_highlights = { DiagnosticVirtualTextError = { fg = groups.error },