Merge eb983c8560 into ef413736e9

modules/plugins/notes/neorg/config.nix

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