diff --git a/flake.lock b/flake.lock
index f2caefd..1d7dd05 100644
--- a/flake.lock
+++ b/flake.lock
@@ -163,6 +163,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1713668931,
+        "narHash": "sha256-rVlwWQlgFGGK3aPVcKmtYqWgjYnPah5FOIsYAqrMN2w=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "07ece11b22217b8459df589f858e92212b74f1a1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1709961763,
@@ -216,6 +236,7 @@
         "home-manager": "home-manager_2",
         "nil": "nil",
         "nix-darwin": "nix-darwin",
+        "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable",
         "vscode-server": "vscode-server"
diff --git a/flake.nix b/flake.nix
index 15d7ff3..f2f8896 100755
--- a/flake.nix
+++ b/flake.nix
@@ -40,6 +40,9 @@
 
     nix-darwin.url = "github:LnL7/nix-darwin";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
+
+    nix-index-database.url = "github:nix-community/nix-index-database";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
diff --git a/users/teidesu/common.nix b/users/teidesu/common.nix
index 563e479..8dde867 100644
--- a/users/teidesu/common.nix
+++ b/users/teidesu/common.nix
@@ -1,17 +1,19 @@
 { pkgs, inputs, ... }: {
   imports = [
+    inputs.nix-index-database.hmModules.nix-index
     ./zsh.nix
   ];
 
   home.stateVersion = "23.11";
 
+  programs.nix-index-database.comma.enable = true;
+
   home.packages = with pkgs; [
     tree
     nixpkgs-fmt
     htop
     jq
     micro
-    comma
     carapace
     inputs.nil.packages.${system}.default
     inputs.agenix.packages.${system}.default
diff --git a/users/teidesu/zsh.nix b/users/teidesu/zsh.nix
index 4d98967..38d32b9 100644
--- a/users/teidesu/zsh.nix
+++ b/users/teidesu/zsh.nix
@@ -140,4 +140,6 @@ in {
       export PATH="$HOME/.cargo/bin/:$HOME/.bun/bin:$HOME/.deno/bin:$PATH"
     '';
   };
+
+  programs.nix-index.enable = true;
 }