move fg and bg to colors

lua/lualine/themes/lupan.lua

@@ -26,8 +26,8 @@ else
         replace = c.red.hex,
         command = c.yellow.hex,
         b = { bg = c.base.de(50).li(70).hex, fg = c.base.hex },
-        c = { bg = c.base.de(00).li(60).hex, fg = c.base.hex },
-        inactive = { bg = c.base.de(50).li(40).hex, fg = c.base.da(30).hex },
+        c = { bg = c.base.de(30).li(60).hex, fg = c.base.hex },
+        inactive = { bg = c.base.de(50).li(50).hex, fg = c.base.da(30).hex },
     }
 end
 

lua/lupancolors/lupan.lua

@@ -1,14 +1,14 @@
 local lush = require('lush')
-local hsl = lush.hsl
+local hsluv = lush.hsluv
 
 local M = {}
 
 local default = {
   dark = {
-    base = hsl(210, 40, 75),
+    base = hsluv(210, 40, 75),
   },
   light = {
-    base = hsl(210, 50, 35),
+    base = hsluv(210, 70, 50),
   }
 }
 

lua/lupancolors/lupandark.lua

@@ -1,5 +1,4 @@
 local lush = require('lush')
-local hsl = lush.hsl
 
 local M = {}
 
@@ -7,6 +6,8 @@ local base = require('lupancolors.lupan').options.dark.base
 
 M.colors = {
   base = base,
+  bg = base.de(10).da(70),
+  fg = base.de(75),
   red = base.hue(0),
   orange = base.hue(30),
   yellow = base.hue(60),
@@ -26,9 +27,9 @@ M.theme = lush(function()
   local c = M.colors
   return {
     -- See: h highlight-groups
-    Normal { bg = c.base.de(65).da(75), fg = c.base.de(25) },
-    CursorLine { bg = Normal.bg.li(10) },
-    Visual { bg = Normal.bg.sa(20).li(20) },
+    Normal { bg = c.bg, fg = c.fg },
+    CursorLine { bg = Normal.bg.li(5) },
+    Visual { bg = Normal.bg.sa(20).li(10) },
     Comment { fg = c.base.de(75).da(20) },
     CursorColumn { CursorLine },
     LineNr { Comment, gui = "italic" },
@@ -55,19 +56,19 @@ M.theme = lush(function()
     MoreMsg { fg = c.green, gui = "bold" },
     Question { fg = c.green, gui = "bold" },
     TelescopeSelection { CursorLine },
-    WhiKeyFloat { bg = Normal.bg.li(15) },
+    WhiKeyFloat { bg = Normal.bg.li(10) },
     DiagnosticError { fg = c.red },
     DiagnosticWarn { fg = c.orange },
     DiagnosticInfo { fg = c.cyan },
-    Pmenu { bg = Normal.bg.li(20) },
-    PmenuSel { bg = Normal.bg.li(25).sa(20) },
+    Pmenu { bg = Normal.bg.li(10) },
+    PmenuSel { bg = Normal.bg.li(20).sa(20) },
     Error { bg = c.red.da(25), fg = Normal.bg },
     ErrorMsg { Error },
     MatParen { fg = c.hot_pink, gui = "bold" },
     SpecialKey { fg = c.red },
     Directory { fg = c.cyan },
     Title { fg = c.fuchsia, gui = "bold" },
-    Conceal { bg = c.blue.da(40).de(50) },
+    Conceal { bg = Normal.bg.li(20).de(50) },
     SpellBad { fg = c.red, gui = "underline" },
     SpellRare { fg = Type.fg, gui = "underline" },
     SpellLocal { fg = DiagnosticInfo.fg, gui = "underline" },

lua/lupancolors/lupanlight.lua

@@ -1,5 +1,4 @@
 local lush = require('lush')
-local hsl = lush.hsl
 
 local M = {}
 
@@ -7,6 +6,8 @@ local base = require('lupancolors.lupan').options.light.base
 
 M.colors = {
   base = base,
+  bg = base.de(60).li(90),
+  fg = base.de(75),
   red = base.hue(0),
   orange = base.hue(30),
   yellow = base.hue(60),
@@ -26,9 +27,9 @@ M.theme = lush(function()
   local c = M.colors;
   return {
     -- See: h highlight-groups
-    Normal { bg = c.base.de(70).li(90), fg = c.base.de(75) },
+    Normal { bg = c.bg, fg = c.fg },
     CursorLine { bg = Normal.bg.da(4) },
-    Visual { bg = c.base.de(55).li(65) },
+    Visual { bg = c.base.de(55).li(70) },
     Comment { fg = c.base.de(60).li(20) },
     CursorColumn { CursorLine },
     LineNr { Comment, gui = "italic" },