11 files changed, 64 insertions, 15 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 51cf0ffd..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 = {
@@ -118,7 +129,4 @@
       }
     '';
   };
-  services.lorri = {
-    enable = pkgs.stdenv.isLinux;
-  };
 }
diff --git a/user/settings/development/clojure.nix b/user/settings/development/clojure.nix
index c85bf869..ad6f19ba 100644
--- a/user/settings/development/clojure.nix
+++ b/user/settings/development/clojure.nix
@@ -8,5 +8,9 @@
   ];
   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 81d8c631..61ddfde4 100644
--- a/user/settings/development/javascript.nix
+++ b/user/settings/development/javascript.nix
@@ -22,6 +22,18 @@
     };
   };
 
+  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 = {
     bn = "bun";
     bni = "bun install";
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 13b0ea5c..0212d9fd 100644
--- a/user/settings/development/web.nix
+++ b/user/settings/development/web.nix
@@ -97,6 +97,10 @@
     emmet-mode
     nginx-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 aeb5c454..0ff321b7 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -68,13 +68,11 @@ in
       [
         ace-link
         apheleia
-        astro-ts-mode
         avy
         benchmark-init
+        buffer-terminator
         cape
-        clojure-mode
         cask-mode
-        chatgpt-shell
         corfu
         consult
         consult-dir
@@ -128,7 +126,6 @@ in
         helpful
         jinx
         just-ts-mode
-        justl
         kind-icon
         lua-mode
         lsp-mode
@@ -137,18 +134,17 @@ in
         magit-todos
         markdown-mode
         marginalia
+        minuet
         nerd-icons
         nix-ts-mode
         orderless
         doom-modeline
-        php-mode
         persist-state
         posframe
         quickrun
         rainbow-mode
         rainbow-delimiters
         ssh-deploy
-        svelte-mode
         stimmung-themes
         systemd
         tempel
@@ -158,8 +154,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
diff --git a/user/settings/shell.nix b/user/settings/shell.nix
index e88ccfe8..33130556 100644
--- a/user/settings/shell.nix
+++ b/user/settings/shell.nix
@@ -128,9 +128,6 @@ in
       jt = "just test";
       jr = "just run";
 
-      lw = "lorri watch";
-      lwo = "lorri watch --once";
-
       nsh = "nix-shell";
       nb = "nix build";
       nd = "nix develop";
@@ -151,6 +148,5 @@ in
   };
   home.packages = with pkgs; [
     fzf
-    up
   ];
 }
diff --git a/user/settings/user-interface.nix b/user/settings/user-interface.nix
index cf26430f..a7dde811 100644
--- a/user/settings/user-interface.nix
+++ b/user/settings/user-interface.nix
@@ -42,6 +42,5 @@ in
       kdePackages.neochat
       kdePackages.kleopatra
     ]);
-  services.lorri.enableNotifications = true;
   services.emacs.startWithUserSession = "graphical";
 }