nvim: remove org-mode

machines/Lilim/options.nix

@@ -52,7 +52,6 @@
       "nvim::lualine"
       "nvim::nvim-highlight"
       "nvim::oil-nvim"
-      "nvim::orgmode"
       "nvim::sniprun"
       "nvim::telescope"
       "nvim::tmux-navigate"

pkgsets/nvim/orgmode.nix

@@ -1,40 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}:
-
-lib.mkIf (lib.elem "nvim::orgmode" config.machine.pkgs) {
-  programs.nvim-lazy.lazyPlugins = [
-    {
-      lazy = true;
-      dir = vPlug: vPlug.orgmode;
-      event = [ "VeryLazy" ];
-      ft = [ "org" ];
-      dependencies = (
-        vPlug: with vPlug; [
-          vim-table-mode
-          "akinsho/org-bullets.nvim"
-        ]
-      );
-      opts = {
-        org_hide_leading_stars = true;
-        org_log_done = true;
-        org_startup_folded = "showeverything";
-        org_startup_indented = true;
-        org_adapt_indentation = false;
-        org_agenda_files = "~/org/**/*";
-        org_default_notes_file = "~/org/refile.org";
-      };
-    }
-    {
-      lazy = true;
-      short = "akinsho/org-bullets.nvim";
-      opts = { };
-    }
-    {
-      lazy = true;
-      dir = vPlug: vPlug.vim-table-mode;
-    }
-  ];
-}

pkgsets/nvim/treesitter.nix

@@ -8,23 +8,7 @@
 lib.mkIf (lib.elem "nvim::treesitter" config.machine.pkgs) {
   programs.nvim-lazy.lazyPlugins =
     let
-      org-grammar = pkgs.tree-sitter.buildGrammar {
+      treesitter = pkgs.vimPlugins.nvim-treesitter.withAllGrammars;
-        language = "org";
-        version = "1.0";
-        src = pkgs.fetchFromGitHub {
-          owner = "nvim-orgmode";
-          repo = "tree-sitter-org";
-          rev = "436c2dec440e6ad40be98f3b712537bbb08bef0b";
-          hash = "sha256-k/i+7/K6puXg554BWSLHIDlOXElUovOwOEe5i1Q95L8=";
-        };
-      };
-      # all grammars except replace org-mode
-      treesitter = pkgs.vimPlugins.nvim-treesitter.withPlugins (
-        _:
-        (lib.filter (grammar: grammar.pname != "org-grammar") pkgs.vimPlugins.nvim-treesitter.allGrammars)
-        ++ [ org-grammar ]
-      );
-      #treesitter = pkgs.vimPlugins.nvim-treesitter.withAllGrammars;
       grammars = pkgs.symlinkJoin {
         name = "treesitter-parsers";
         paths = treesitter.dependencies;