From c5276b74bf13e909b8ab3d24729c1de15940eb6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Sat, 3 Jan 2026 00:09:24 +0100
Subject: [PATCH] vanadium/xmonad: set ghostty as main terminal

---
 .../vanadium/home/xmonad/xmonad.hs            | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/nix/configurations/vanadium/home/xmonad/xmonad.hs b/nix/configurations/vanadium/home/xmonad/xmonad.hs
index 90f8e80e..2cf3dfb2 100644
--- a/nix/configurations/vanadium/home/xmonad/xmonad.hs
+++ b/nix/configurations/vanadium/home/xmonad/xmonad.hs
@@ -381,7 +381,17 @@ keybinds =
      )
 
 myTerm :: String
-myTerm = "kitty"
+myTerm = "ghostty"
+
+mkTermProgramCommand :: String -> String -> String
+mkTermProgramCommand termTitle progName =
+  unwords
+    [ "ghostty"
+    , "--title=" <> quote termTitle
+    , "--command=" <> quote progName
+    ]
+  where
+    quote x = "\"" <> x <> "\""
 
 superMask, altMask :: KeyMask
 superMask = mod4Mask
@@ -422,22 +432,22 @@ myScratchpads :: [NamedScratchpad]
 myScratchpads =
   [ NS
       "cmus"
-      (myTerm ++ " -T 'cmus' cmus")
+      (mkTermProgramCommand "cmus" "cmus")
       (title =? "cmus")
       (customFloating centeredFloat)
   , NS
       "btop"
-      (myTerm ++ " -T 'btop' btop")
+      (mkTermProgramCommand "btop" "btop")
       (title =? "btop")
       (customFloating fullFloat)
   , NS
       "pass"
-      (myTerm ++ " -T 'pass' -- fish -i -c 'while :; fzf-pass; end'")
+      (mkTermProgramCommand "pass" "fish -i -c 'while :; fzf-pass; end'")
       (title =? "pass")
       (customFloating smallFloat)
   , NS
       "emoji-picker"
-      (myTerm ++ " -T 'emoji-picker' -- fish -i -c 'while :; emoji-picker; end'")
+      (mkTermProgramCommand "emoji-picker" "fish -i -c 'while :; emoji-picker; end'")
       (title =? "emoji-picker")
       (customFloating smallFloat)
   ]