diff --git a/flake.lock b/flake.lock
index 321f818..aa01960 100644
--- a/flake.lock
+++ b/flake.lock
@@ -182,6 +182,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1725161148,
+        "narHash": "sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "32058e9138248874773630c846563b1a78ee7a5b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1725448034,
@@ -286,6 +306,7 @@
         "flake-parts": "flake-parts",
         "lite-config": "lite-config",
         "nix-darwin": "nix-darwin",
+        "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs",
         "nixpkgs-update": "nixpkgs-update",
         "nixpkgs-update-github-releases": "nixpkgs-update-github-releases",
diff --git a/flake.nix b/flake.nix
index 5c58dd3..f882c85 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,6 +27,8 @@
     lite-config.url = "github:yelite/lite-config";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
     nix-darwin.url = "github:LnL7/nix-darwin";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
+    nix-index-database.url = "github:nix-community/nix-index-database";
     nixpkgs-update-github-releases.flake = false;
     nixpkgs-update-github-releases.url = "github:nix-community/nixpkgs-update-github-releases";
     nixpkgs-update.inputs.mmdoc.follows = "empty";
diff --git a/modules/darwin/community-builder/default.nix b/modules/darwin/community-builder/default.nix
index 9e8d0df..7c6e823 100644
--- a/modules/darwin/community-builder/default.nix
+++ b/modules/darwin/community-builder/default.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     "${inputs.self}/modules/shared/community-builder.nix"
+    inputs.nix-index-database.darwinModules.nix-index
     ./users.nix
   ];
 
diff --git a/modules/nixos/community-builder/default.nix b/modules/nixos/community-builder/default.nix
index f78ff8c..6825beb 100644
--- a/modules/nixos/community-builder/default.nix
+++ b/modules/nixos/community-builder/default.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     "${inputs.self}/modules/shared/community-builder.nix"
+    inputs.nix-index-database.nixosModules.nix-index
     ./users.nix
   ];
 
diff --git a/modules/shared/community-builder.nix b/modules/shared/community-builder.nix
index f40c756..314c497 100644
--- a/modules/shared/community-builder.nix
+++ b/modules/shared/community-builder.nix
@@ -12,6 +12,8 @@
     pkgs.tig
   ];
 
+  programs.nix-index-database.comma.enable = true;
+
   programs.zsh = {
     enable = true;
     # https://grml.org/zsh/grmlzshrc.html