fix preset icons

nvim-neorg · May 19, 2023 · 881996f · 881996f
1 parent 4127bf2
commit 881996f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 54 deletions.
diff --git a/lua/neorg/modules/core/concealer/module.lua b/lua/neorg/modules/core/concealer/module.lua
@@ -903,6 +903,18 @@ module.on_event = function(event)
 end
 
 module.load = function()
+    if not module.config.private["icon_preset_" .. module.config.public.icon_preset] then
+        log.error(("Unable to load icon preset '%s' - such a preset does not exist"):format(module.config.public.icon_preset))
+        return
+    end
+
+    module.config.public.icons = vim.tbl_deep_extend(
+        "force",
+        module.config.public.icons,
+        module.config.private["icon_preset_" .. module.config.public.icon_preset] or {},
+        module.config.custom
+    )
+
     module.required["core.autocommands"].enable_autocommand("BufRead")
     module.required["core.autocommands"].enable_autocommand("InsertEnter")
     module.required["core.autocommands"].enable_autocommand("InsertLeave")

diff --git a/lua/neorg/modules/core/concealer/preset_diamond.lua b/lua/neorg/modules/core/concealer/preset_diamond.lua
@@ -2,35 +2,7 @@ local module = neorg.modules.extend("core.concealer.preset_diamond", "core.conce
 
 module.config.private.icon_preset_diamond = {
     heading = {
-        enabled = true,
-
-        level_1 = {
-            icon = "◈",
-        },
-
-        level_2 = {
-            icon = " ◇",
-        },
-
-        level_3 = {
-            icon = "  ◆",
-        },
-
-        level_4 = {
-            icon = "   ⋄",
-        },
-
-        level_5 = {
-            icon = "    ❖",
-        },
-
-        level_6 = {
-            icon = "     ⟡",
-        },
-    },
-
-    marker = {
-        icon = "",
+        icons = { "◈", "◇", "◆", "⋄", "❖", "⟡" },
     },
 
     footnote = {

diff --git a/lua/neorg/modules/core/concealer/preset_varied.lua b/lua/neorg/modules/core/concealer/preset_varied.lua
@@ -2,31 +2,7 @@ local module = neorg.modules.extend("core.concealer.preset_varied", "core.concea
 
 module.config.private.icon_preset_varied = {
     heading = {
-        enabled = true,
-
-        level_1 = {
-            icon = "◉",
-        },
-
-        level_2 = {
-            icon = " ◆",
-        },
-
-        level_3 = {
-            icon = "  ✿",
-        },
-
-        level_4 = {
-            icon = "   ○",
-        },
-
-        level_5 = {
-            icon = "    ▶",
-        },
-
-        level_6 = {
-            icon = "     ⤷",
-        },
+        icons = { "◉", "◆", "✿", "○", "▶", "⤷" },
     },
 
     footnote = {