diff --git a/darwin/general.nix b/darwin/general.nix
index 45398ac..4ffced8 100644
--- a/darwin/general.nix
+++ b/darwin/general.nix
@@ -6,13 +6,16 @@
   # Fonts
   fonts.fontDir.enable = true;
   fonts.fonts = with pkgs; [
+    borg-sans-mono
+    inter
     recursive
     (nerdfonts.override {
       fonts = [
-        "FantasqueSansMono"
-        "JetBrainsMono"
+        "CascadiaCode"
+        "iA-Writer"
+        "Inconsolata"
         "FiraCode"
-        "SourceCodePro"
+        "Lilex"
       ];
     })
   ];
diff --git a/home/kitty.nix b/home/kitty.nix
index 23af025..5ea5233 100644
--- a/home/kitty.nix
+++ b/home/kitty.nix
@@ -33,6 +33,7 @@ let
     color15 = white;
     url_color = brightgreen;
   };
+  font = "CaskaydiaCove Nerd Font";
 in
 # }}}
 {
@@ -44,7 +45,7 @@ in
   # General config ----------------------------------------------------------------------------- {{{
 
   programs.kitty.settings = {
-    font_family = "FiraCode Nerd Font";
+    font_family = font;
     font_size = "14.0";
     adjust_line_height = "120%";
     disable_ligatures = "cursor"; # disable ligatures when cursor is on them
@@ -68,7 +69,7 @@ in
     macos_option_as_alt = "both";
   };
 
-  programs.kitty.extras.useSymbolsFromNerdFont = "FiraCode Nerd Font";
+  programs.kitty.extras.useSymbolsFromNerdFont = font;
   # }}}
 
   # Colors config ------------------------------------------------------------------------------ {{{
diff --git a/home/starship.nix b/home/starship.nix
index 86c672f..c460769 100644
--- a/home/starship.nix
+++ b/home/starship.nix
@@ -14,9 +14,7 @@
     ];
     directory.fish_style_pwd_dir_length = 1; # turn on fish directory truncation
     directory.truncation_length = 2; # number of directories not to truncate
-    # hostname.style = "bold green"; # don't like the default
     memory_usage.disabled = true; # because it includes cached memory it's reported as full a lot
-    # username.style_user = "bold blue"; # don't like the default
   };
   # }}}
 }