diff --git a/flake.lock b/flake.lock
index 4c45536..32446b5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -174,6 +174,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1776575850,
+        "narHash": "sha256-28Gqz0GDpGsBv8GtAn2dywEQRr+CtTDsD5J7VD6icBE=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "3b9653a107c736222b5ae0d4036dd3b885219065",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1754028485,
@@ -250,6 +270,7 @@
         "agenix": "agenix",
         "home-manager": "home-manager_2",
         "nix-flatpak": "nix-flatpak",
+        "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs_2",
         "nvf": "nvf"
       }
diff --git a/flake.nix b/flake.nix
index dd5d8c4..d637be6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,6 +10,11 @@
 
     agenix.url = "github:ryantm/agenix";
 
+    nix-index-database = {
+      url = "github:nix-community/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
 
     nvf.url = "github:notashelf/nvf";
@@ -30,6 +35,7 @@
         inputs.nix-flatpak.nixosModules.nix-flatpak
         inputs.nvf.nixosModules.default
         inputs.agenix.nixosModules.default
+        inputs.nix-index-database.nixosModules.default
       ];
 
       mkHost =
diff --git a/modules/nix/base-cli/pkgs.nix b/modules/nix/base-cli/pkgs.nix
index 3a4c5cb..4c8bef2 100644
--- a/modules/nix/base-cli/pkgs.nix
+++ b/modules/nix/base-cli/pkgs.nix
@@ -35,9 +35,8 @@ in
       efibootmgr
       nfs-utils
       nmap
-      comma
-      nix-index
       agenix.packages.${stdenv.hostPlatform.system}.default
     ];
+    programs.nix-index-database.comma.enable = true;
   };
 }