From 9aff8bacd76b7c456b4d765eb8724ab263b606a7 Mon Sep 17 00:00:00 2001
From: Wong Ding Feng <dingfengwong@gmail.com>
Date: Mon, 19 Jan 2026 01:23:12 +0800
Subject: [PATCH] test

---
 darwin/skhd.nix               | 2 +-
 darwin/yabai.nix              | 3 +++
 doom.d/config.el              | 5 ++++-
 home-manager/modules/fish.nix | 9 ---------
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/darwin/skhd.nix b/darwin/skhd.nix
index 4a5d0c8..42a5524 100644
--- a/darwin/skhd.nix
+++ b/darwin/skhd.nix
@@ -103,7 +103,7 @@ in {
 
       ## Misc
       # Open new Kitty window
-      ${super} - return : kitty --single-instance
+      ${super} - return : kitty --single-instance -d ~
       # Bring Kitty window to current space
       ${super} - o : yabai -m window $(yabai -m query --windows | jq '.[] | select(.app==".kitty-wrapped") | .id') --space $(yabai -m query --spaces | jq '.[] | select(.has-focus==1) .id')
     '';
diff --git a/darwin/yabai.nix b/darwin/yabai.nix
index e8934c5..4827851 100644
--- a/darwin/yabai.nix
+++ b/darwin/yabai.nix
@@ -35,6 +35,9 @@
     };
     
     extraConfig = ''
+      # Emacs (emacsMacport) - explicitly manage for proper tiling
+      yabai -m rule --add app="^Emacs$" manage=on
+      
       # rules - apps to ignore (manage=off)
       yabai -m rule --add app="^Genshin Impact$" manage=off
       yabai -m rule --add app="^LuLu$" manage=off
diff --git a/doom.d/config.el b/doom.d/config.el
index bf18150..9de2ecf 100644
--- a/doom.d/config.el
+++ b/doom.d/config.el
@@ -89,7 +89,10 @@
 (when (eq system-type 'darwin)
   ;; Use Command key as Meta
   (setq mac-command-modifier 'meta
-        mac-option-modifier 'super))
+u       mac-option-modifier 'super)
+  ;; Enable menu-bar for yabai tiling compatibility
+  ;; Without this, yabai can't detect Emacs windows properly
+  (menu-bar-mode 1))
 
 ;; Better defaults for coding
 (setq-default indent-tabs-mode nil
diff --git a/home-manager/modules/fish.nix b/home-manager/modules/fish.nix
index 347704b..057cd17 100644
--- a/home-manager/modules/fish.nix
+++ b/home-manager/modules/fish.nix
@@ -26,9 +26,6 @@
       # 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; }
@@ -47,9 +44,6 @@
       # 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; }
 
@@ -72,9 +66,6 @@
       # plugin-sudope: Quickly put 'sudo' in your command
       { name = "plugin-sudope"; src = plugin-sudope.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; }