diff --git a/modules/desktop/terminal/kitty/default.nix b/modules/desktop/terminal/kitty/default.nix
index 3a58781..2c51385 100644
--- a/modules/desktop/terminal/kitty/default.nix
+++ b/modules/desktop/terminal/kitty/default.nix
@@ -16,6 +16,8 @@ lib.my.makeHomeProgramConfig {
         initial_window_height = 600;
         enable_audio_bell = "no";
         term = "xterm-256color";
+
+        close_on_child_death = "yes";
       };
       font = {
         name = "monospace";
diff --git a/modules/desktop/wm/niri/config.nix b/modules/desktop/wm/niri/config.nix
index 8c4e46b..40fba70 100644
--- a/modules/desktop/wm/niri/config.nix
+++ b/modules/desktop/wm/niri/config.nix
@@ -85,10 +85,6 @@
     };
 
     spawn-at-startup = map (c: { command = c; }) [
-      [
-        "alacritty"
-        "--daemon"
-      ]
       [ "${lib.getExe pkgs.xwayland-satellite-unstable}" ]
       [ "${lib.getExe' pkgs.swaynotificationcenter "swaync"}" ]
       [
@@ -123,19 +119,16 @@
       with config.my.home.lib.niri.actions;
       {
         "Ctrl+Alt+T".action.spawn = [
-          "alacritty"
-          "msg"
-          "create-window"
+          "kitty"
+          "-1"
         ];
         "Mod+T".action.spawn = [
-          "alacritty"
-          "msg"
-          "create-window"
+          "kitty"
+          "-1"
         ];
         "Mod+Return".action.spawn = [
-          "alacritty"
-          "msg"
-          "create-window"
+          "kitty"
+          "-1"
         ];
         "Mod+G".action.spawn = [ "chromium" ];
         "Mod+E".action.spawn = [ "nemo" ];