From a5bd4b1bb29ce05b58f8f668557f24f1986c9c1f Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Fri, 5 Nov 2021 15:43:29 +0800 Subject: [PATCH] breaking: standardize palette vimbones and nordbones follow standard palatte table: require("nordbones.palette").dark instead of "derived" --- lua/nordbones/init.lua | 4 ++-- lua/nordbones/palette.lua | 2 +- lua/vimbones/init.lua | 2 +- lua/vimbones/palette.lua | 6 +++++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lua/nordbones/init.lua b/lua/nordbones/init.lua index 91e6ea6..fe5e369 100644 --- a/lua/nordbones/init.lua +++ b/lua/nordbones/init.lua @@ -2,14 +2,14 @@ local lush = require "lush" local generator = require "zenbones.specs" local p = require "nordbones.palette" -local specs = generator.generate(p.derived, "dark", generator.get_global_config("nordbones", "dark")) +local specs = generator.generate(p.dark, "dark", generator.get_global_config("nordbones", "dark")) return lush.extends({ specs }).with(function() ---@diagnostic disable: undefined-global -- selene: allow(undefined_variable) return { Number { fg = p.base.nord7, gui = "italic" }, - Identifer { fg = p.derived.fg }, + Identifer { fg = p.dark.fg }, Function { fg = p.base.nord8 }, Statement { fg = p.base.nord9 }, Type { fg = p.base.nord10 }, diff --git a/lua/nordbones/palette.lua b/lua/nordbones/palette.lua index 2c71a1f..f9d6403 100644 --- a/lua/nordbones/palette.lua +++ b/lua/nordbones/palette.lua @@ -23,7 +23,7 @@ local base = { nord15 = hsluv "#b48ead", } -M.derived = util.palette_extend { +M.dark = util.palette_extend { bg = base.nord0, fg = base.nord6, rose = base.nord11, diff --git a/lua/vimbones/init.lua b/lua/vimbones/init.lua index fbc1f73..360ec4e 100644 --- a/lua/vimbones/init.lua +++ b/lua/vimbones/init.lua @@ -1,6 +1,6 @@ local lush = require "lush" local generator = require "zenbones.specs" -local p = require "vimbones.palette" +local p = require("vimbones.palette").light local specs = generator.generate(p, "light", generator.get_global_config("vimbones", "light")) diff --git a/lua/vimbones/palette.lua b/lua/vimbones/palette.lua index 4f7af7a..82803ce 100644 --- a/lua/vimbones/palette.lua +++ b/lua/vimbones/palette.lua @@ -2,8 +2,12 @@ local util = require "zenbones.util" local lush = require "lush" local hsluv = lush.hsluv -return util.palette_extend({ +local M = {} + +M.light = util.palette_extend({ bg = hsluv(85.9, 27, 94), fg = hsluv(0, 0, 22), vim = hsluv(131.8, 92, 51), }, "light") + +return M