TerminalFont (macOS): fix ghostty font detection; default to `JetBrai…

…ns Mono` Ref: #1466 (comment)
fastfetch-cli · Dec 30, 2024 · 2ab2dd4 · 2ab2dd4
1 parent 2a83b86
commit 2ab2dd4
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/detection/terminalfont/terminalfont.c b/src/detection/terminalfont/terminalfont.c
@@ -58,14 +58,18 @@ static void detectGhostty(FFTerminalFontResult* terminalFont)
         {"font-size =", &fontSize},
     };
 
-    if (!ffParsePropFileConfigValues("ghostty/config", 2, fontQueryToml))
-    {
+    if (
+        #if __APPLE__
+        !ffParsePropFileConfigValues("com.mitchellh.ghostty/config", 2, fontQueryToml) &&
+        #endif
+        !ffParsePropFileConfigValues("ghostty/config", 2, fontQueryToml)
+    ) {
         ffStrbufAppendS(&terminalFont->error, "Couldn't find file `ghostty/config`");
         return;
     }
 
     if(fontName.length == 0)
-        ffStrbufAppendS(&fontName, "monospace");
+        ffStrbufAppendS(&fontName, "JetBrains Mono");
 
     if(fontSize.length == 0)
         ffStrbufAppendS(&fontSize, "13");