diff --git a/lua/lualine/themes/rose-pine-alt-dawn.lua b/lua/lualine/themes/rose-pine-alt-dawn.lua index b71f753..bcf3bf4 100644 --- a/lua/lualine/themes/rose-pine-alt-dawn.lua +++ b/lua/lualine/themes/rose-pine-alt-dawn.lua @@ -1,4 +1,4 @@ -local p = require("rose-pine.variants").dawn +local p = require("rose-pine.palette").variants.dawn local generator = require("lualine.generate") return generator.alternate(p) diff --git a/lua/lualine/themes/rose-pine-alt-main.lua b/lua/lualine/themes/rose-pine-alt-main.lua index 963f2da..7214e5d 100644 --- a/lua/lualine/themes/rose-pine-alt-main.lua +++ b/lua/lualine/themes/rose-pine-alt-main.lua @@ -1,4 +1,4 @@ -local p = require("rose-pine.variants").main +local p = require("rose-pine.palette").variants.main local generator = require("lualine.generate") return generator.alternate(p) diff --git a/lua/lualine/themes/rose-pine-alt-moon.lua b/lua/lualine/themes/rose-pine-alt-moon.lua index a5ef74b..d746829 100644 --- a/lua/lualine/themes/rose-pine-alt-moon.lua +++ b/lua/lualine/themes/rose-pine-alt-moon.lua @@ -1,4 +1,4 @@ -local p = require("rose-pine.variants").moon +local p = require("rose-pine.palette").variants.moon local generator = require("lualine.generate") return generator.alternate(p) diff --git a/lua/lualine/themes/rose-pine-dawn.lua b/lua/lualine/themes/rose-pine-dawn.lua index 0edd7b3..46897a5 100644 --- a/lua/lualine/themes/rose-pine-dawn.lua +++ b/lua/lualine/themes/rose-pine-dawn.lua @@ -1,4 +1,4 @@ -local p = require("rose-pine.variants").dawn +local p = require("rose-pine.palette").variants.dawn local generator = require("lualine.generate") return generator.normal(p) diff --git a/lua/lualine/themes/rose-pine-main.lua b/lua/lualine/themes/rose-pine-main.lua index 37fa29f..ee779ea 100644 --- a/lua/lualine/themes/rose-pine-main.lua +++ b/lua/lualine/themes/rose-pine-main.lua @@ -1,4 +1,4 @@ -local p = require("rose-pine.variants").main +local p = require("rose-pine.palette").variants.main local generator = require("lualine.generate") return generator.normal(p) diff --git a/lua/lualine/themes/rose-pine-moon.lua b/lua/lualine/themes/rose-pine-moon.lua index f3b5bab..3cf1431 100644 --- a/lua/lualine/themes/rose-pine-moon.lua +++ b/lua/lualine/themes/rose-pine-moon.lua @@ -1,4 +1,4 @@ -local p = require("rose-pine.variants").moon +local p = require("rose-pine.palette").variants.moon local generator = require("lualine.generate") return generator.normal(p) diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua index c8daf8f..bd99851 100644 --- a/lua/rose-pine/palette.lua +++ b/lua/rose-pine/palette.lua @@ -1,8 +1,73 @@ local options = require("rose-pine.config").options -local variants = require("rose-pine.variants") -if variants[options.variant] ~= nil then - return variants[options.variant] +local variants = { + main = { + _nc = "#16141f", + base = "#191724", + surface = "#1f1d2e", + overlay = "#26233a", + muted = "#6e6a86", + subtle = "#908caa", + text = "#e0def4", + love = "#eb6f92", + gold = "#f6c177", + rose = "#ebbcba", + pine = "#31748f", + foam = "#9ccfd8", + iris = "#c4a7e7", + highlight_low = "#21202e", + highlight_med = "#403d52", + highlight_high = "#524f67", + none = "NONE", + }, + moon = { + _nc = "#1f1d30", + base = "#232136", + surface = "#2a273f", + overlay = "#393552", + muted = "#6e6a86", + subtle = "#908caa", + text = "#e0def4", + love = "#eb6f92", + gold = "#f6c177", + rose = "#ea9a97", + pine = "#3e8fb0", + foam = "#9ccfd8", + iris = "#c4a7e7", + highlight_low = "#2a283e", + highlight_med = "#44415a", + highlight_high = "#56526e", + none = "NONE", + }, + dawn = { + _nc = "#f8f0e7", + base = "#faf4ed", + surface = "#fffaf3", + overlay = "#f2e9e1", + muted = "#9893a5", + subtle = "#797593", + text = "#575279", + love = "#b4637a", + gold = "#ea9d34", + rose = "#d7827e", + pine = "#286983", + foam = "#56949f", + iris = "#907aa9", + highlight_low = "#f4ede8", + highlight_med = "#dfdad9", + highlight_high = "#cecacd", + none = "NONE", + }, +} + + +local chosen +if variants[options.dark_variant] ~= nil then + chosen = variants[options.variant] +else + chosen = vim.o.background == "light" and variants.dawn or variants[options.dark_variant or "main"] end -return vim.o.background == "light" and variants.dawn or variants[options.dark_variant or "main"] +chosen.variants = variants + +return chosen diff --git a/lua/rose-pine/variants.lua b/lua/rose-pine/variants.lua deleted file mode 100644 index 81772d2..0000000 --- a/lua/rose-pine/variants.lua +++ /dev/null @@ -1,59 +0,0 @@ -return { - main = { - _nc = "#16141f", - base = "#191724", - surface = "#1f1d2e", - overlay = "#26233a", - muted = "#6e6a86", - subtle = "#908caa", - text = "#e0def4", - love = "#eb6f92", - gold = "#f6c177", - rose = "#ebbcba", - pine = "#31748f", - foam = "#9ccfd8", - iris = "#c4a7e7", - highlight_low = "#21202e", - highlight_med = "#403d52", - highlight_high = "#524f67", - none = "NONE", - }, - moon = { - _nc = "#1f1d30", - base = "#232136", - surface = "#2a273f", - overlay = "#393552", - muted = "#6e6a86", - subtle = "#908caa", - text = "#e0def4", - love = "#eb6f92", - gold = "#f6c177", - rose = "#ea9a97", - pine = "#3e8fb0", - foam = "#9ccfd8", - iris = "#c4a7e7", - highlight_low = "#2a283e", - highlight_med = "#44415a", - highlight_high = "#56526e", - none = "NONE", - }, - dawn = { - _nc = "#f8f0e7", - base = "#faf4ed", - surface = "#fffaf3", - overlay = "#f2e9e1", - muted = "#9893a5", - subtle = "#797593", - text = "#575279", - love = "#b4637a", - gold = "#ea9d34", - rose = "#d7827e", - pine = "#286983", - foam = "#56949f", - iris = "#907aa9", - highlight_low = "#f4ede8", - highlight_med = "#dfdad9", - highlight_high = "#cecacd", - none = "NONE", - }, -}