diff --git a/flake.nix b/flake.nix
index ab2a1e1..73fb310 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,6 +16,8 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
     stable.url = "github:nixos/nixpkgs/nixos-23.05";
+    nix-index-database.url = "github:Mic92/nix-index-database";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
 
     # Programs
     nix-super.inputs.nixpkgs.follows = "stable";
@@ -186,6 +188,7 @@
                 inputs.disko.nixosModules.default
                 inputs.home-manager.nixosModule
                 inputs.impermanence.nixosModules.impermanence
+                inputs.nix-index-database.nixosModules.nix-index
                 path
               ];
           })
diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index b0396ca..8904931 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -171,8 +171,8 @@ in
 
   programs = {
     mtr.enable = true;
-    command-not-found.enable = true;
     starship.enable = true;
+    command-not-found.enable = false;
   };
 
   services = {