diff --git a/home/features/cli/default.nix b/home/features/cli/default.nix
index 23dc39c..9509052 100644
--- a/home/features/cli/default.nix
+++ b/home/features/cli/default.nix
@@ -5,6 +5,7 @@
     ./exa.nix
     ./git.nix
     ./fish.nix
+    ./nix-index.nix
     ./tmux.nix
     ./vim.nix
   ];
diff --git a/home/features/cli/nix-index.nix b/home/features/cli/nix-index.nix
new file mode 100644
index 0000000..30a764d
--- /dev/null
+++ b/home/features/cli/nix-index.nix
@@ -0,0 +1,12 @@
+{ pkgs, lib, config, ... }:
+let
+  inherit (lib) mkIf;
+  hasPackage = pname: lib.any (p: p ? pname && p.name == pname) config.home.packages;
+  hasFish = hasPackage "fish";
+in
+{
+  programs.nix-index = {
+    enable = true;
+    enableFishIntegration = mkIf hasFish true;
+  };
+}