From 3d5ebb27bdf7dae2ae28806fc4a9cd94eb64cde3 Mon Sep 17 00:00:00 2001 From: nullchilly Date: Thu, 14 Jul 2022 11:31:20 +0700 Subject: [PATCH 1/2] fix(compile): nil --- lua/catppuccin/lib/compiler.lua | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/lua/catppuccin/lib/compiler.lua b/lua/catppuccin/lib/compiler.lua index 74992d3..69eb94c 100644 --- a/lua/catppuccin/lib/compiler.lua +++ b/lua/catppuccin/lib/compiler.lua @@ -61,27 +61,9 @@ vim.g.colors_name = "catppuccin"]], end end - if config.term_colors then - local colors = { - "overlay0", - "red", - "green", - "yellow", - "blue", - "pink", - "sky", - "text", - "overlay1", - "red", - "green", - "yellow", - "blue", - "pink", - "sky", - "text", - } - for i = 0, 15 do - table.insert(lines, fmt('vim.g.terminal_color_%d = "%s"', i, theme.terminal[colors[i + 1]])) + if config.term_colors == true then + for k, v in pairs(theme.terminal) do + table.insert(lines, fmt('vim.g.%s = "%s"', k, v)) end end os.execute( From b8c35b772034cbee581ecce5f205660ab7fae42f Mon Sep 17 00:00:00 2001 From: nullchilly Date: Thu, 14 Jul 2022 11:34:57 +0700 Subject: [PATCH 2/2] fix(compile): fix --- lua/catppuccin/lib/compiler.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/catppuccin/lib/compiler.lua b/lua/catppuccin/lib/compiler.lua index 69eb94c..c49665a 100644 --- a/lua/catppuccin/lib/compiler.lua +++ b/lua/catppuccin/lib/compiler.lua @@ -37,6 +37,7 @@ vim.g.colors_name = "catppuccin"]], end end local tbl = vim.tbl_deep_extend("keep", theme.integrations, theme.editor) + tbl = vim.tbl_deep_extend("keep", theme.syntax, tbl) tbl = vim.tbl_deep_extend("keep", config.custom_highlights, tbl) for group, color in pairs(tbl) do