font: use regular JB Mono with dedicated Symbol fontpush-qouskwyzlkmy

Fixes #7069

I'm not sure if this will have follow-on negative effects. In my day to
day usage everything looks fine but its hard to really know. I think our
best chance is to merge this and see what feedback we get. I know for
sure positively that it does two things:

  1. Fixes the small symbols noted in #7069.
  2. Makes our binary size smaller since we no longer have unnecessary
     symbols embedded in our stylized fonts.

10 files changed, 15 insertions, 5 deletions

diff --git a/src/font/SharedGridSet.zig b/src/font/SharedGridSet.zig
index ca535eaf8..8e7a7d540 100644
--- a/src/font/SharedGridSet.zig
+++ b/src/font/SharedGridSet.zig
@@ -291,6 +291,15 @@ fn collection(
             load_options.faceOptions(),
         ) },
     );
+    _ = try c.add(
+        self.alloc,
+        .regular,
+        .{ .fallback_loaded = try Face.init(
+            self.font_lib,
+            font.embedded.symbols,
+            load_options.faceOptions(),
+        ) },
+    );
 
     // On macOS, always search for and add the Apple Emoji font
     // as our preferred emoji font for fallback. We do this in case
diff --git a/src/font/embedded.zig b/src/font/embedded.zig
index 31b07ff31..aea4f6813 100644
--- a/src/font/embedded.zig
+++ b/src/font/embedded.zig
@@ -6,12 +6,13 @@
 //! redistribution and include their license as necessary.
 
 /// Default fonts that we prefer for Ghostty.
-pub const regular = @embedFile("res/JetBrainsMonoNerdFont-Regular.ttf");
-pub const bold = @embedFile("res/JetBrainsMonoNerdFont-Bold.ttf");
-pub const italic = @embedFile("res/JetBrainsMonoNerdFont-Italic.ttf");
-pub const bold_italic = @embedFile("res/JetBrainsMonoNerdFont-BoldItalic.ttf");
+pub const regular = @embedFile("res/JetBrainsMono-Regular.ttf");
+pub const bold = @embedFile("res/JetBrainsMono-Bold.ttf");
+pub const italic = @embedFile("res/JetBrainsMono-Italic.ttf");
+pub const bold_italic = @embedFile("res/JetBrainsMono-BoldItalic.ttf");
 pub const emoji = @embedFile("res/NotoColorEmoji.ttf");
 pub const emoji_text = @embedFile("res/NotoEmoji-Regular.ttf");
+pub const symbols = @embedFile("res/SymbolsNerdFontMono-Regular.ttf");
 
 /// Fonts with general properties
 pub const arabic = @embedFile("res/KawkabMono-Regular.ttf");
@@ -24,7 +25,7 @@ pub const nerd_font = @embedFile("res/JetBrainsMonoNerdFont-Regular.ttf");
 pub const code_new_roman = @embedFile("res/CodeNewRoman-Regular.otf");
 pub const inconsolata = @embedFile("res/Inconsolata-Regular.ttf");
 pub const geist_mono = @embedFile("res/GeistMono-Regular.ttf");
-pub const jetbrains_mono = @embedFile("res/JetBrainsMonoNoNF-Regular.ttf");
+pub const jetbrains_mono = @embedFile("res/JetBrainsMono-Regular.ttf");
 pub const julia_mono = @embedFile("res/JuliaMono-Regular.ttf");
 
 /// Cozette is a unique font because it embeds some emoji characters
diff --git a/src/font/res/JetBrainsMono-Bold.ttf b/src/font/res/JetBrainsMono-Bold.ttf
new file mode 100644
index 000000000..8c93043de
--- /dev/null
+++ b/src/font/res/JetBrainsMono-Bold.ttf
diff --git a/src/font/res/JetBrainsMono-BoldItalic.ttf b/src/font/res/JetBrainsMono-BoldItalic.ttf
new file mode 100644
index 000000000..1ddf216d1
--- /dev/null
+++ b/src/font/res/JetBrainsMono-BoldItalic.ttf
diff --git a/src/font/res/JetBrainsMono-Italic.ttf b/src/font/res/JetBrainsMono-Italic.ttf
new file mode 100644
index 000000000..ccc9d6a5b
--- /dev/null
+++ b/src/font/res/JetBrainsMono-Italic.ttf
diff --git a/src/font/res/JetBrainsMonoNoNF-Regular.ttf b/src/font/res/JetBrainsMono-Regular.ttf
index dff66cc50..dff66cc50 100644
--- a/src/font/res/JetBrainsMonoNoNF-Regular.ttf
+++ b/src/font/res/JetBrainsMono-Regular.ttf
diff --git a/src/font/res/JetBrainsMonoNerdFont-Bold.ttf b/src/font/res/JetBrainsMonoNerdFont-Bold.ttf
deleted file mode 100644
index b82ccbcb8..000000000
--- a/src/font/res/JetBrainsMonoNerdFont-Bold.ttf
+++ /dev/null
diff --git a/src/font/res/JetBrainsMonoNerdFont-BoldItalic.ttf b/src/font/res/JetBrainsMonoNerdFont-BoldItalic.ttf
deleted file mode 100644
index 35f0080ef..000000000
--- a/src/font/res/JetBrainsMonoNerdFont-BoldItalic.ttf
+++ /dev/null
diff --git a/src/font/res/JetBrainsMonoNerdFont-Italic.ttf b/src/font/res/JetBrainsMonoNerdFont-Italic.ttf
deleted file mode 100644
index a341a3758..000000000
--- a/src/font/res/JetBrainsMonoNerdFont-Italic.ttf
+++ /dev/null
diff --git a/src/font/res/SymbolsNerdFontMono-Regular.ttf b/src/font/res/SymbolsNerdFontMono-Regular.ttf
new file mode 100644
index 000000000..fbd5e1538
--- /dev/null
+++ b/src/font/res/SymbolsNerdFontMono-Regular.ttf