fix(extra): zellij black and white set to bg3/fg3 (#336)

Zellij's theme uses black for the background panels. This make it more in line with the rest of the themes
EdenEast · Apr 21, 2023 · 409d646 · 409d646
1 parent 669b0ce
commit 409d646
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 60 deletions.
diff --git a/extra/zellij/nightfox.kdl b/extra/zellij/nightfox.kdl
@@ -2,18 +2,44 @@
 // https://github.com/edeneast/nightfox.nvim
 
 themes {
-  terafox {
-    bg "#152528"
-    fg "#e6eaea"
-    red "#e85c51"
-    green "#7aa4a1"
-    blue "#5a93aa"
-    yellow "#fda47f"
-    magenta "#ad5c7c"
-    orange "#ff8349"
-    cyan "#a1cdd8"
-    black "#2f3239"
-    white "#ebebeb"
+  carbonfox {
+    bg "#161616"
+    fg "#f2f4f8"
+    red "#ee5396"
+    green "#25be6a"
+    blue "#78a9ff"
+    yellow "#08bdba"
+    magenta "#be95ff"
+    orange "#3ddbd9"
+    cyan "#33b1ff"
+    black "#353535"
+    white "#7b7c7e"
+  }
+  dawnfox {
+    bg "#faf4ed"
+    fg "#575279"
+    red "#b4637a"
+    green "#618774"
+    blue "#286983"
+    yellow "#ea9d34"
+    magenta "#907aa9"
+    orange "#d7827e"
+    cyan "#56949f"
+    black "#ebdfe4"
+    white "#a8a3b3"
+  }
+  dayfox {
+    bg "#f6f2ee"
+    fg "#3d2b5a"
+    red "#a5222f"
+    green "#396847"
+    blue "#2848a9"
+    yellow "#ac5402"
+    magenta "#6e33ce"
+    orange "#955f61"
+    cyan "#287980"
+    black "#d3c7bb"
+    white "#824d5b"
   }
   duskfox {
     bg "#232136"
@@ -25,8 +51,8 @@ themes {
     magenta "#c4a7e7"
     orange "#ea9a97"
     cyan "#9ccfd8"
-    black "#393552"
-    white "#e0def4"
+    black "#373354"
+    white "#6e6a86"
   }
   nightfox {
     bg "#192330"
@@ -38,8 +64,8 @@ themes {
     magenta "#9d79d6"
     orange "#f4a261"
     cyan "#63cdcf"
-    black "#393b44"
-    white "#dfdfe0"
+    black "#29394f"
+    white "#71839b"
   }
   nordfox {
     bg "#2e3440"
@@ -51,46 +77,20 @@ themes {
     magenta "#b48ead"
     orange "#c9826b"
     cyan "#88c0d0"
-    black "#3b4252"
-    white "#e5e9f0"
+    black "#444c5e"
+    white "#7e8188"
   }
-  carbonfox {
-    bg "#161616"
-    fg "#f2f4f8"
-    red "#ee5396"
-    green "#25be6a"
-    blue "#78a9ff"
-    yellow "#08bdba"
-    magenta "#be95ff"
-    orange "#3ddbd9"
-    cyan "#33b1ff"
-    black "#282828"
-    white "#dfdfe0"
-  }
-  dawnfox {
-    bg "#faf4ed"
-    fg "#575279"
-    red "#b4637a"
-    green "#618774"
-    blue "#286983"
-    yellow "#ea9d34"
-    magenta "#907aa9"
-    orange "#d7827e"
-    cyan "#56949f"
-    black "#575279"
-    white "#e5e9f0"
-  }
-  dayfox {
-    bg "#f6f2ee"
-    fg "#3d2b5a"
-    red "#a5222f"
-    green "#396847"
-    blue "#2848a9"
-    yellow "#ac5402"
-    magenta "#6e33ce"
-    orange "#955f61"
-    cyan "#287980"
-    black "#352c24"
-    white "#f2e9e1"
+  terafox {
+    bg "#152528"
+    fg "#e6eaea"
+    red "#e85c51"
+    green "#7aa4a1"
+    blue "#5a93aa"
+    yellow "#fda47f"
+    magenta "#ad5c7c"
+    orange "#ff8349"
+    cyan "#a1cdd8"
+    black "#254147"
+    white "#587b7b"
   }
 }
diff --git a/lua/nightfox/extra/zellij.lua b/lua/nightfox/extra/zellij.lua
@@ -11,9 +11,15 @@ function M.generate(specs)
 themes {
 ]]
 
-  for _, spec in pairs(specs) do
+  local keys = vim.tbl_keys(specs)
+  table.sort(keys)
+
+  for _, name in ipairs(keys) do
+    local spec = specs[name]
+    spec.name = name
+
     local content = [[
-  ${palette.meta.name} {
+  ${name} {
     bg "${bg1}"
     fg "${fg1}"
     red "${palette.red}"
@@ -23,12 +29,13 @@ themes {
     magenta "${palette.magenta}"
     orange "${palette.orange}"
     cyan "${palette.cyan}"
-    black "${palette.black}"
-    white "${palette.white}"
+    black "${bg3}"
+    white "${fg3}"
   }
 ]]
     lines[#lines + 1] = template.parse_template_str(content, spec)
   end
+
   lines[#lines + 1] = "}"
 
   return table.concat(lines)