diff --git a/configs/common.nix b/configs/common.nix
index ea76603..8d75731 100644
--- a/configs/common.nix
+++ b/configs/common.nix
@@ -7,6 +7,7 @@
   camasca,
   home-manager,
   nixpkgs,
+  nix-index-database,
   vencord,
   ...
 }:
@@ -23,6 +24,7 @@ in
   imports = [
     agenix.nixosModules.default
     home-manager.nixosModules.home-manager
+    nix-index-database.nixosModules.nix-index
 
     (lib.mkAliasOptionModule [ "hm" ] [ "home-manager" "users" username ])
 
@@ -59,7 +61,6 @@ in
 
   environment.systemPackages = with pkgs; [
     btop
-    comma
     curl
     fd
     git
@@ -150,12 +151,7 @@ in
 
   programs = {
     direnv.enable = true;
-
-    command-not-found.enable = false;
-    nix-index = {
-      enable = true;
-      enableFishIntegration = true;
-    };
+    nix-index-database.comma.enable = true;
   };
 
   security = {
diff --git a/flake.lock b/flake.lock
index dcc8614..908c327 100644
--- a/flake.lock
+++ b/flake.lock
@@ -217,6 +217,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1746330942,
+        "narHash": "sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG+KhPZFFQX/0o=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "137fd2bd726fff343874f85601b51769b48685cc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nixos-wsl": {
       "inputs": {
         "flake-compat": [],
@@ -266,6 +286,7 @@
         "home-manager": "home-manager",
         "lanzaboote": "lanzaboote",
         "mystia": "mystia",
+        "nix-index-database": "nix-index-database",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs",
         "systems": "systems",
diff --git a/flake.nix b/flake.nix
index 15613a7..af39522 100644
--- a/flake.nix
+++ b/flake.nix
@@ -117,6 +117,11 @@
       inputs.flake-compat.follows = "";
     };
 
+    nix-index-database = {
+      url = "github:nix-community/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # nix's most elaborate, overcomplicated joke
     systems.url = "github:nix-systems/default";