diff --git a/profiles/base/cli-tools/default.nix b/profiles/base/cli-tools/default.nix
index 3125597..23e7d29 100644
--- a/profiles/base/cli-tools/default.nix
+++ b/profiles/base/cli-tools/default.nix
@@ -8,6 +8,7 @@
     ./fzf.nix
     ./lf.nix
     ./nitch.nix
+    ./nix-index.nix
     ./packages.nix
     ./television.nix
     ./zellij.nix
diff --git a/profiles/base/cli-tools/nix-index.nix b/profiles/base/cli-tools/nix-index.nix
new file mode 100644
index 0000000..ef6da41
--- /dev/null
+++ b/profiles/base/cli-tools/nix-index.nix
@@ -0,0 +1,24 @@
+# nix-index — Files database for nixpkgs
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.base.cliTools.lf;
+in {
+  # Enabled by default — base modules are always-on.
+  options.base.nix-index.lf.enable = (mkEnableOption "enable nix-index files database") // {default = true;};
+
+  config = mkIf cfg.enable {
+    home.packages = [pkgs.comma];
+
+    programs.nix-index = {
+      enable = true;
+      enableBashIntegration = true;
+      enableFishIntegration = true;
+      enableNushellIntegration = true;
+    };
+  };
+}
diff --git a/profiles/base/cli-tools/packages.nix b/profiles/base/cli-tools/packages.nix
index 913f91d..85e32bf 100644
--- a/profiles/base/cli-tools/packages.nix
+++ b/profiles/base/cli-tools/packages.nix
@@ -24,11 +24,10 @@ in {
 
       # Nix
       alejandra
-      comma
       nixd
       nix-diff
-      nix-index
       nix-update
+      nix-tree
 
       # Dev tools
       bc