9 files changed, 56 insertions, 1 deletions
diff --git a/user/settings/accounting.nix b/user/settings/accounting.nix
index 664ca083..d87afd43 100644
--- a/user/settings/accounting.nix
+++ b/user/settings/accounting.nix
@@ -9,4 +9,10 @@
     beancount
     reckon
   ];
+  programs.emacs.extraPackages = epkgs: (with epkgs; [
+    (treesit-grammars.with-grammars (grammars: with grammars; [
+      tree-sitter-beancount
+      tree-sitter-ledger
+    ]))
+  ]);
 }
diff --git a/user/settings/development/base.nix b/user/settings/development/base.nix
index 0dce4fe0..83ec0334 100644
--- a/user/settings/development/base.nix
+++ b/user/settings/development/base.nix
@@ -46,6 +46,17 @@
     LIMA_INSTANCE = "nixos";
   };
 
+  programs.emacs.extraPackages = epkgs: (with epkgs; [
+    (treesit-grammars.with-grammars (grammars: with grammars; [
+      tree-sitter-bash
+      tree-sitter-fish
+      tree-sitter-just
+      tree-sitter-make
+      tree-sitter-dockerfile
+      tree-sitter-sql
+    ]))
+  ]);
+
   editorconfig = {
     enable = true;
     settings = {
diff --git a/user/settings/development/clojure.nix b/user/settings/development/clojure.nix
index b4b11c55..ad6f19ba 100644
--- a/user/settings/development/clojure.nix
+++ b/user/settings/development/clojure.nix
@@ -9,5 +9,8 @@
   programs.emacs.extraPackages = epkgs: (with epkgs; [
     cider
     clojure-mode
+    (treesit-grammars.with-grammars (grammars: with grammars; [
+      tree-sitter-clojure
+    ]))
   ]);
 }
diff --git a/user/settings/development/golang.nix b/user/settings/development/golang.nix
index 220fd776..ef6cf412 100644
--- a/user/settings/development/golang.nix
+++ b/user/settings/development/golang.nix
@@ -30,6 +30,12 @@
     go-eldoc
     go-tag
     templ-ts-mode
+    (treesit-grammars.with-grammars (grammars: with grammars; [
+      tree-sitter-go
+      tree-sitter-gowork
+      tree-sitter-gomod
+      tree-sitter-templ
+    ]))
   ]);
   programs.neovim.plugins = with pkgs.vimPlugins; [
     coc-go
diff --git a/user/settings/development/javascript.nix b/user/settings/development/javascript.nix
index ccf0e09d..61ddfde4 100644
--- a/user/settings/development/javascript.nix
+++ b/user/settings/development/javascript.nix
@@ -25,6 +25,13 @@
   programs.emacs.extraPackages = epkgs: (with epkgs; [
     astro-ts-mode
     svelte-mode
+    (treesit-grammars.with-grammars (grammars: with grammars; [
+      tree-sitter-jsdoc
+      tree-sitter-svelte
+      tree-sitter-tsx
+      tree-sitter-typescript
+      tree-sitter-javascript
+    ]))
   ]);
 
   home.shellAliases = {
diff --git a/user/settings/development/lisp.nix b/user/settings/development/lisp.nix
index ddf0803a..e7652b46 100644
--- a/user/settings/development/lisp.nix
+++ b/user/settings/development/lisp.nix
@@ -11,6 +11,12 @@
     ccl
   ];
 
+  programs.emacs.extraPackages = epkgs: (with epkgs; [
+    (treesit-grammars.with-grammars (grammars: with grammars; [
+      tree-sitter-commonlisp
+    ]))
+  ]);
+
   programs.git.attributes = [
     "*.lisp diff=common-lisp"
   ];
diff --git a/user/settings/development/rust.nix b/user/settings/development/rust.nix
index c1b1a9df..cb7f7dfc 100644
--- a/user/settings/development/rust.nix
+++ b/user/settings/development/rust.nix
@@ -10,4 +10,9 @@
     rust-analyzer
     clippy
   ];
+  programs.emacs.extraPackages = epkgs: (with epkgs; [
+    (treesit-grammars.with-grammars (grammars: with grammars; [
+      tree-sitter-rust
+    ]))
+  ]);
 }
diff --git a/user/settings/development/web.nix b/user/settings/development/web.nix
index 2bea361d..34403bc8 100644
--- a/user/settings/development/web.nix
+++ b/user/settings/development/web.nix
@@ -98,6 +98,10 @@
     nginx-mode
     php-mode
     web-mode
+    (treesit-grammars.with-grammars (grammars: with grammars; [
+      tree-sitter-css
+      tree-sitter-html
+    ]))
   ]);
   programs.neovim.plugins = with pkgs.vimPlugins; [
     coc-css
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index 28eae3ea..87ffb628 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -153,8 +153,15 @@ in
         treemacs-evil
         treemacs-magit
         treemacs-nerd-icons
-        treesit-grammars.with-all-grammars
         treesit-auto
+        (treesit-grammars.with-grammars (grammars: with grammars; [
+          tree-sitter-nix
+          tree-sitter-markdown
+          tree-sitter-json
+          tree-sitter-json5
+          tree-sitter-toml
+          tree-sitter-yaml
+        ]))
         try
         ultra-scroll
         vc-msg