Merge 90795a506a into ef413736e9

modules/plugins/notes/neorg/config.nix

@@ -28,24 +28,7 @@ in {
         };
 
         pluginRC.neorg = entryAnywhere ''
-          -- Treesitter configuration
+          require('neorg').setup(${toLuaObject cfg.setupOpts})
-          require('nvim-treesitter.configs').setup {
-
-            -- If TS highlights are not enabled at all, or disabled via `disable` prop,
-            -- highlighting will fallback to default Vim syntax highlighting
-            highlight = {
-              enable = true,
-              -- Required for spellcheck, some LaTex highlights and
-              -- code block highlights that do not have ts grammar
-              additional_vim_regex_highlighting = {'neorg'},
-            },
-          }
-
-          require('neorg').setup{
-          ${cfg.setupOpts}
-          }
-
-          vim.wo.conceallevel = 2
         '';
       };
     }

modules/plugins/notes/neorg/neorg.nix

@@ -5,31 +5,30 @@
   ...
 }: let
   inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.types) lines;
+  inherit (lib.types) submodule listOf str;
   inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption;
 in {
   options.vim.notes.neorg = {
     enable = mkEnableOption "neorg: Neovim plugin for Neorg";
 
-    setupOpts = mkOption {
+    setupOpts = mkPluginSetupOption "Neorg" {
-      type = lines;
+      load = {
-      default = ''
+        "core.defaults" = mkOption {
+          default = {};
 
-        load = {
+          type = submodule {
-          ['core.defaults'] = {}, -- Loads default behaviour
+            options = {
-          ['core.concealer'] = {}, -- Adds pretty icons to your documents
+              enable = mkEnableOption "A wrapper to interface with several different completion engines.";
-          ['core.export'] = {}, -- Adds export options
+              config = {
-          ['core.integrations.telescope'] = {}, -- Telescope integration
+                disable = mkOption {
-          ['core.dirman'] = { -- Manages Neorg workspaces
+                  type = listOf str;
-            config = {
+                  default = [];
-              workspaces = {
+                };
-                notes = '~/Documents/neorg',
+              };
-              },
+            };
-            },
+          };
-          },
+        };
-        },
+      };
-      '';
-      description = "Neorg configuration";
     };
 
     treesitter = {