diff --git a/flake.lock b/flake.lock
index e99b69b..7aff23a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -264,6 +264,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1735443188,
+        "narHash": "sha256-AydPpRBh8+NOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "55ab1e1df5daf2476e6b826b69a82862dcbd7544",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nixos-facter-modules": {
       "locked": {
         "lastModified": 1734596637,
@@ -353,6 +373,7 @@
         "catppuccin": "catppuccin",
         "home-manager": "home-manager_2",
         "nix-flatpak": "nix-flatpak",
+        "nix-index-database": "nix-index-database",
         "nixos-facter-modules": "nixos-facter-modules",
         "nixpkgs": "nixpkgs"
       }
diff --git a/flake.nix b/flake.nix
index e86aad6..ee74d9c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,6 +18,9 @@
     alejandra.inputs.nixpkgs.follows = "nixpkgs";
 
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
+
+    nix-index-database.url = "github:nix-community/nix-index-database";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
   };
   outputs = inputs @ {
     self,
@@ -27,6 +30,7 @@
     catppuccin,
     alejandra,
     nix-flatpak,
+    nix-index-database,
     ...
   }: let
     modules = {
@@ -210,6 +214,7 @@
                   ++ [
                     catppuccin.homeManagerModules.catppuccin
                     nix-flatpak.homeManagerModules.nix-flatpak
+                    nix-index-database.hmModules.nix-index
                   ];
               };
             }
diff --git a/home/modules/cli/shell.nix b/home/modules/cli/shell.nix
index 11249d6..b28d1fc 100644
--- a/home/modules/cli/shell.nix
+++ b/home/modules/cli/shell.nix
@@ -13,6 +13,9 @@
 
   programs.bat.enable = true;
 
+  programs.nix-index.enable = true;
+  programs.nix-index-database.comma.enable = true;
+
   programs.fish = {
     enable = true;
     shellAliases = {