thallada/farout.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: use a better way to generate day style

Browse Source
This commit is contained in:
Folke Lemaitre
2022-09-05 12:16:26 +02:00
parent f2a76d28a2
commit bd4e3d58e2
5 changed files with 12 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lua/lightline/colorscheme/tokyonight.lua
View File

@@ -1,6 +1,5 @@
local config = require("tokyonight.config")
local colors = require("tokyonight.colors").setup(config)
local util = require("tokyonight.util")
local tokyonight = {}
@@ -37,15 +36,4 @@ tokyonight.tabline = {
tabsel = { { colors.blue, colors.fg_gutter }, { colors.dark3, colors.bg } },
}
if vim.o.background == "light" then
for _, mode in pairs(tokyonight) do
for _, section in pairs(mode) do
for _, subsection in pairs(section) do
subsection[1] = util.getColor(subsection[1])
subsection[2] = util.getColor(subsection[2])
end
end
end
end
return tokyonight

13
lua/lualine/themes/tokyonight.lua
View File

@@ -36,19 +36,6 @@ tokyonight.inactive = {
c = { bg = colors.bg_statusline, fg = colors.fg_gutter },
}
if vim.o.background == "light" then
for _, mode in pairs(tokyonight) do
for _, section in pairs(mode) do
if section.bg then
section.bg = util.getColor(section.bg)
end
if section.fg then
section.fg = util.getColor(section.fg)
end
end
end
end
if vim.g.tokyonight_lualine_bold then
for _, mode in pairs(tokyonight) do
mode.a.gui = "bold"

4
lua/tokyonight/colors.lua
View File

@@ -87,8 +87,8 @@ function M.setup(config)
util.color_overrides(colors, config)
if config.transform_colors and (config.style == "day" or vim.o.background == "light") then
return util.light_colors(colors)
if config.style == "day" or vim.o.background == "light" then
return util.invert_colors(colors)
end
return colors

1
lua/tokyonight/extra/init.lua
View File

@@ -33,7 +33,6 @@ for extra, ext in pairs(extras) do
for style, style_name in pairs(styles) do
config.style = style
config = config or require("tokyonight.config")
config.transform_colors = true
local colors = require("tokyonight.colors").setup(config)
local fname = extra .. "_tokyonight_" .. style .. "." .. ext
colors["_upstream_url"] = "https://github.com/folke/tokyonight.nvim/raw/main/extras/" .. fname

92
lua/tokyonight/util.lua
View File

@@ -3,7 +3,6 @@ local hsluv = require("tokyonight.hsluv")
local util = {}
util.colorsUsed = {}
util.colorCache = {}
util.bg = "#000000"
util.fg = "#ffffff"
@@ -52,7 +51,7 @@ function util.brighten(color, percentage)
return hsluv.hsluv_to_hex(hsl)
end
function util.invertColor(color)
function util.invert_color(color)
if color ~= "NONE" then
local hsl = hsluv.hex_to_hsluv(color)
hsl[3] = 100 - hsl[3]
@@ -64,25 +63,6 @@ function util.invertColor(color)
return color
end
function util.randomColor(color)
if color ~= "NONE" then
local hsl = hsluv.hex_to_hsluv(color)
hsl[1] = math.random(1, 360)
return hsluv.hsluv_to_hex(hsl)
end
return color
end
function util.getColor(color)
if vim.o.background == "dark" then
return color
end
if not util.colorCache[color] then
util.colorCache[color] = util.invertColor(color)
end
return util.colorCache[color]
end
-- local ns = vim.api.nvim_create_namespace("tokyonight")
function util.highlight(group, color)
if color.fg then
@@ -96,9 +76,9 @@ function util.highlight(group, color)
end
local style = color.style and "gui=" .. color.style or "gui=NONE"
local fg = color.fg and "guifg=" .. util.getColor(color.fg) or "guifg=NONE"
local bg = color.bg and "guibg=" .. util.getColor(color.bg) or "guibg=NONE"
local sp = color.sp and "guisp=" .. util.getColor(color.sp) or ""
local fg = color.fg and "guifg=" .. color.fg or "guifg=NONE"
local bg = color.bg and "guibg=" .. color.bg or "guibg=NONE"
local sp = color.sp and "guisp=" .. color.sp or ""
local hl = "highlight " .. group .. " " .. style .. " " .. fg .. " " .. bg .. " " .. sp
@@ -201,21 +181,18 @@ function util.terminal(colors)
vim.g.terminal_color_6 = colors.cyan
vim.g.terminal_color_14 = colors.cyan
if vim.o.background == "light" then
for i = 0, 15, 1 do
vim.g["terminal_color_" .. i] = util.getColor(vim.g["terminal_color_" .. i])
end
end
end
function util.light_colors(colors)
---@param colors ColorScheme
---@return ColorScheme
function util.invert_colors(colors)
if type(colors) == "string" then
return util.getColor(colors)
---@diagnostic disable-next-line: return-type-mismatch
return util.invert_color(colors)
end
local ret = {}
for key, value in pairs(colors) do
ret[key] = util.light_colors(value)
ret[key] = util.invert_colors(value)
end
return ret
end
@@ -278,53 +255,4 @@ function util.color_overrides(colors, config)
end
end
function util.light(brightness)
for hl_name, hl in pairs(vim.api.nvim__get_hl_defs(0)) do
local def = {}
for key, def_key in pairs({ foreground = "fg", background = "bg", special = "sp" }) do
if type(hl[key]) == "number" then
local hex = string.format("#%06x", hl[key])
local color = util.invertColor(hex)
if brightness then
color = util.brighten(hex, brightness)
end
table.insert(def, "gui" .. def_key .. "=" .. color)
end
end
if hl_name ~= "" and #def > 0 then
for _, style in pairs({ "bold", "italic", "underline", "undercurl", "reverse" }) do
if hl[style] then
table.insert(def, "gui=" .. style)
end
end
vim.cmd("highlight! " .. hl_name .. " " .. table.concat(def, " "))
end
end
end
function util.random()
local colors = {}
for hl_name, hl in pairs(vim.api.nvim__get_hl_defs(0)) do
local def = {}
for key, def_key in pairs({ foreground = "fg", background = "bg", special = "sp" }) do
if type(hl[key]) == "number" then
local hex = string.format("#%06x", hl[key])
local color = colors[hex] and colors[hex] or util.randomColor(hex)
colors[hex] = color
table.insert(def, "gui" .. def_key .. "=" .. color)
end
end
if hl_name ~= "" and #def > 0 then
for _, style in pairs({ "bold", "italic", "underline", "undercurl", "reverse" }) do
if hl[style] then
table.insert(def, "gui=" .. style)
end
end
vim.cmd("highlight! " .. hl_name .. " " .. table.concat(def, " "))
end
end
end
return util