all: updates

modules/emacs/default.nix

@@ -3,22 +3,6 @@
     (with inputs.emacs-overlay.overlays; [
       emacs
       package
-
-      (final: prev: {
-        tree-sitter = prev.tree-sitter.override {
-          extraGrammars = {
-            tree-sitter-astro = {
-              version = "master";
-              src = pkgs.fetchFromGitHub {
-                owner = "virchau13";
-                repo = "tree-sitter-astro";
-                rev = "0ad33e32ae9726e151d16ca20ba3e507ff65e01f";
-                sha256 = "LhehKOhCDPExEgEiOj3TiuFk8/DohzYhy/9GmUSxaIg=";
-              };
-            };
-          };
-        };
-      })
     ]);
 
   tree-sitter-parsers = grammars: with grammars; [
@@ -56,15 +40,25 @@
     tree-sitter-toml
     tree-sitter-tsx
     tree-sitter-typescript
-    tree-sitter-astro
     tree-sitter-vim
     tree-sitter-yaml
     tree-sitter-zig
+    (pkgs.tree-sitter.buildGrammar {
+      language = "astro";
+      version = "master";
+      src = pkgs.fetchFromGitHub {
+        owner = "virchau13";
+        repo = "tree-sitter-astro";
+        rev = "0ad33e32ae9726e151d16ca20ba3e507ff65e01f";
+        sha256 = "LhehKOhCDPExEgEiOj3TiuFk8/DohzYhy/9GmUSxaIg=";
+      };
+    })
   ];
 
   custom-emacs =
     with newpkgs;
     ((emacsPackagesFor (emacs30-pgtk.override { withNativeCompilation = true; })).emacsWithPackages (epkgs: with epkgs; [
+      aidermacs transient
       avy
       better-jumper
       company
@@ -89,6 +83,7 @@
       lsp-ui
       lsp-haskell
       lsp-java
+      dap-mode
       magit
       markdown-mode
       nasm-mode
@@ -107,7 +102,14 @@
       use-package
       vertico
       which-key
-      melpaPackages.ws-butler
+      (melpaPackages.ws-butler.overrideAttrs { # https://github.com/nix-community/emacs-overlay/issues/499
+        src = pkgs.fetchFromSavannah {
+          repo = "emacs/nongnu";
+          rev = "9ee5a7657a22e836618813c2e2b64a548d27d2f";
+          hash = "sha256-S9aFJcFMkyB1KozJc9hpwKjAMkOyEnCZ6Wf3JVZ8d0c=";
+        };
+      })
+      minuet
       zig-ts-mode
     ]));
 in {