Merge pull request #1078 from diced/fix-ts

languages/ts: add `typescript` treesitter grammar

Author: NotAShelf

docs/release-notes/rl-0.8.md

@@ -517,3 +517,8 @@
 
 - Add [EEx Treesitter Grammar](https://github.com/connorlay/tree-sitter-eex) for Elixir
 - Add [HEEx Treesitter Grammar](https://github.com/phoenixframework/tree-sitter-heex) for Elixir
+
+[diced](https://github.com/diced):
+
+- Fixed `typescript` treesitter grammar not being included by default.
+

modules/plugins/languages/ts.nix

@@ -219,7 +219,8 @@ in {
 
     treesitter = {
       enable = mkEnableOption "Typescript/Javascript treesitter" // {default = config.vim.languages.enableTreesitter;};
-      tsPackage = mkGrammarOption pkgs "tsx";
+      tsPackage = mkGrammarOption pkgs "typescript";
+      tsxPackage = mkGrammarOption pkgs "tsx";
       jsPackage = mkGrammarOption pkgs "javascript";
     };
 
@@ -283,7 +284,11 @@ in {
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.treesitter.enable {
       vim.treesitter.enable = true;
-      vim.treesitter.grammars = [cfg.treesitter.tsPackage cfg.treesitter.jsPackage];
+      vim.treesitter.grammars = [
+        cfg.treesitter.tsPackage
+        cfg.treesitter.tsxPackage
+        cfg.treesitter.jsPackage
+      ];
     })
 
     (mkIf cfg.lsp.enable {