diff --git a/home/default.nix b/home/default.nix
index 10ab4ad..b5c367a 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,26 +1,27 @@
 { system, pkgs, home-manager, modules, nid, ... }:
 let
   ivand-programs = with modules.home.programs; [
-    nvim
-    zsh
-    tmux
-    git
+    bottom
+    browserpass
+    carapace
     chromium
+    comma
     firefox
+    git
+    gpg
     kitty
     lf
-    obs-studio
-    sway
-    swaylock
-    browserpass
-    bottom
-    gpg
-    comma
     nushell
-    waybar
-    tealdeer
+    nvim
+    obs-studio
     pueue
     starship
+    sway
+    swaylock
+    tealdeer
+    tmux
+    waybar
+    zsh
   ];
   ivand-packages = with modules.home.packages; [
     dev
diff --git a/modules/home/programs/carapace/default.nix b/modules/home/programs/carapace/default.nix
new file mode 100644
index 0000000..9f7a15e
--- /dev/null
+++ b/modules/home/programs/carapace/default.nix
@@ -0,0 +1,7 @@
+{
+  programs.carapace = {
+    enable = true;
+    enableNushellIntegration = true;
+    enableZshIntegration = true;
+  };
+}
diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix
index 7c3ef55..cc8808c 100644
--- a/modules/home/programs/default.nix
+++ b/modules/home/programs/default.nix
@@ -5,6 +5,7 @@
   };
   bottom = import ./bottom;
   browserpass = { programs.browserpass.enable = true; };
+  carapace = import ./carapace;
   chromium = import ./chromium { inherit pkgs; };
   comma = import ./comma;
   firefox = import ./firefox { inherit pkgs; };
diff --git a/modules/home/programs/nushell/default.nix b/modules/home/programs/nushell/default.nix
index dbeeea8..90dc1e0 100644
--- a/modules/home/programs/nushell/default.nix
+++ b/modules/home/programs/nushell/default.nix
@@ -2,15 +2,16 @@
   programs.nushell = {
     enable = true;
     environmentVariables = {
-      config = ''{
-                   show_banner: false,
-                   completions: {
-                    quick: true
-                    partial: true
-                    algorithm: "fuzzy"
-                   }
-                  }
-        '';
+      config = ''
+        {
+          show_banner: false,
+          completions: {
+            quick: false
+            partial: false
+            algorithm: "prefix"
+          }
+        }
+      '';
       PASSWORD_STORE_DIR = "($env.HOME | path join .password-store)";
       PATH = "($env.PATH | split row (char esep) | append ($env.HOME | path join .local bin))";
       EDITOR = "nvim";