diff --git a/modules/home-manager/bundles/desktop.nix b/modules/home-manager/bundles/desktop.nix
index ef6f517..fed0a53 100644
--- a/modules/home-manager/bundles/desktop.nix
+++ b/modules/home-manager/bundles/desktop.nix
@@ -4,7 +4,7 @@ let
 in
 {
   config = lib.mkIf config.${feature}.enable {
-    alacritty.enable = true;
+    kitty.enable = true;
     zellij.enable = true;
   };
 
diff --git a/modules/home-manager/features/alacritty.nix b/modules/home-manager/features/alacritty.nix
deleted file mode 100644
index 7d7fb16..0000000
--- a/modules/home-manager/features/alacritty.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-let
-  feature = "alacritty";
-in
-{
-  config = lib.mkIf config.${feature}.enable {
-    programs.alacritty = {
-      enable = true;
-      theme = "catppuccin_mocha";
-      settings = {
-        window.startup_mode = "fullscreen";
-        terminal.shell = {
-          program = "zellij";
-          args = [
-            "-l"
-            "welcome"
-          ];
-        };
-        font = {
-          normal = {
-            family = "JetBrainsMono Nerd Font";
-            style = "Regular";
-          };
-          bold = {
-            family = "JetBrainsMono Nerd Font";
-            style = "Bold";
-          };
-          italic = {
-            family = "JetBrainsMono Nerd Font";
-            style = "italic";
-          };
-          bold_italic = {
-            family = "JetBrainsMono Nerd Font";
-            style = "bold_italic";
-          };
-          size = 13;
-        };
-      };
-    };
-  };
-
-  imports = [ ];
-
-  options.${feature}.enable = lib.mkEnableOption "enables ${feature}";
-}
diff --git a/modules/home-manager/features/kitty.nix b/modules/home-manager/features/kitty.nix
new file mode 100644
index 0000000..f9d3cb9
--- /dev/null
+++ b/modules/home-manager/features/kitty.nix
@@ -0,0 +1,31 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  feature = "kitty";
+in
+{
+  config = lib.mkIf config.${feature}.enable {
+    programs.kitty = {
+      enable = true;
+      enableGitIntegration = true;
+      font = {
+        package = pkgs.nerd-fonts.jetbrains-mono;
+        name = "JetBrainsMono Nerd Font";
+        size = 13;
+      };
+      themeFile = "Catppuccin-Mocha";
+      settings = {
+        shell = "zellij -l welcome";
+        remember_window_size = true;
+      };
+    };
+  };
+
+  imports = [ ];
+
+  options.${feature}.enable = lib.mkEnableOption "enables ${feature}";
+}