diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
index 87e8a6d8..8a21da83 100644
--- a/config/kitty/kitty.conf
+++ b/config/kitty/kitty.conf
@@ -14,4 +14,4 @@ dynamic_background_opacity yes
 
 include current-theme.conf
 
-x11_hide_window_decorations yes
+hide_window_decorations yes
diff --git a/modules/desktop/term/kitty.nix b/modules/desktop/term/kitty.nix
index 114f2ced..04e06173 100644
--- a/modules/desktop/term/kitty.nix
+++ b/modules/desktop/term/kitty.nix
@@ -16,6 +16,16 @@ in {
     # kitty isn't supported over ssh, so revert to a known one
     environment.shellAliases = {s = "kitten ssh";};
 
-    user.packages = with pkgs; [kitty];
+    home-manager.users.${config.user.name}.programs.kitty = {
+      enable = true;
+      settings = {
+        scrollback_lines = 10000;
+        enable_audio_bell = false;
+        update_check_interval = 0;
+        background_opacity = 0.97;
+        dynamic_background_opacity = true;
+        hide_window_decorations = true;
+      };
+    };
   };
 }
diff --git a/modules/desktop/term/wezterm.nix b/modules/desktop/term/wezterm.nix
index 63a64068..c78e3b60 100644
--- a/modules/desktop/term/wezterm.nix
+++ b/modules/desktop/term/wezterm.nix
@@ -13,8 +13,10 @@ in {
   options.modules.desktop.term.wezterm = {enable = mkBoolOpt false;};
 
   config = mkIf cfg.enable {
-    user.packages = with pkgs; [unstable.wezterm];
-
+    home-manager.users.${config.user.name}.programs.wezterm = {
+      enable = true;
+      # default_prog = { "zsh", "--login", "-c", "tmux attach -t dev || tmux new -s dev" },
+    };
     # TODO Waiting for config to stablize
     # home.configFile = {
     #   "wezterm/wezterm.lua".source = "${configDir}/wezterm/wezterm.lua";