mirror of
https://github.com/craftzdog/solarized-osaka.nvim.git
synced 2026-09-10 07:16:21 -04:00
0df74ef0ed
Point the last computed colors at real tokens so nothing is derived by blending anymore: - barbar inactive labels take the new 600 tier, which reads dimmer than the 500 accent and, unlike 700, still brightens under the vivid style - notify borders take the 900 tier, and the debug border takes base02 - black was a blend of the background toward pure black, a value that appeared nowhere in the palette; it is base04, so replace it outright - border was aliased to black, leaving it invisible against the background in the dark style; it is now base02, matching WinSeparator With no callers left, darken and blend go, and with them the mutable util.bg they relied on -- a shared global whose value depended on which style had been resolved last. Every highlight group is unchanged by the black removal. The barbar and notify groups do shift slightly, since a token can never reproduce a blend toward the background exactly; they were chosen to read correctly rather than to match the old values. Light gains from this: black resolved to a muddy #cac4b5 that measured 1.85:1 on statusline mode chips, and base04 lifts that to 3.21:1. The same change makes terminal color0 white in the light style, completing an inversion that already had color7 resolving to a dark value.
330 lines
9.1 KiB
Lua
330 lines
9.1 KiB
Lua
local util = require("solarized-osaka.util")
|
|
local hslutil = require("solarized-osaka.hsl")
|
|
local hsl = hslutil.hslToHex
|
|
|
|
local M = {}
|
|
|
|
---@class Palette
|
|
M.default = {
|
|
none = "NONE",
|
|
|
|
base04 = hsl(192, 100, 5),
|
|
base03 = hsl(192, 100, 11),
|
|
base02 = hsl(192, 81, 14),
|
|
base01 = hsl(194, 14, 40),
|
|
base00 = hsl(196, 13, 45),
|
|
-- base0 = hsl( 186, 8, 55 ),
|
|
base0 = hsl(186, 8, 65),
|
|
-- base1 = hsl( 180, 7, 60 ),
|
|
base1 = hsl(180, 7, 70),
|
|
base2 = hsl(46, 42, 88),
|
|
base3 = hsl(44, 87, 94),
|
|
base4 = hsl(0, 0, 100),
|
|
yellow = hsl(45, 100, 35),
|
|
yellow50 = hsl(47, 100, 91),
|
|
yellow100 = hsl(47, 100, 80),
|
|
yellow200 = hsl(46, 100, 65),
|
|
yellow300 = hsl(45, 100, 50),
|
|
yellow400 = hsl(45, 100, 43),
|
|
yellow500 = hsl(45, 100, 35),
|
|
yellow600 = hsl(45, 100, 28),
|
|
yellow700 = hsl(45, 100, 20),
|
|
yellow800 = hsl(45, 100, 15),
|
|
yellow900 = hsl(46, 100, 10),
|
|
yellow950 = hsl(45.5, 100, 5.69),
|
|
orange = hsl(18, 80, 44),
|
|
orange50 = hsl(17.5, 100, 85.9),
|
|
orange100 = hsl(17, 100, 70),
|
|
orange200 = hsl(17, 97, 61),
|
|
orange300 = hsl(17, 94, 51),
|
|
orange400 = hsl(18, 87, 48),
|
|
orange500 = hsl(18, 80, 44),
|
|
orange600 = hsl(18, 80, 40),
|
|
orange700 = hsl(18, 81, 35),
|
|
orange800 = hsl(18, 80, 28),
|
|
orange900 = hsl(18, 80, 20),
|
|
orange950 = hsl(17.9, 90.5, 12.4),
|
|
red = hsl(1, 71, 52),
|
|
red50 = hsl(1.3, 100, 91),
|
|
red100 = hsl(1, 100, 80),
|
|
red200 = hsl(1, 95, 72),
|
|
red300 = hsl(1, 90, 64),
|
|
red400 = hsl(1, 80, 58),
|
|
red500 = hsl(1, 71, 52),
|
|
red600 = hsl(1, 71, 47),
|
|
red700 = hsl(1, 71, 42),
|
|
red800 = hsl(1, 71, 31),
|
|
red900 = hsl(1, 71, 20),
|
|
red950 = hsl(1.18, 83.6, 12),
|
|
magenta = hsl(331, 64, 52),
|
|
magenta50 = hsl(331, 100, 86.3),
|
|
magenta100 = hsl(331, 100, 73),
|
|
magenta200 = hsl(331, 93, 68),
|
|
magenta300 = hsl(331, 86, 64),
|
|
magenta400 = hsl(331, 75, 58),
|
|
magenta500 = hsl(331, 64, 52),
|
|
magenta600 = hsl(331, 64, 47),
|
|
magenta700 = hsl(331, 64, 42),
|
|
magenta800 = hsl(331, 64, 31),
|
|
magenta900 = hsl(331, 65, 20),
|
|
magenta950 = hsl(332, 77.8, 12.4),
|
|
violet = hsl(237, 43, 60),
|
|
violet50 = hsl(237, 100, 95.9),
|
|
violet100 = hsl(236, 100, 90),
|
|
violet200 = hsl(237, 85, 84),
|
|
violet300 = hsl(237, 69, 77),
|
|
violet400 = hsl(237, 56, 68),
|
|
violet500 = hsl(237, 43, 60),
|
|
violet600 = hsl(237, 43, 55),
|
|
violet700 = hsl(237, 43, 50),
|
|
violet800 = hsl(237, 43, 37),
|
|
violet900 = hsl(237, 42, 25),
|
|
violet950 = hsl(237, 61.1, 14.1),
|
|
blue = hsl(205, 69, 49),
|
|
blue50 = hsl(206, 100, 92.2),
|
|
blue100 = hsl(205, 100, 83),
|
|
blue200 = hsl(205, 95, 73),
|
|
blue300 = hsl(205, 90, 62),
|
|
blue400 = hsl(205, 80, 55),
|
|
blue500 = hsl(205, 69, 49),
|
|
blue600 = hsl(205, 70, 42),
|
|
blue700 = hsl(205, 70, 35),
|
|
blue800 = hsl(205, 70, 28),
|
|
blue900 = hsl(205, 69, 20),
|
|
blue950 = hsl(205, 81, 12.4),
|
|
cyan = hsl(175, 59, 40),
|
|
cyan50 = hsl(176, 100, 94.3),
|
|
cyan100 = hsl(176, 100, 86),
|
|
cyan200 = hsl(175, 92, 70),
|
|
cyan300 = hsl(175, 85, 55),
|
|
cyan400 = hsl(175, 72, 48),
|
|
cyan500 = hsl(175, 59, 40),
|
|
cyan600 = hsl(178, 59, 33),
|
|
cyan700 = hsl(182, 59, 25),
|
|
cyan800 = hsl(182, 58, 20),
|
|
cyan900 = hsl(183, 58, 15),
|
|
cyan950 = hsl(182, 75, 7.84),
|
|
green = hsl(68, 100, 30),
|
|
green50 = hsl(90, 100, 92.2),
|
|
green100 = hsl(90, 100, 84),
|
|
green200 = hsl(83, 100, 66),
|
|
green300 = hsl(76, 100, 49),
|
|
green400 = hsl(72, 100, 40),
|
|
green500 = hsl(68, 100, 30),
|
|
green600 = hsl(68, 100, 25),
|
|
green700 = hsl(68, 100, 20),
|
|
green800 = hsl(68, 100, 15),
|
|
green900 = hsl(68, 100, 10),
|
|
green950 = hsl(68.3, 100, 5.69),
|
|
|
|
bg = hsl(192, 100, 5),
|
|
bg_highlight = hsl(192, 100, 11),
|
|
fg = hsl(186, 8, 55),
|
|
}
|
|
|
|
---@class Palette
|
|
M.light = {
|
|
-- Inverted base colors
|
|
base04 = M.default.base4,
|
|
base03 = M.default.base3,
|
|
base02 = M.default.base2,
|
|
base01 = M.default.base1,
|
|
base00 = M.default.base0,
|
|
base0 = M.default.base00,
|
|
base1 = M.default.base01,
|
|
base2 = M.default.base02,
|
|
base3 = M.default.base03,
|
|
base4 = M.default.base04,
|
|
|
|
-- Inverted accent colors
|
|
yellow = M.default.yellow,
|
|
yellow50 = M.default.yellow950,
|
|
yellow100 = M.default.yellow900,
|
|
yellow200 = M.default.yellow800,
|
|
yellow300 = M.default.yellow700,
|
|
yellow400 = M.default.yellow600,
|
|
yellow500 = M.default.yellow500,
|
|
yellow600 = M.default.yellow400,
|
|
yellow700 = M.default.yellow300,
|
|
yellow800 = M.default.yellow200,
|
|
yellow900 = M.default.yellow100,
|
|
yellow950 = M.default.yellow50,
|
|
|
|
orange = M.default.orange,
|
|
orange50 = M.default.orange950,
|
|
orange100 = M.default.orange900,
|
|
orange200 = M.default.orange800,
|
|
orange300 = M.default.orange700,
|
|
orange400 = M.default.orange600,
|
|
orange500 = M.default.orange500,
|
|
orange600 = M.default.orange400,
|
|
orange700 = M.default.orange300,
|
|
orange800 = M.default.orange200,
|
|
orange900 = M.default.orange100,
|
|
orange950 = M.default.orange50,
|
|
|
|
red = M.default.red,
|
|
red50 = M.default.red950,
|
|
red100 = M.default.red900,
|
|
red200 = M.default.red800,
|
|
red300 = M.default.red700,
|
|
red400 = M.default.red600,
|
|
red500 = M.default.red500,
|
|
red600 = M.default.red400,
|
|
red700 = M.default.red300,
|
|
red800 = M.default.red200,
|
|
red900 = M.default.red100,
|
|
red950 = M.default.red50,
|
|
|
|
magenta = M.default.magenta,
|
|
magenta50 = M.default.magenta950,
|
|
magenta100 = M.default.magenta900,
|
|
magenta200 = M.default.magenta800,
|
|
magenta300 = M.default.magenta700,
|
|
magenta400 = M.default.magenta600,
|
|
magenta500 = M.default.magenta500,
|
|
magenta600 = M.default.magenta400,
|
|
magenta700 = M.default.magenta300,
|
|
magenta800 = M.default.magenta200,
|
|
magenta900 = M.default.magenta100,
|
|
magenta950 = M.default.magenta50,
|
|
|
|
violet = M.default.violet,
|
|
violet50 = M.default.violet950,
|
|
violet100 = M.default.violet900,
|
|
violet200 = M.default.violet800,
|
|
violet300 = M.default.violet700,
|
|
violet400 = M.default.violet600,
|
|
violet500 = M.default.violet500,
|
|
violet600 = M.default.violet400,
|
|
violet700 = M.default.violet300,
|
|
violet800 = M.default.violet200,
|
|
violet900 = M.default.violet100,
|
|
violet950 = M.default.violet50,
|
|
|
|
blue = M.default.blue,
|
|
blue50 = M.default.blue950,
|
|
blue100 = M.default.blue900,
|
|
blue200 = M.default.blue800,
|
|
blue300 = M.default.blue700,
|
|
blue400 = M.default.blue600,
|
|
blue500 = M.default.blue500,
|
|
blue600 = M.default.blue400,
|
|
blue700 = M.default.blue300,
|
|
blue800 = M.default.blue200,
|
|
blue900 = M.default.blue100,
|
|
blue950 = M.default.blue50,
|
|
|
|
cyan = M.default.cyan,
|
|
cyan50 = M.default.cyan950,
|
|
cyan100 = M.default.cyan900,
|
|
cyan200 = M.default.cyan800,
|
|
cyan300 = M.default.cyan700,
|
|
cyan400 = M.default.cyan600,
|
|
cyan500 = M.default.cyan500,
|
|
cyan600 = M.default.cyan400,
|
|
cyan700 = M.default.cyan300,
|
|
cyan800 = M.default.cyan200,
|
|
cyan900 = M.default.cyan100,
|
|
cyan950 = M.default.cyan50,
|
|
|
|
green = M.default.green,
|
|
green50 = M.default.green950,
|
|
green100 = M.default.green900,
|
|
green200 = M.default.green800,
|
|
green300 = M.default.green700,
|
|
green400 = M.default.green600,
|
|
green500 = M.default.green500,
|
|
green600 = M.default.green400,
|
|
green700 = M.default.green300,
|
|
green800 = M.default.green200,
|
|
green900 = M.default.green100,
|
|
green950 = M.default.green50,
|
|
|
|
bg = M.default.base3,
|
|
bg_highlight = M.default.base2,
|
|
fg = M.default.base01,
|
|
}
|
|
|
|
local background_tokens = {
|
|
none = true,
|
|
bg = true,
|
|
bg_highlight = true,
|
|
base02 = true,
|
|
base03 = true,
|
|
base04 = true,
|
|
}
|
|
|
|
local background_tiers = {
|
|
["700"] = true,
|
|
["800"] = true,
|
|
["900"] = true,
|
|
["950"] = true,
|
|
}
|
|
|
|
---@param name string
|
|
---@return boolean
|
|
local function is_background_token(name)
|
|
return background_tokens[name] or background_tiers[name:sub(-3)] or false
|
|
end
|
|
|
|
--- A higher-contrast dark variant for bright environments
|
|
---@return Palette
|
|
M.vivid = function()
|
|
local amount = require("solarized-osaka.config").options.vivid_brightness
|
|
local palette = {}
|
|
for name, hex in pairs(M.default) do
|
|
if not is_background_token(name) then
|
|
palette[name] = util.brighten(hex, amount)
|
|
end
|
|
end
|
|
return palette
|
|
end
|
|
|
|
---@return ColorScheme
|
|
function M.setup(opts)
|
|
opts = opts or {}
|
|
local config = require("solarized-osaka.config")
|
|
|
|
local style = config.is_light() and config.options.light_style or config.options.style
|
|
local palette = M[style] or {}
|
|
if type(palette) == "function" then
|
|
palette = palette()
|
|
end
|
|
|
|
-- Color Palette
|
|
---@class ColorScheme: Palette
|
|
local colors = vim.tbl_deep_extend("force", vim.deepcopy(M.default), palette)
|
|
|
|
-- Separator lines, matching WinSeparator
|
|
colors.border = colors.base02
|
|
|
|
-- Popups and statusline always get a dark background
|
|
colors.bg_popup = colors.base04
|
|
colors.bg_statusline = colors.base03
|
|
|
|
-- Sidebar and Floats are configurable
|
|
colors.bg_sidebar = config.options.styles.sidebars == "transparent" and colors.none
|
|
or config.options.styles.sidebars == "dark" and colors.base04
|
|
or colors.bg
|
|
|
|
colors.bg_float = config.options.styles.floats == "transparent" and colors.none
|
|
or config.options.styles.floats == "dark" and colors.base04
|
|
or colors.bg
|
|
|
|
-- colors.fg_float = config.options.styles.floats == "dark" and colors.base01 or colors.fg
|
|
colors.fg_float = colors.fg
|
|
|
|
colors.error = colors.red500
|
|
colors.warning = colors.yellow500
|
|
colors.info = colors.blue500
|
|
colors.hint = colors.cyan500
|
|
colors.todo = colors.violet500
|
|
|
|
config.options.on_colors(colors)
|
|
|
|
return colors
|
|
end
|
|
|
|
return M
|