test

home-manager/modules/doom-emacs.nix

@@ -23,11 +23,11 @@ in {
     doomLocalDir = "${config.home.homeDirectory}/.local/share/nix-doom";
 
     # Use emacs-pgtk for better Wayland support on Linux
-    # On macOS, falls back to regular emacs
+    # On macOS, use emacsMacport for yabai compatibility (proper AX roles)
     emacs =
       if pkgs.stdenv.isLinux
       then pkgs.emacs-pgtk
-      else pkgs.emacs;
+      else pkgs.emacsMacport;
 
     # Extra packages to make available (tree-sitter grammars, etc.)
     # Tree-sitter grammars are not installed automatically by Doom
@@ -68,19 +68,4 @@ in {
   # Ensure doom directories exist
   home.file.".local/share/nix-doom/.keep".text = "";
 
-  # Shell aliases for Doom Emacs
-  programs.fish.shellAbbrs = lib.mkIf config.programs.fish.enable {
-    em = "emacsclient -c -a emacs";
-    et = "emacsclient -t -a 'emacs -nw'";
-  };
-
-  programs.zsh.shellAliases = lib.mkIf config.programs.zsh.enable {
-    em = "emacsclient -c -a emacs";
-    et = "emacsclient -t -a 'emacs -nw'";
-  };
-
-  programs.bash.shellAliases = lib.mkIf config.programs.bash.enable {
-    em = "emacsclient -c -a emacs";
-    et = "emacsclient -t -a 'emacs -nw'";
-  };
 }

home-manager/modules/fish.nix

@@ -19,27 +19,37 @@
       # z: Jump to frequently used directories (like autojump/zoxide but pure fish)
       { name = "z"; src = z.src; }
 
-      # ── Fuzzy Finding ─────────────────────────────────────────────────────────
-      # fzf-fish: Superior fzf integration - Ctrl+R history, Ctrl+Alt+F files, Ctrl+V vars
-      {
-        name = "fzf.fish";
-        src = pkgs.fetchFromGitHub {
-          owner = "PatrickF1";
-          repo = "fzf.fish";
-          rev = "v10.3";
-          hash = "sha256-T8KYLA/r/gOKvAivKRoeqIwE2pINlxFQtZJHpOy9GMM=";
-        };
-      }
+      # fish-bd: Quickly go back to a parent directory in your working tree
+      { name = "fish-bd"; src = fish-bd.src; }
 
+      # ── Prompt ────────────────────────────────────────────────────────────────
+      # tide: Modern, extensible prompt
       { name = "tide"; src = tide.src; }
 
+      # async-prompt: Make your prompt asynchronous for better reactivity
+      { name = "async-prompt"; src = async-prompt.src; }
+
+      # ── Fuzzy Finding ─────────────────────────────────────────────────────────
+      # fzf-fish: Superior fzf integration - Ctrl+R history, Ctrl+Alt+F files, Ctrl+V vars
+      { name = "fzf.fish"; src = fzf-fish.src; }
+
+      # fifc: Fzf powers on top of fish completion engine with customizable rules
+      { name = "fifc"; src = fifc.src; }
+
+      # ── Git Integration ───────────────────────────────────────────────────────
       # forgit: Interactive git with fzf (ga, glo, gi, gd, grh, gcf, gss, gclean)
       { name = "forgit"; src = forgit.src; }
 
+      # plugin-git: Git aliases and status helpers (similar to oh-my-zsh git)
+      { name = "plugin-git"; src = plugin-git.src; }
+
       # ── Quality of Life ───────────────────────────────────────────────────────
       # autopair: Auto-insert matching brackets, quotes, etc.
       { name = "autopair"; src = autopair.src; }
 
+      # pisces: Paired symbols in the command line
+      { name = "pisces"; src = pisces.src; }
+
       # done: Notifications when long-running commands complete
       { name = "done"; src = done.src; }
 
@@ -49,12 +59,8 @@
       # puffer: Text expansions (!! for last command, !$ for last argument)
       { name = "puffer"; src = puffer.src; }
 
-      # colored-man-pages: Colorize man pages for better readability
-      { name = "colored-man-pages"; src = colored-man-pages.src; }
-
-      # ── Git Enhancement ───────────────────────────────────────────────────────
-      # plugin-git: Git aliases and status helpers (similar to oh-my-zsh git)
-      { name = "plugin-git"; src = plugin-git.src; }
+      # fish-you-should-use: Reminds you to use your aliases
+      { name = "fish-you-should-use"; src = fish-you-should-use.src; }
 
       # ── Shell Compatibility ───────────────────────────────────────────────────
       # bass: Run bash scripts and capture environment changes
@@ -63,9 +69,31 @@
       # foreign-env: Source files from other shells (bash, zsh env files)
       { name = "foreign-env"; src = foreign-env.src; }
 
+      # plugin-sudope: Quickly put 'sudo' in your command
+      { name = "plugin-sudope"; src = plugin-sudope.src; }
+
+      # fishbang: Bash bang commands for fish
+      { name = "fishbang"; src = fishbang.src; }
+
+      # bang-bang: Bash style history substitution (!! and !$)
+      { name = "bang-bang"; src = bang-bang.src; }
+
       # ── Utility ───────────────────────────────────────────────────────────────
       # grc: Colorize output of common commands (ping, traceroute, make, etc.)
       { name = "grc"; src = grc.src; }
+
+      # colored-man-pages: Colorize man pages for better readability
+      { name = "colored-man-pages"; src = colored-man-pages.src; }
+
+      # spark: Sparklines for Fish
+      { name = "spark"; src = spark.src; }
+
+      # humantime-fish: Turn milliseconds into a human-readable string
+      { name = "humantime-fish"; src = humantime-fish.src; }
+    ] ++ lib.optionals pkgs.stdenv.isDarwin [
+      # ── Platform-Specific (macOS) ─────────────────────────────────────────────
+      # macos: MacOS functions for Fish
+      { name = "macos"; src = macos.src; }
     ];
 
     # ═══════════════════════════════════════════════════════════════════════════