diff --git a/lua/lualine/themes/rose-pine-alt.lua b/lua/lualine/themes/rose-pine-alt.lua index 0248420..05d8af7 100644 --- a/lua/lualine/themes/rose-pine-alt.lua +++ b/lua/lualine/themes/rose-pine-alt.lua @@ -1 +1,26 @@ -return require("rose-pine.plugins.lualine").alternate +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" }, + }, +} diff --git a/lua/lualine/themes/rose-pine-inv.lua b/lua/lualine/themes/rose-pine-inv.lua deleted file mode 100644 index 9c13a1d..0000000 --- a/lua/lualine/themes/rose-pine-inv.lua +++ /dev/null @@ -1,2 +0,0 @@ -return require("rose-pine.plugins.lualine").inverse - diff --git a/lua/lualine/themes/rose-pine-neutral.lua b/lua/lualine/themes/rose-pine-neutral.lua deleted file mode 100644 index 1459e84..0000000 --- a/lua/lualine/themes/rose-pine-neutral.lua +++ /dev/null @@ -1,2 +0,0 @@ -return require("rose-pine.plugins.lualine").neutral - diff --git a/lua/lualine/themes/rose-pine.lua b/lua/lualine/themes/rose-pine.lua index 2d33786..4c2c9a6 100644 --- a/lua/lualine/themes/rose-pine.lua +++ b/lua/lualine/themes/rose-pine.lua @@ -1 +1,40 @@ -return require("rose-pine.plugins.lualine").normal +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 = bg_base, fg = p.text }, + }, + insert = { + a = { bg = p.foam, fg = p.base, gui = "bold" }, + b = { bg = p.overlay, fg = p.foam }, + 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 = bg_base, fg = p.text }, + }, + replace = { + a = { bg = p.pine, fg = p.base, gui = "bold" }, + b = { bg = p.overlay, fg = p.pine }, + 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 = bg_base, fg = p.text }, + }, + inactive = { + a = { bg = bg_base, fg = p.muted, gui = "bold" }, + b = { bg = bg_base, fg = p.muted }, + c = { bg = bg_base, fg = p.muted }, + }, +} diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua index cb85e75..540625e 100644 --- a/lua/rose-pine/palette.lua +++ b/lua/rose-pine/palette.lua @@ -1,5 +1,4 @@ local options = require("rose-pine.config").options - local variants = { main = { _nc = "#16141f", @@ -60,14 +59,8 @@ local variants = { }, } - -local chosen if variants[options.variant] ~= nil then - chosen = variants[options.variant] -else - chosen = vim.o.background == "light" and variants.dawn or variants[options.dark_variant or "main"] + return variants[options.variant] end -chosen.variants = variants - -return chosen +return vim.o.background == "light" and variants.dawn or variants[options.dark_variant or "main"] diff --git a/lua/rose-pine/plugins/lualine.lua b/lua/rose-pine/plugins/lualine.lua deleted file mode 100644 index eb59216..0000000 --- a/lua/rose-pine/plugins/lualine.lua +++ /dev/null @@ -1,125 +0,0 @@ -local palette = require("rose-pine.palette") - -local generator = {} - -function generator.alternate(p) - 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" }, - }, - variants = {}, - } -end - -function generator.normal(p) - 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 = bg_base, fg = p.text }, - }, - insert = { - a = { bg = p.foam, fg = p.base, gui = "bold" }, - b = { bg = p.overlay, fg = p.foam }, - }, - visual = { - a = { bg = p.iris, fg = p.base, gui = "bold" }, - b = { bg = p.overlay, fg = p.iris }, - }, - replace = { - a = { bg = p.pine, fg = p.base, gui = "bold" }, - b = { bg = p.overlay, fg = p.pine }, - }, - command = { - a = { bg = p.love, fg = p.base, gui = "bold" }, - b = { bg = p.overlay, fg = p.love }, - }, - inactive = { - a = { bg = bg_base, fg = p.muted, gui = "bold" }, - b = { bg = bg_base, fg = p.muted }, - c = { bg = bg_base, fg = p.muted }, - }, - variants = {}, - } -end - -function generator.neutral(p) - return { - normal = { - a = { bg = p.rose, fg = p.base, gui = "bold" }, - b = { bg = p.highlight_med, fg = p.rose }, - c = { bg = p.highlight_high, fg = p.text }, - }, - insert = { - a = { bg = p.foam, fg = p.base, gui = "bold" }, - b = { bg = p.highlight_med, fg = p.foam }, - }, - visual = { - a = { bg = p.iris, fg = p.base, gui = "bold" }, - b = { bg = p.highlight_med, fg = p.iris }, - }, - replace = { - a = { bg = p.pine, fg = p.base, gui = "bold" }, - b = { bg = p.highlight_med, fg = p.pine }, - }, - command = { - a = { bg = p.love, fg = p.base, gui = "bold" }, - b = { bg = p.highlight_med, fg = p.love }, - }, - inactive = { - a = { bg = p.muted, fg = p.overlay, gui = "bold" }, - b = { bg = p.muted, fg = p.overlay }, - c = { bg = p.muted, fg = p.base }, - }, - variants = {} - } -end - -function generator.inverse(p) - if p.base == palette.variants.moon.base then - return generator.normal(palette.variants.dawn) - elseif p.base == palette.variants.main.base then - return generator.normal(palette.variants.dawn) - elseif p.base == palette.variants.dawn.base then - return generator.normal(palette.variants.moon) - end -end - --- function generator. - -local default = {} - -for t, fn in pairs(generator) do - default[t] = fn(palette) - for k, v in pairs(palette.variants) do - default[t].variants[k] = fn(v) - end -end - -return default