t

home-manager/modules/doom-emacs.nix

@@ -22,12 +22,13 @@ in {
     # Must be an absolute path
     doomLocalDir = "${config.home.homeDirectory}/.local/share/nix-doom";
 
-    # Use emacs-pgtk for better Wayland support on Linux
-    # On macOS, use emacsMacport for yabai compatibility (proper AX roles)
+    # Use emacs30-pgtk for Wayland support on Linux
+    # On macOS, use emacs30 from emacs-overlay (native-comp, tree-sitter)
+    # fix-window-role.patch applied via overlay for yabai compatibility
     emacs =
       if pkgs.stdenv.isLinux
-      then pkgs.emacs-pgtk
-      else pkgs.emacsMacport;
+      then pkgs.emacs30-pgtk
+      else pkgs.emacs30;
 
     # Extra packages to make available (tree-sitter grammars, etc.)
     # Tree-sitter grammars are not installed automatically by Doom
@@ -68,4 +69,10 @@ in {
   # Ensure doom directories exist
   home.file.".local/share/nix-doom/.keep".text = "";
 
+  # Install fonts referenced in doom.d/config.el
+  home.packages = with pkgs; [
+    jetbrains-mono
+    inter
+  ];
+
 }