diff --git a/modules/cli/shell/all.nix b/modules/cli/shell/all.nix
index 53f29c0..ccd24f5 100644
--- a/modules/cli/shell/all.nix
+++ b/modules/cli/shell/all.nix
@@ -12,6 +12,7 @@ in
       zsh.enable = true;
       fish.enable = true;
       starship.enable = true;
+      carapace.enable = true;
     };
   };
 }
diff --git a/modules/cli/shell/carapace.nix b/modules/cli/shell/carapace.nix
new file mode 100644
index 0000000..c294744
--- /dev/null
+++ b/modules/cli/shell/carapace.nix
@@ -0,0 +1,17 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.cli.shell.carapace;
+in
+{
+  options.my.cli.shell.carapace = {
+    enable = lib.mkEnableOption "carapace completer";
+  };
+
+  config = lib.mkIf cfg.enable {
+    my.hm = {
+      programs.carapace = {
+        enable = true;
+      };
+    };
+  };
+}