diff --git a/flake.lock b/flake.lock
index 06f44ee..2c839b6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -620,6 +620,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1728790083,
+        "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nix-minecraft": {
       "inputs": {
         "flake-compat": [
@@ -897,6 +917,7 @@
         "latest": "latest",
         "lix": "lix_2",
         "lix-module": "lix-module",
+        "nix-index-database": "nix-index-database",
         "nix-minecraft": "nix-minecraft",
         "nixos-hardware": "nixos-hardware",
         "nixos-wsl": "nixos-wsl",
diff --git a/flake.nix b/flake.nix
index 82631b9..92f69f1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,6 +31,7 @@
     flake-registry = { url = "github:NixOS/flake-registry"; flake = false; };
     home-manager.url = "github:nix-community/home-manager";
     impermanence.url = "github:nix-community/impermanence/63f4d0443e32b0dd7189001ee1894066765d18a5";
+    nix-index-database.url = "github:nix-community/nix-index-database";
     nixos-hardware.url = "github:nixos/nixos-hardware";
     nixos-wsl.url = "github:nix-community/NixOS-WSL";
     treefmt-nix.url = "github:numtide/treefmt-nix";
@@ -88,6 +89,7 @@
     git-hooks.inputs.nixpkgs.follows = "nixpkgs";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     lix-module.inputs.flake-utils.follows = "flake-utils";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
     nix-minecraft.inputs.flake-compat.follows = "blank";
     nix-minecraft.inputs.flake-utils.follows = "flake-utils";
     nix-minecraft.inputs.nixpkgs.follows = "nixpkgs";
@@ -180,6 +182,7 @@
                 home-manager = {
                   sharedModules = [
                     inputs.impermanence.nixosModules.home-manager.impermanence
+                    inputs.nix-index-database.hmModules.nix-index
                     inputs.nixvim.homeManagerModules.nixvim
                   ] ++ (self.lib.leaves ./users/modules);
                 };
@@ -194,6 +197,7 @@
               inputs.disko.nixosModules.disko
               inputs.home-manager.nixosModules.home-manager
               inputs.impermanence.nixosModules.impermanence
+              inputs.nix-index-database.nixosModules.nix-index
               inputs.nixos-wsl.nixosModules.wsl
 
               # --- Domain-Specific Modules ---
diff --git a/modules/global/nix.nix b/modules/global/nix.nix
index 67da512..c846217 100644
--- a/modules/global/nix.nix
+++ b/modules/global/nix.nix
@@ -82,11 +82,17 @@ in
 
   programs.nix-ld.enable = mkDefault true;
 
+  programs.nix-index-database.comma.enable = true;
+  programs.nix-index = {
+    enable = true;
+    enableBashIntegration = false;
+    enableZshIntegration = false;
+    enableFishIntegration = false;
+  };
+
   universe.packages = with pkgs; [
-    comma
     nix-diff
     nix-du
-    nix-index
     nix-melt
     nix-output-monitor
     nix-tree
diff --git a/users/modules/global/shells/common.nix b/users/modules/global/shells/common.nix
index 5c4ac95..cc2befa 100644
--- a/users/modules/global/shells/common.nix
+++ b/users/modules/global/shells/common.nix
@@ -1,3 +1,8 @@
 { ... }: {
-  programs.command-not-found.enable = true;
+  programs.nix-index = {
+    enable = true;
+    enableBashIntegration = false;
+    enableZshIntegration = false;
+    enableFishIntegration = false;
+  };
 }
diff --git a/users/modules/global/shells/zsh.nix b/users/modules/global/shells/zsh.nix
index f533de3..1c04681 100644
--- a/users/modules/global/shells/zsh.nix
+++ b/users/modules/global/shells/zsh.nix
@@ -97,7 +97,6 @@
 
           # zsh modifications
           "zsh-interactive-cd"
-          "command-not-found"
           "sudo"
 
           # Aliases