From 24296fcbd1d68ea735a4167464e6efa7f0bf9316 Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Fri, 20 Sep 2024 20:44:50 +0200
Subject: [PATCH] home: Refine terminal fount selection

---
 home/config/nil/founts.nix   | 2 ++
 home/config/nil/home.nix     | 2 +-
 home/config/nil/terminal.nix | 9 ++++++++-
 package/fira-code.nix        | 3 +--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/home/config/nil/founts.nix b/home/config/nil/founts.nix
index 25bb154..95ea90b 100644
--- a/home/config/nil/founts.nix
+++ b/home/config/nil/founts.nix
@@ -19,6 +19,7 @@ in lib.mkIf (osConfig.hardware.graphics.enable or false) {
 
       monospace = [
         "Fira Code"
+        "Julia Mono"
         "M PLUS 1 Code"
         "Noto Sans Mono"
         "Symbols Nerd Font Mono"
@@ -29,6 +30,7 @@ in lib.mkIf (osConfig.hardware.graphics.enable or false) {
   };
 
   home.packages = with pkgs; [
+    julia-mono
     lato
     self.packages.${pkgs.system}.fira-code
     mplus-outline-fonts.githubRelease
diff --git a/home/config/nil/home.nix b/home/config/nil/home.nix
index e16012a..8f9787a 100644
--- a/home/config/nil/home.nix
+++ b/home/config/nil/home.nix
@@ -154,7 +154,7 @@ in {
         end
 
         echo -n -s (set_color $user_colour --bold) $USER@ (prompt_hostname) \
-          (set_color blue --bold) ' ' (prompt_pwd) ' ❯ ' (set_color normal)
+          (set_color blue --bold) ' ' (prompt_pwd) ' › ' (set_color normal)
       '';
 
       fish_right_prompt = ''
diff --git a/home/config/nil/terminal.nix b/home/config/nil/terminal.nix
index b7990de..6022f79 100644
--- a/home/config/nil/terminal.nix
+++ b/home/config/nil/terminal.nix
@@ -11,7 +11,14 @@ in lib.mkIf (osConfig.hardware.graphics.enable or false) {
   programs.kitty = {
     enable = true;
     theme = "Catppuccin-Mocha";
-    settings = {
+    settings = let
+      regular = "family='Fira Code' features='+cv01 +cv06 +onum +ss01 +ss03 +ss06 +ss07 +ss08 +zero'";
+    in {
+      font_family = "${regular} style=Regular";
+      bold_font = "${regular} style=SemiBold";
+      italic_font = "Julia Mono";
+      bold_italic_font = "Julia Mono";
+
       disable_ligatures = "cursor";
 
       cursor_blink_interval = 0;
diff --git a/package/fira-code.nix b/package/fira-code.nix
index b3bf041..d7ec83c 100644
--- a/package/fira-code.nix
+++ b/package/fira-code.nix
@@ -16,8 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preInstall
 
     install -D -m 0644 -t "$out/share/fonts" \
-      "ttf/Fira Code/"*.ttf \
-      "variable_ttf/Fira Code/"*.ttf
+      "variable_ttf/Fira Code/FiraCode-VF.ttf"
 
     runHook postInstall
   '';