diff --git a/flake.lock b/flake.lock
index ec35bfb..ac32725 100644
--- a/flake.lock
+++ b/flake.lock
@@ -204,6 +204,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1746934494,
+        "narHash": "sha256-3n6i+F0sDASjkhbvgFDpPDZGp7z19IrRtjfF9TwJpCA=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "e9b21b01e4307176b9718a29ac514838e7f6f4ff",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1733212471,
@@ -272,6 +292,7 @@
       "inputs": {
         "devenv": "devenv",
         "home-manager": "home-manager",
+        "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs_4",
         "sops-nix": "sops-nix",
         "zen-browser": "zen-browser"
diff --git a/flake.nix b/flake.nix
index 51ee3bf..4cb6a2e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,11 +8,18 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nix-index-database = {
+      url = "github:nix-community/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     devenv.url = "github:cachix/devenv";
+
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
     zen-browser = {
       url = "github:youwen5/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/users/modules/default.nix b/users/modules/default.nix
index 03bdd59..22985a0 100644
--- a/users/modules/default.nix
+++ b/users/modules/default.nix
@@ -7,6 +7,7 @@
     ./eza.nix
     ./mopidy.nix
     ./nh.nix
+    ./nix-index.nix
     ./shell
     ./ssh.nix
     ./tealdeer.nix
diff --git a/users/modules/nix-index.nix b/users/modules/nix-index.nix
new file mode 100644
index 0000000..618fe91
--- /dev/null
+++ b/users/modules/nix-index.nix
@@ -0,0 +1,9 @@
+{ inputs, ... }:
+{
+  imports = [
+    inputs.nix-index-database.hmModules.nix-index
+  ];
+
+  programs.nix-index.enable = true;
+  programs.nix-index-database.comma.enable = true;
+}