diff --git a/home/config/kitty/default.nix b/home/config/kitty/default.nix
index 6e07e6c..bad7e46 100644
--- a/home/config/kitty/default.nix
+++ b/home/config/kitty/default.nix
@@ -4,7 +4,46 @@ let
 in
 {
   config = lib.mkIf cfg.enable {
-    programs.kitty.enable = true;
+    programs.zsh.initExtra = ''
+      if [[ "$TERM" == "xterm-kitty" ]]; then
+          alias ssh="kitty +kitten ssh"
+      fi
+    '';
+    programs.kitty = {
+      enable = true;
+      settings = {
+        # General
+        underline_hyperlinks = "always";
+        enable_audio_bell = false;
+
+        # Layouts
+        enabled_layouts = "splits";
+
+        # Window
+        tab_bar_edge = "top";
+        tab_bar_margin_width = toString 0.2;
+        tab_bar_style = "slant";
+        background_blur = 40;
+        background_opacity = toString 0.90;
+      };
+      keybindings = {
+        "ctrl+a>enter" = "launch --location=hsplit --cwd=current";
+        "ctrl+a>backspace" = "launch --location=vsplit --cwd=current";
+        "ctrl+a>h" = "neighboring_window left";
+        "ctrl+a>j" = "neighboring_window down";
+        "ctrl+a>k" = "neighboring_window up";
+        "ctrl+a>l" = "neighboring_window right";
+        "ctrl+a>t" = "new_tab_with_cwd";
+        "ctrl+a>w" = "close_window";
+      };
+      font = {
+        name = "JetBrainsMono Nerd Font Mono";
+        size = 11;
+      };
+      extraConfig = ''
+        globinclude kitty.d/**/*.conf
+      '';
+    };
 
     home.file.".config/kitty" = {
       source = ./.;
diff --git a/home/config/kitty/kitty.conf b/home/config/kitty/kitty.conf
deleted file mode 100644
index 5204942..0000000
--- a/home/config/kitty/kitty.conf
+++ /dev/null
@@ -1 +0,0 @@
-globinclude kitty.d/**/*.conf
diff --git a/home/config/kitty/kitty.d/00-base.conf b/home/config/kitty/kitty.d/00-base.conf
deleted file mode 100644
index f6494e9..0000000
--- a/home/config/kitty/kitty.d/00-base.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-underline_hyperlinks always
-enable_audio_bell no
diff --git a/home/config/kitty/kitty.d/01-fonts.conf b/home/config/kitty/kitty.d/01-fonts.conf
deleted file mode 100644
index 68e2c12..0000000
--- a/home/config/kitty/kitty.d/01-fonts.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-font_family JetBrainsMono Nerd Font Mono
-
diff --git a/home/config/kitty/kitty.d/10-layout.conf b/home/config/kitty/kitty.d/10-layout.conf
deleted file mode 100644
index cadfea7..0000000
--- a/home/config/kitty/kitty.d/10-layout.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# enabled_layouts tall:bias=80;full_size=1;mirrored=false,fat:bias=75;full_size=1;mirrored=false,splits
-
-# map ctrl+a>enter launch --location=hsplit --cwd=current
-# map ctrl+a>backspace launch --location=vsplit --cwd=current
-#
-# map ctrl+a>h neighboring_window left
-# map ctrl+a>j neighboring_window down
-# map ctrl+a>k neighboring_window up
-# map ctrl+a>l neighboring_window right
-#
-# map ctrl+a>shift+k move_window up
-# map ctrl+a>shift+j move_window down
-# map ctrl+a>shift+h move_window left
-# map ctrl+a>shift+l move_window right
-#
-# map ctrl+a>t new_tab_with_cwd
diff --git a/home/config/kitty/kitty.d/20-window.conf b/home/config/kitty/kitty.d/20-window.conf
deleted file mode 100644
index 834c1f7..0000000
--- a/home/config/kitty/kitty.d/20-window.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-tab_bar_edge top
-tab_bar_margin_width 0.2
-tab_bar_style slant
diff --git a/home/config/kitty/kitty.d/30-transparency.conf b/home/config/kitty/kitty.d/30-transparency.conf
deleted file mode 100644
index 72f3ee6..0000000
--- a/home/config/kitty/kitty.d/30-transparency.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-background_blur 40
-background_opacity 0.90
-# background_tint 0.5