fix: re-enable some of the treeshitter stuff

Author: DieracDelta

flake.lock

@@ -39,10 +39,6 @@
       flake = false;
     };
 
-    rustaceanvim-src = {
-      url = "github:mrcjkb/rustaceanvim";
-      flake = false;
-    };
     gitlinker-nvim-src = {
       url = "github:linrongbin16/gitlinker.nvim";
       flake = false;
@@ -90,11 +86,6 @@
       url = "github:oxalica/nil";
     };
 
-    plenary-nvim-src = {
-      url = "github:nvim-lua/plenary.nvim";
-      flake = false;
-    };
-
     telescope-src = {
       url = "github:nvim-telescope/telescope.nvim";
       flake = false;
@@ -169,10 +160,6 @@
       url = "github:ggandor/leap.nvim";
       flake = false;
     };
-    nvim-autopairs-src = {
-      url = "github:windwp/nvim-autopairs";
-      flake = false;
-    };
 
     nvim-ufo-src = {
       url = "github:kevinhwang91/nvim-ufo";
@@ -189,11 +176,6 @@
     #   flake = false;
     # };
 
-    markid-src = {
-      url = "github:David-Kunz/markid";
-      flake = false;
-    };
-
     copilot-lua-src = {
       url = "github:zbirenbaum/copilot.lua";
       flake = false;
@@ -299,10 +281,6 @@
       flake = false;
     };
 
-    yazi-nvim-src = {
-      url = "github:mikavilpas/yazi.nvim";
-      flake = false;
-    };
   };
 
   outputs =
@@ -457,7 +435,7 @@
             });
         # plugin, config file
         lazyPluginList = with pkgs; [
-          [rustaceanvim "rustaceanvim"]
+          [vimPlugins.rustaceanvim "rustaceanvim"]
           [vimPlugins.haskell-tools-nvim "haskell-tools-nvim"]
           [ferris-nvim "ferris"]
           [parinfer-rust-nvim "parinfer"]
@@ -470,6 +448,7 @@
           vimPlugins.lze
           vimPlugins.lzextras
           colorful-winsep-nvim
+          vimPlugins.markid
 
 
           # essentials
@@ -485,7 +464,7 @@
           telescope-nvim
           vimPlugins.telescope-file-browser-nvim
           telescope-ui-select
-          yazi-nvim
+          vimPlugins.yazi-nvim
 
           # github
           gitlinker-nvim
@@ -505,7 +484,7 @@
           vimPlugins.gitsigns-nvim
 
           # autopairs
-          nvim-autopairs
+          vimPlugins.nvim-autopairs
 
           # lsp
 
@@ -518,7 +497,7 @@
           vimPlugins.lsp_signature-nvim
           vimPlugins.lspkind-nvim
           lsp-config
-          plenary-nvim
+          vimPlugins.plenary-nvim
           vimPlugins.popup-nvim
 
           fidget
@@ -532,11 +511,11 @@
 
           # treesitter
           nvim-async
-          # nvim-ufo
+          vimPlugins.nvim-ufo
           comment-nvim
-          # vimPlugins.nvim-treesitter-context
-          # vimPlugins.nvim-treesitter-textobjects
-          # vimPlugins.nvim-treesitter
+          vimPlugins.nvim-treesitter-context
+          vimPlugins.nvim-treesitter-textobjects
+          vimPlugins.nvim-treesitter
           # (builtins.attrValues ((lib.filterAttrs (n: v: !(builtins.elem v ["comment"]))) pkgs.vimPlugins.nvim-treesitter.grammarPlugins))
 
           # ((pkgs.vimPlugins.nvim-treesitter.overrideAttrs (oldAttrs: {
@@ -549,29 +528,28 @@
           vimPlugins.nvim-ts-autotag
           vimPlugins.rainbow-delimiters-nvim
           vim-illuminate
-          markid
           ts-node-action
 
           # TODO lazy load these
           vimPlugins.typescript-tools-nvim
           vimPlugins.crates-nvim
           coqtail
           coq-lsp-nvim
-        ];
+        ]
         # ++ lib.optional (system != "aarch64-darwin") [
         #   rust-owl.packages.${system}.rustowl-nvim
         # ]
-        # ++
-        #   (pkgs.vimPlugins.nvim-treesitter.grammarPlugins
-        #   |> (lib.filterAttrs (n: _: !(builtins.elem n [ "comment" ])))
-        #   |> builtins.attrValues);
+        ++
+          (pkgs.vimPlugins.nvim-treesitter.grammarPlugins
+          |> (lib.filterAttrs (n: _: !(builtins.elem n [ "comment" ])))
+          |> builtins.attrValues);
         luaModules = [
           "essentials"
           "aesthetics"
           "telescope"
           "github"
           "misc"
-          # "treesitter"
+          "treesitter"
           "git"
           "autopairs"
           "lsp"
@@ -624,7 +602,7 @@
         };
         myNeovim = pkgs.wrapNeovimUnstable
         (pkgs.neovim-unwrapped.overrideAttrs (oldAttrs: {
-          # buildInputs = oldAttrs.buildInputs ++ (with pkgs; [ tree-sitter ]);
+          buildInputs = oldAttrs.buildInputs ++ (with pkgs; [ tree-sitter ]);
         }))
         config;
       in

flake.nix

@@ -81,15 +81,12 @@ with inputs;
   guess-indent = plugin "guess-indent" guess-indent-src;
   leap = plugin "leap" leap-src;
   wilder-nvim = plugin "wilder-nvim" wilder-nvim-src;
-  plenary-nvim = plugin "plenary-nvim" plenary-nvim-src;
-  nvim-autopairs = plugin "nvim-autopairs" nvim-autopairs-src;
   vim-illuminate = plugin "vim-illuminate" vim-illuminate-src;
   nvim-ufo = plugin "nvim-ufo" nvim-ufo-src;
   nvim-async = plugin "nvim-async" nvim-async-src;
   conjure = plugin "conjure" conjure-src;
   lsp-config = plugin "lsp-config" lsp-config-src;
   # lsp_lines = plugin "lsp_lines" lsp_lines-src;
-  markid = plugin "markid" markid-src;
 
   copilot-lua = plugin "copilot-lua" copilot-lua-src;
   copilot-cmp = plugin "copilot-cmp" copilot-cmp-src;
@@ -147,14 +144,10 @@ with inputs;
 
   molten-nvim = plugin "molten-nvim" molten-nvim-src;
 
-  rustaceanvim = plugin "rustaceanvim" rustaceanvim-src;
-
   ferris-nvim = plugin "ferris-nvim" ferris-nvim-src;
 
   gitlinker-nvim = plugin "gitlinker-nvim" gitlinker-nvim-src;
 
-  yazi-nvim = plugin "yazi-nvim" yazi-nvim-src;
-
   coq-lsp-nvim = plugin "coq-lsp-nvim" coq-lsp-nvim-src;
 
   coqtail = plugin "coqtail" coqtail-src;

plugins.nix

@@ -196,8 +196,3 @@ vim.api.nvim_set_keymap(
   { noremap = true, silent = true }
 )
 
-vim.api.nvim_create_autocmd({ "BufReadPost", "FileType" }, {
-  callback = function()
-    vim.treesitter.stop()  -- immediately halt any parser startup
-  end,
-})

required_lua_modules/essentials.lua

@@ -1,7 +1,7 @@
 local z_utils = require("telescope._extensions.zoxide.utils")
 require("telescope").setup {
   defaults = {
-    preview = { treesitter = false, },
+    preview = { treesitter = true, },
     file_ignore_patterns = { "node_modules", "target", "target_dirs" },
     prompt_prefix = "   ",
     selection_caret = "  ",