diff --git a/configuration.nix b/configuration.nix
index 9060e9b..6b50669 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -156,6 +156,13 @@ with pkgs;
   # Enable fish package completion
   programs.fish.enable = true;
 
+  # Enable nix-index
+  programs.command-not-found.enable = false;
+  programs.nix-index = {
+    enable = true;
+    enableFishIntegration = true;
+  };
+
   # Import other configuration modules
   imports = [
     ./modules/hardware-configuration.nix
diff --git a/flake.lock b/flake.lock
index 61ca231..04ea5eb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -59,6 +59,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1675567746,
+        "narHash": "sha256-huugg+7ok2VjmoLhkT+mAcw6iVK+hOqrYV0jMMD4EpQ=",
+        "owner": "Mic92",
+        "repo": "nix-index-database",
+        "rev": "3880fa89727c622ae4674a2b6169c81112b43cf4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1675942811,
@@ -94,6 +114,7 @@
       "inputs": {
         "agenix": "agenix",
         "cyrus-sasl-xoauth2": "cyrus-sasl-xoauth2",
+        "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs",
         "openconnect-sso": "openconnect-sso"
       }
diff --git a/flake.nix b/flake.nix
index d86fec4..a29fd45 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,9 +23,13 @@
       url = "github:robn/sasl2-oauth";
       flake = false;
     };
+    nix-index-database = {
+      url = "github:Mic92/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nixpkgs, agenix, ... }@inputs:
+  outputs = { self, nixpkgs, agenix, nix-index-database, ... }@inputs:
     let
       system = "x86_64-linux";
 
@@ -36,7 +40,11 @@
     in {
       nixosConfigurations.panacea = lib.nixosSystem {
         inherit system;
-        modules = [ (import ./configuration.nix) agenix.nixosModules.age ];
+        modules = [
+          (import ./configuration.nix)
+          agenix.nixosModules.age
+          nix-index-database.nixosModules.nix-index
+        ];
         specialArgs = { inherit inputs; };
       };