From acf1803eccf604b17dd5e2506799f99a22e399eb Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Tue, 21 Sep 2021 20:24:23 +0800 Subject: [PATCH] separate neovim specs file for easy :Lushify --- colors/neovim.lua | 41 ++--------------------------------------- lua/zenbones/neovim.lua | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 39 deletions(-) create mode 100644 lua/zenbones/neovim.lua diff --git a/colors/neovim.lua b/colors/neovim.lua index d6db6b5..a8312c1 100644 --- a/colors/neovim.lua +++ b/colors/neovim.lua @@ -5,45 +5,8 @@ local base_name = vim.opt.background:get() == "light" and "zenbones" or "zenfles -- reset base palette and specs package.loaded[base_name .. ".palette"] = nil package.loaded[base_name] = nil - -local lush = require "lush" -local hsluv = lush.hsluv - --- modify base palette first (before requiring specs) -local palette = require(base_name .. ".palette") -if base_name == "zenbones" then - palette.bg = hsluv "#e7eee8" -- --bg-color - palette.fg = hsluv "#202e18" -- --accent-color - palette.leaf = palette.leaf.sa(24).li(8) -- Need to make green more prominent -else - palette.bg = hsluv "#0f191f" -- --bg-color - palette.fg = hsluv "#c7d6d0" -- --fg-color - palette.leaf = hsluv "#8fff6d" -- --accent-color -end - --- extend specs using Lush -local theme = require(base_name) -local specs -if base_name == "zenbones" then - specs = lush.extends({ theme }).with(function() - return { - helpHyperTextJump { fg = hsluv "#195174" }, -- --link-color - helpOption { helpHyperTextJump }, - markdownUrl { helpHyperTextJump }, - } - end) -else - specs = lush.extends({ theme }).with(function() - return { - FloatBorder { fg = hsluv "#203f57" }, -- --border-color - helpHyperTextJump { fg = hsluv "#8ec77e" }, -- --link-color - helpOption { helpHyperTextJump }, - markdownUrl { helpHyperTextJump }, - } - end) -end +package.loaded["zenbones.neovim"] = nil require(base_name .. ".terminal").setup() --- include our theme file and pass it to lush to apply -lush(specs) +require "lush"(require "zenbones.neovim") diff --git a/lua/zenbones/neovim.lua b/lua/zenbones/neovim.lua new file mode 100644 index 0000000..654ff0f --- /dev/null +++ b/lua/zenbones/neovim.lua @@ -0,0 +1,40 @@ +local lush = require "lush" +local hsluv = lush.hsluv + +local base_name = vim.opt.background:get() == "light" and "zenbones" or "zenflesh" + +-- modify base palette first (before requiring specs) +local palette = require(base_name .. ".palette") +if base_name == "zenbones" then + palette.bg = hsluv "#e7eee8" -- --bg-color + palette.fg = hsluv "#202e18" -- --accent-color + palette.leaf = palette.leaf.sa(24).li(8) -- need to make green more prominent +else + palette.bg = hsluv "#0f191f" -- --bg-color + palette.fg = hsluv "#c7d6d0" -- --fg-color + palette.leaf = hsluv "#8fff6d" -- --accent-color +end + +-- extend specs using Lush +local theme = require(base_name) +local specs +if base_name == "zenbones" then + specs = lush.extends({ theme }).with(function() + return { + helpHyperTextJump { fg = hsluv "#195174" }, -- --link-color + helpOption { helpHyperTextJump }, + markdownUrl { helpHyperTextJump }, + } + end) +else + specs = lush.extends({ theme }).with(function() + return { + FloatBorder { fg = hsluv "#203f57" }, -- --border-color + helpHyperTextJump { fg = hsluv "#8ec77e" }, -- --link-color + helpOption { helpHyperTextJump }, + markdownUrl { helpHyperTextJump }, + } + end) +end + +return specs