diff --git a/modules/base/home/terminal.nix b/modules/base/home/terminal.nix
index e8e600d..b3c08b5 100644
--- a/modules/base/home/terminal.nix
+++ b/modules/base/home/terminal.nix
@@ -4,9 +4,7 @@
       { pkgs, ... }:
       {
         catppuccin.kitty.enable = true;
-
         home.sessionVariables.TERMINAL = "kitty";
-
         programs.kitty = {
           enable = true;
           font = {
@@ -21,17 +19,21 @@
           };
         };
 
-        catppuccin.ghostty.enable = true;
-        programs.ghostty = {
-          enableFishIntegration = true;
-          installVimSyntax = true;
-
-          settings = {
-
-          };
-
-        };
-
+        #   catppuccin.ghostty.enable = true;
+        #   programs.ghostty = {
+        #     enable = true;
+        #     enableFishIntegration = true;
+        #     installVimSyntax = true;
+        #     settings = {
+        #       font-family = "FiraCode Nerd Font";
+        #       font-size = 15;
+        #       font-codepoint-map = "U+E000-U+E00A,U+E0A0-U+E0A3,U+E0B0-U+E0C8,U+E0CA,U+E0CC-U+E0D7,U+E200-U+E2A9,U+E300-U+E3E3,U+E5FA-U+E6B7,U+E700-U+E8EF,U+EA60-U+EC1E,U+ED00-U+F2FF,U+EE00-U+EE0B,U+F300-U+F381,U+F400-U+F533,U+F0001-U+F1AF0=Symbols Nerd Font";
+        #       background-opacity = 0.9;
+        #       clipboard-paste-protection = true;
+        #       confirm-close-surface = false;
+        #       mouse-scroll-multiplier = 0.3;
+        #     };
+        #   };
       };
   };
 }
diff --git a/modules/base/system/fonts.nix b/modules/base/system/fonts.nix
index 6f5d840..1ccfb43 100644
--- a/modules/base/system/fonts.nix
+++ b/modules/base/system/fonts.nix
@@ -1,23 +1,19 @@
 {
-
   flake.modules.nixos.base =
     { pkgs, ... }:
     {
-      environment.variables = {
-        # Enable icons in tooling since we have nerdfonts.
-        LOG_ICONS = "true";
+      fonts = {
+        enableDefaultPackages = true;
+
+        packages = with pkgs; [
+          nerd-fonts.fira-code
+          nerd-fonts.jetbrains-mono
+          nerd-fonts.symbols-only
+        ];
+
+        fontconfig = {
+          useEmbeddedBitmaps = true;
+        };
       };
-
-      fonts.packages = with pkgs; [
-        font-awesome
-        powerline-fonts
-        powerline-symbols
-        nerd-fonts.code-new-roman
-        nerd-fonts.fira-code
-        nerd-fonts.symbols-only
-        nerd-fonts.jetbrains-mono
-        fira
-      ];
-
     };
 }
diff --git a/modules/desktop/niri.nix b/modules/desktop/niri.nix
index ebc140a..9aba289 100644
--- a/modules/desktop/niri.nix
+++ b/modules/desktop/niri.nix
@@ -320,7 +320,7 @@
                   "Mod+Shift+E".action = actions.quit;
                   "Ctrl+Alt+Delete".action = actions.quit;
 
-                  "Mod+Return".action.spawn = "${lib.getExe pkgs.kitty}";
+                  "Mod+Return".action.spawn = "${lib.getExe config.programs.kitty.package}";
 
                   "Mod+Escape" = {
                     allow-inhibiting = false;
diff --git a/modules/server/default.nix b/modules/server/default.nix
index 1a4ab66..1c55043 100644
--- a/modules/server/default.nix
+++ b/modules/server/default.nix
@@ -8,7 +8,7 @@
         clock24 = true;
         newSession = true;
         keyMode = "vi";
-        terminal = "ghostty";
+        terminal = "kitty";
         extraConfig = ''
           set -g mouse on
         '';