diff --git a/profiles/base/default.nix b/profiles/base/default.nix
index 4a791cb..9e47a9e 100644
--- a/profiles/base/default.nix
+++ b/profiles/base/default.nix
@@ -58,12 +58,9 @@
     '';
   };
 
-  environment.systemPackages =
-    with pkgs;
-    [
-      agenix.packages."${pkgs.system}".default
-    ]
-    ++ (import ./packages.nix { inherit pkgs; });
+  environment.systemPackages = with pkgs; [
+    agenix.packages."${pkgs.system}".default
+  ];
 
   programs.fish.enable = true;
 
diff --git a/profiles/base/packages.nix b/profiles/base/packages.nix
index 778593e..b5f6ecb 100644
--- a/profiles/base/packages.nix
+++ b/profiles/base/packages.nix
@@ -9,8 +9,8 @@ with pkgs;
   docker-compose
   git
   gnupg
-  iosevka
   jjui
+  nerd-fonts.fira-code
   jq
   killall
   libfido2
diff --git a/profiles/darwin/default.nix b/profiles/darwin/default.nix
index 8e1e6d8..d482424 100644
--- a/profiles/darwin/default.nix
+++ b/profiles/darwin/default.nix
@@ -46,8 +46,9 @@
           ../base/home-manager/zsh.nix
           ./home-manager/ghostty.nix
         ];
+        fonts.fontconfig.enable = true;
         home = {
-          packages = pkgs.callPackage ./packages.nix { };
+          packages = pkgs.callPackage ./packages.nix { } ++ pkgs.callPackage ../base/packages.nix { };
           stateVersion = "23.11";
         };
       };
diff --git a/profiles/darwin/home-manager/ghostty.nix b/profiles/darwin/home-manager/ghostty.nix
index 3620fec..bf5e761 100644
--- a/profiles/darwin/home-manager/ghostty.nix
+++ b/profiles/darwin/home-manager/ghostty.nix
@@ -13,7 +13,7 @@
       window-padding-x = 8;
       window-padding-y = 2;
       window-padding-balance = true;
-      font-family = "Iosevka";
+      font-family = "FiraCode Nerd Font";
       font-size = 15.5;
       font-feature = [
         "-calt"