diff --git a/home-manager/carapace.nix b/home-manager/carapace.nix
new file mode 100644
index 0000000..92f2b3d
--- /dev/null
+++ b/home-manager/carapace.nix
@@ -0,0 +1,9 @@
+{ config, lib, pkgs, user, theme, ... }:
+{
+  programs.carapace = {
+    enable = true;
+    enableZshIntegration = true;
+    enableNushellIntegration = true;
+  };
+}
+
diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix
index 9b8a205..a33a598 100644
--- a/home-manager/zsh.nix
+++ b/home-manager/zsh.nix
@@ -5,8 +5,8 @@ in
 {
   programs.zsh = {
     enable = true;
-    enableAutosuggestions = true;
-    enableCompletion = true;
+    # enableAutosuggestions = true;
+    # enableCompletion = true;
     history.size = 10000;
 
     initExtra = ''
diff --git a/home-mandlm.nix b/home-mandlm.nix
index 0755a2b..4505896 100644
--- a/home-mandlm.nix
+++ b/home-mandlm.nix
@@ -47,6 +47,7 @@
     ./home-manager/kitty.nix
     ./home-manager/neovim
     ./home-manager/gpg
+    ./home-manager/carapace.nix
     ./home-manager/zsh.nix
     ./home-manager/starship.nix
     ./home-manager/sway