Update how options and colorscheme is set (#12)

* Update loading of colorscheme

* Fix typo

* Fix setting of style

* Fix highlighting

* Unpack style

* Add empty table if props are nil

* Fix concat of tables

* Fix typo

* Update settings

* Add call set in settings

* Add deep extend

* Remove style field

* Update README

BREAKING CHANGE: updates how the colorscheme is set and the structure of the options table

6 files changed, 44 insertions, 22 deletions

diff --git a/lua/no-clown-fiesta/highlight-group/hop.lua b/lua/no-clown-fiesta/highlight-group/hop.lua
index 341c6ff..caa16b2 100644
--- a/lua/no-clown-fiesta/highlight-group/hop.lua
+++ b/lua/no-clown-fiesta/highlight-group/hop.lua
@@ -2,8 +2,8 @@ local M = {}
 
 function M.highlight(palette)
   return {
-    HopNextKey = { fg = palette.cyan, style = "bold" },
-    HopNextKey1 = { fg = palette.red, style = "bold" },
+    HopNextKey = { fg = palette.cyan, bold = true },
+    HopNextKey1 = { fg = palette.red, bold = true },
     HopNextKey2 = { fg = palette.gray_blue },
     HopUnmatched = { fg = palette.gray },
   }
diff --git a/lua/no-clown-fiesta/highlight-group/lsp.lua b/lua/no-clown-fiesta/highlight-group/lsp.lua
index daf87f9..5ebfc34 100644
--- a/lua/no-clown-fiesta/highlight-group/lsp.lua
+++ b/lua/no-clown-fiesta/highlight-group/lsp.lua
@@ -35,11 +35,11 @@ function M.highlight(palette)
     LspDiagnosticsHint = { fg = palette.hint_blue },
     DiagnosticUnderlineError = {
       sp = palette.error_red,
-      style = "undercurl",
+      undercurl = true,
     },
-    DiagnosticUnderlineWarn = { sp = palette.warning_orange, style = "NONE" },
-    DiagnosticUnderlineInfo = { sp = palette.hint_blue, style = "NONE" },
-    DiagnosticUnderlineHint = { sp = palette.hint_blue, style = "NONE" },
+    DiagnosticUnderlineWarn = { sp = palette.warning_orange },
+    DiagnosticUnderlineInfo = { sp = palette.hint_blue },
+    DiagnosticUnderlineHint = { sp = palette.hint_blue },
     LspReferenceRead = { bg = "#36383F" },
     LspReferenceText = { bg = "#36383F" },
     LspReferenceWrite = { bg = "#36383f" },
diff --git a/lua/no-clown-fiesta/highlight-group/markdown.lua b/lua/no-clown-fiesta/highlight-group/markdown.lua
index 28ece3b..6147a25 100644
--- a/lua/no-clown-fiesta/highlight-group/markdown.lua
+++ b/lua/no-clown-fiesta/highlight-group/markdown.lua
@@ -3,7 +3,7 @@ local M = {}
 function M.highlight(palette)
   return {
     markdownBlockquote = { fg = palette.accent },
-    markdownBold = { fg = palette.yellow, style = "bold" },
+    markdownBold = { fg = palette.yellow, bold = true },
     markdownCode = { fg = palette.green },
     markdownCodeBlock = { fg = palette.green },
     markdownCodeDelimiter = { fg = palette.green },
@@ -19,12 +19,12 @@ function M.highlight(palette)
     markdownIdDeclaration = { fg = palette.blue },
     markdownIdDelimiter = { fg = palette.light_gray },
     markdownLinkDelimiter = { fg = palette.light_gray },
-    markdownItalic = { style = "italic" },
+    markdownItalic = { italic = true },
     markdownLinkText = { fg = palette.blue },
     markdownListMarker = { fg = palette.red },
     markdownOrderedListMarker = { fg = palette.red },
     markdownRule = { fg = palette.accent },
-    markdownUrl = { fg = palette.cyan, style = "underline" },
+    markdownUrl = { fg = palette.cyan, underline = true },
   }
 end
 
diff --git a/lua/no-clown-fiesta/highlight-group/nvim-tree.lua b/lua/no-clown-fiesta/highlight-group/nvim-tree.lua
index ffe7897..21cdc25 100644
--- a/lua/no-clown-fiesta/highlight-group/nvim-tree.lua
+++ b/lua/no-clown-fiesta/highlight-group/nvim-tree.lua
@@ -7,7 +7,7 @@ function M.highlight(palette)
     NvimTreeNormal = { fg = palette.light_gray, bg = palette.alt_bg },
     NvimTreeVertSplit = { fg = palette.alt_bg, bg = palette.alt_bg },
     NvimTreeFolderName = { fg = palette.white },
-    NvimTreeOpenedFolderName = { fg = palette.white, style = "bold" },
+    NvimTreeOpenedFolderName = { fg = palette.white, bold = true },
     NvimTreeEmptyFolderName = { fg = palette.medium_gray },
     NvimTreeGitIgnored = { fg = palette.medium_gray },
     NvimTreeImageFile = { fg = palette.light_gray },
@@ -22,7 +22,7 @@ function M.highlight(palette)
     NvimTreeGitMerge = { fg = palette.info_yellow },
     NvimTreeGitDirty = { fg = palette.info_yellow },
     NvimTreeSymlink = { fg = palette.cyan },
-    NvimTreeRootFolder = { fg = palette.fg, style = "bold" },
+    NvimTreeRootFolder = { fg = palette.fg, bold = true },
     NvimTreeExecFile = { fg = palette.green },
     NvimTreeStatusLine = { fg = palette.alt_bg, bg = palette.alt_bg },
     NvimTreeStatusLineNC = { fg = palette.alt_bg, bg = palette.alt_bg },
diff --git a/lua/no-clown-fiesta/highlight-group/telescope.lua b/lua/no-clown-fiesta/highlight-group/telescope.lua
index 211e21e..1a0971c 100644
--- a/lua/no-clown-fiesta/highlight-group/telescope.lua
+++ b/lua/no-clown-fiesta/highlight-group/telescope.lua
@@ -4,7 +4,7 @@ function M.highlight(palette)
   return {
     TelescopeNormal = { fg = palette.fg, bg = palette.bg },
     TelescopeSelection = { fg = palette.fg, bg = palette.accent },
-    TelescopeMatching = { fg = palette.info_yellow, style = "bold" },
+    TelescopeMatching = { fg = palette.info_yellow, bold = true },
     TelescopeBorder = { fg = palette.fg, bg = palette.bg },
   }
 end
diff --git a/lua/no-clown-fiesta/highlight-group/treesitter.lua b/lua/no-clown-fiesta/highlight-group/treesitter.lua
index 6d5f8c6..fb3d1c1 100644
--- a/lua/no-clown-fiesta/highlight-group/treesitter.lua
+++ b/lua/no-clown-fiesta/highlight-group/treesitter.lua
@@ -1,18 +1,32 @@
 local M = {}
 
-function M.highlight(palette, opts)
+local unpack = unpack
+
+function M.highlight(palette, options)
   return {
-    ["@comment"] = { fg = palette.medium_gray, style = opts.comments },
+    ["@comment"] = vim.tbl_extend(
+      "force",
+      { fg = palette.medium_gray },
+      options.styles.comments
+    ),
     ["@annotation"] = { fg = palette.white },
     ["@attribute"] = { fg = palette.white },
     ["@constructor"] = { fg = palette.cyan },
-    ["@type"] = { fg = palette.white, style = opts.type },
+    ["@type"] = vim.tbl_extend("force", { fg = palette.white }, options.styles.type),
     ["@type.builtin"] = { fg = palette.white },
     ["@conditional"] = { fg = palette.gray_blue },
     ["@exception"] = { fg = palette.red },
     ["@include"] = { fg = palette.red },
-    ["@keyword"] = { fg = palette.gray_blue, style = opts.keywords },
-    ["@keyword.function"] = { fg = palette.gray_blue, style = opts.keywords },
+    ["@keyword"] = vim.tbl_extend(
+      "force",
+      { fg = palette.gray_blue },
+      options.styles.keywords
+    ),
+    ["@keyword.function"] = vim.tbl_extend(
+      "force",
+      { fg = palette.gray_blue },
+      options.styles.keywords
+    ),
     ["@label"] = { fg = palette.white },
     ["@namespace"] = { fg = palette.white },
     ["@repeat"] = { fg = palette.gray_blue },
@@ -23,12 +37,20 @@ function M.highlight(palette, opts)
     ["@boolean"] = { fg = palette.red },
     ["@character"] = { fg = palette.light_green },
     ["@error"] = { fg = palette.error_red },
-    ["@function"] = { fg = palette.cyan, style = opts.functions },
+    ["@function"] = vim.tbl_extend(
+      "force",
+      { fg = palette.cyan },
+      options.styles.functions
+    ),
     ["@function.builtin"] = { fg = palette.cyan },
     ["@method"] = { fg = palette.cyan },
     ["@const.macro"] = { fg = palette.cyan },
     ["@function.macro"] = { fg = palette.cyan },
-    ["@variable"] = { fg = palette.white, style = opts.variables },
+    ["@variable"] = vim.tbl_extend(
+      "force",
+      { fg = palette.white },
+      options.styles.variables
+    ),
     ["@variable.builtin"] = { fg = palette.white },
     ["@property"] = { fg = palette.white },
     ["@operator"] = { fg = palette.white },
@@ -45,11 +67,11 @@ function M.highlight(palette, opts)
     ["@string.regex"] = { fg = palette.medium_gray_blue },
     ["@string.escape"] = { fg = palette.medium_gray_blue },
     ["@tag"] = { fg = palette.pale_purple },
-    ["@emphasis"] = { style = "italic" },
-    ["@underline"] = { style = "underline" },
+    ["@emphasis"] = { italic = true },
+    ["@underline"] = { underline = true },
     ["@title"] = { fg = palette.medium_gray },
     ["@literal"] = { fg = palette.medium_gray },
-    ["@uri"] = { fg = palette.cyan, style = "underline" },
+    ["@uri"] = { fg = palette.cyan, underline = true },
     ["@keyword.operator"] = { fg = palette.gray_blue },
     ["@structure"] = { fg = palette.purple_test },
     ["@strong"] = { fg = palette.medium_gray },