diff --git a/configs/common.nix b/configs/common.nix
index d58287f..e64fb1f 100644
--- a/configs/common.nix
+++ b/configs/common.nix
@@ -7,6 +7,7 @@
   camasca,
   hjem,
   nixpkgs,
+  nix-index-database,
   vencord,
   ...
 }:
@@ -20,6 +21,7 @@ in
   imports = [
     agenix.nixosModules.default
     hjem.nixosModules.default
+    nix-index-database.nixosModules.nix-index
 
     rootPassword.generate
     secrets.generate
@@ -140,12 +142,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 35d9e79..017c881 100644
--- a/flake.lock
+++ b/flake.lock
@@ -35,11 +35,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745878068,
-        "narHash": "sha256-+bMpFW9bfMTBbYdJxZ02hCokS5ksV/yuMPjpEzx1zgQ=",
+        "lastModified": 1746560564,
+        "narHash": "sha256-7DMIobQDgqlLB6B5bUyWzlbOjdIksa5Sm2nimV/aDCs=",
         "owner": "uku3lig",
         "repo": "api-rs",
-        "rev": "4c699bf25eeb6c3fc77605628b4b8738c2dfc8e4",
+        "rev": "714f785a08d565a4cedce7f4f1d00b0bbd8cc856",
         "type": "github"
       },
       "original": {
@@ -215,6 +215,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": [],
@@ -223,11 +243,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746286866,
-        "narHash": "sha256-oSFEsgSEcLX7kYQXH5q/xyncD3qmrGgXv22pGDPPfBY=",
+        "lastModified": 1746453552,
+        "narHash": "sha256-r66UGha+7KVHkI7ksrcMjnw/mm9Sg4l5bQlylxHwdGU=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "0f4ffe22d9736192f560cb851d64106fe65b6adc",
+        "rev": "be618645aa0adf461f778500172b6896d5ab2d01",
         "type": "github"
       },
       "original": {
@@ -238,11 +258,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1746328495,
-        "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
+        "lastModified": 1746461020,
+        "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
+        "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae",
         "type": "github"
       },
       "original": {
@@ -264,6 +284,7 @@
         "hjem": "hjem",
         "lanzaboote": "lanzaboote",
         "mystia": "mystia",
+        "nix-index-database": "nix-index-database",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs",
         "systems": "systems",
@@ -338,11 +359,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746428596,
-        "narHash": "sha256-rKEbQSYU3NS/lx3yf+FI386p+mrgIqajGKUWzOpWxb0=",
+        "lastModified": 1746560624,
+        "narHash": "sha256-hScb75ZbtscNKuoZhwRpgVMUf3GuHISQ04zU1zW78oY=",
         "owner": "uku3lig",
         "repo": "ukubot-rs",
-        "rev": "9cc7d97de243ee78eb70ad3f0153723e7b1b03d8",
+        "rev": "63aef28b85398b7c0a34670281e398893e07bc42",
         "type": "github"
       },
       "original": {
@@ -354,11 +375,11 @@
     "vencord": {
       "flake": false,
       "locked": {
-        "lastModified": 1746387143,
-        "narHash": "sha256-sGRR3nHPQttiBIIaA2yYFyRezEq+2Ds+mgCpy6TYueU=",
+        "lastModified": 1746484774,
+        "narHash": "sha256-+uJYlxvfrQxfpY2w1+tnFRR+Y7nyVJgTcLMcu+Wed+Q=",
         "owner": "Vendicated",
         "repo": "Vencord",
-        "rev": "0a2d4a2ab2da38d2a1d91c838b1db31c392a870c",
+        "rev": "89ef26e719ce3d257737b58e4f5e50052474ed74",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 189d486..9be34c3 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";