Merge pull request #119 from NotAShelf/fix/orgmode-grammar

modules/notes/orgmode/config.nix

@@ -7,7 +7,8 @@ with lib;
 with builtins; let
   cfg = config.vim.notes.orgmode;
 in {
-  config = mkIf (cfg.enable) {
+  config = mkIf cfg.enable (mkMerge [
+    {
       vim.startPlugins = [
         "orgmode-nvim"
       ];
@@ -27,7 +28,6 @@ in {
             -- code block highlights that do not have ts grammar
             additional_vim_regex_highlighting = {'org'},
           },
-        ensure_installed = {'org'}, -- Or run :TSUpdate org
         }
 
         require('orgmode').setup({
@@ -35,5 +35,12 @@ in {
           org_default_notes_file = '${cfg.orgDefaultNotesFile}',
         })
       '';
-  };
+    }
+
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+
+      vim.treesitter.grammars = [cfg.treesitter.orgPackage];
+    })
+  ]);
 }

modules/notes/orgmode/orgmode.nix

@@ -1,21 +1,30 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
 with lib;
 with builtins; {
   options.vim.notes.orgmode = {
     enable = mkEnableOption "nvim-orgmode: Neovim plugin for Emac Orgmode. Get the best of both worlds";
+
     orgAgendaFiles = mkOption {
       type = types.str;
       default = "{'~/Documents/org/*', '~/my-orgs/**/*'}";
       description = "List of org files to be used as agenda files.";
     };
+
     orgDefaultNotesFile = mkOption {
       type = types.str;
       default = "~/Documents/org/refile.org";
       description = "Default org file to be used for notes.";
     };
+
+    treesitter = {
+      enable = mkEnableOption "Enable Orgmode treesitter" // {default = config.vim.languages.enableTreesitter;};
+
+      orgPackage = nvim.types.mkGrammarOption pkgs "org";
+    };
   };
 }