diff --git a/modules/moritz/profiles/IntelOneMono-Regular_freeze.ttf b/modules/moritz/profiles/IntelOneMono-Regular_freeze.ttf
new file mode 100644
index 0000000..3a81df0
Binary files /dev/null and b/modules/moritz/profiles/IntelOneMono-Regular_freeze.ttf differ
diff --git a/modules/moritz/profiles/base.nix b/modules/moritz/profiles/base.nix
index c4674dc..b2c9aa5 100644
--- a/modules/moritz/profiles/base.nix
+++ b/modules/moritz/profiles/base.nix
@@ -81,27 +81,31 @@ in {
   stylix = {
     enable = lib.mkDefault true;
     base16Scheme = lib.mkDefault ./night.yaml;
+    opacity.terminal = 0.9;
     fonts = {
       serif = {
         package = pkgs.dejavu_fonts;
         name = "DejaVu Serif";
       };
-
       sansSerif = {
         package = pkgs.dejavu_fonts;
         name = "DejaVu Sans";
       };
-
       monospace = {
-        package = pkgs.nerd-fonts.intone-mono;
-        name = "IntoneMono Nerd Font";
+        package = (
+          # NOTE: custom intel one mono with frozen programming features
+          pkgs.runCommand "intone-mono-nerd-font-patched" {} ''
+            ${pkgs.nerd-font-patcher}/bin/nerd-font-patcher -c ${./IntelOneMono-Regular_freeze.ttf}
+            mkdir -p $out/share/fonts/truetype/NerdFonts/IntoneMonoFreeze/
+            cp -a . $out/share/fonts/truetype/NerdFonts/IntoneMonoFreeze/
+          ''
+        );
+        name = "IntoneMonoFreeze Nerd Font";
       };
-
       emoji = {
         package = pkgs.noto-fonts-emoji;
         name = "Noto Color Emoji";
       };
-      sizes.terminal = 14;
     };
   };
 
diff --git a/modules/moritz/profiles/desktop.nix b/modules/moritz/profiles/desktop.nix
index 0ae56b2..88a837d 100644
--- a/modules/moritz/profiles/desktop.nix
+++ b/modules/moritz/profiles/desktop.nix
@@ -19,7 +19,6 @@ in {
         chromium.enable = mkDefault true;
         firefox.enable = mkDefault true;
         gpg.enable = mkDefault true;
-        ghostty.settings.window-decoration = false;
         niri.enable = mkDefault true;
         nvim.enable = mkDefault true;
         python.versions."311".enable = mkDefault true;
@@ -78,17 +77,12 @@ in {
       vlc
     ];
 
-    fonts = {
-      enableDefaultPackages = true;
-      packages = [
-        pkgs.nerd-fonts.fira-code
-        pkgs.nerd-fonts.intone-mono
-      ];
-    };
+    fonts.enableDefaultPackages = true;
 
     programs.nix-ld.enable = true;
 
     home-manager.users.moritz = {
+      programs.ghostty.settings.window-decoration = false;
       services.nextcloud-client = {
         enable = true;
         startInBackground = true;
diff --git a/modules/moritz/programs/ghostty.nix b/modules/moritz/programs/ghostty.nix
index 67b1408..01426a2 100644
--- a/modules/moritz/programs/ghostty.nix
+++ b/modules/moritz/programs/ghostty.nix
@@ -6,25 +6,16 @@
 }:
 with lib; let
   cfg = config.my.programs.ghostty;
-  format = pkgs.formats.keyValue {
-    listsAsDuplicateKeys = true;
-  };
 in {
-  options.my.programs.ghostty.enable = mkEnableOption "Ghostty";
-  options.my.programs.ghostty.package = mkPackageOption pkgs "ghostty" {};
-  options.my.programs.ghostty.settings = mkOption {
-    inherit (format) type;
-    description = ''
-      Configuration written to {file}`$XDG_CONFIG_HOME/ghostty/config`.
-    '';
-    default = {};
+  options.my.programs.ghostty = {
+    enable = mkEnableOption "Ghostty";
+    package = mkPackageOption pkgs "ghostty" {};
   };
 
   config = mkIf cfg.enable {
     my.terminal.package = cfg.package;
-    home-manager.users.moritz = {
-      home.packages = [cfg.package];
-      xdg.configFile."ghostty/config".source = format.generate "ghostty-config" cfg.settings;
+    home-manager.users.moritz.programs.ghostty = {
+      inherit (cfg) enable package;
     };
   };
 }
diff --git a/modules/moritz/programs/kitty.nix b/modules/moritz/programs/kitty.nix
index ffbc735..eac63b9 100644
--- a/modules/moritz/programs/kitty.nix
+++ b/modules/moritz/programs/kitty.nix
@@ -20,7 +20,6 @@ in {
           cursor_shape = "underline";
           window_padding_width = 3;
           confirm_os_window_close = 0;
-          background_opacity = "0.9";
           resize_in_steps = "yes";
         };
         keybindings = {
diff --git a/modules/moritz/programs/niri.nix b/modules/moritz/programs/niri.nix
index a20abe7..d84daf0 100644
--- a/modules/moritz/programs/niri.nix
+++ b/modules/moritz/programs/niri.nix
@@ -39,7 +39,7 @@ in {
     my = {
       programs = {
         wallpaper.enable = true;
-        ghostty.enable = true;
+        kitty.enable = true;
         tofi.enable = true;
       };
       wallpapers.enable = true;