diff --git a/flake-parts/home-manager/users.nix b/flake-parts/home-manager/users.nix
index dce159e..22cf179 100644
--- a/flake-parts/home-manager/users.nix
+++ b/flake-parts/home-manager/users.nix
@@ -8,6 +8,7 @@
     homeManagerModules.user-willem = {
       imports = [
         self.homeManagerModules.default
+        inputs.nix-index-database.hmModules.nix-index
       ];
 
       home.username = "willem";
diff --git a/flake-parts/nixos/hosts.nix b/flake-parts/nixos/hosts.nix
index f41379b..f16ed00 100644
--- a/flake-parts/nixos/hosts.nix
+++ b/flake-parts/nixos/hosts.nix
@@ -10,6 +10,7 @@
         ../../nixos/profiles/linux/base.nix
         self.nixosModules.useFlakeNixpkgs
         self.nixosModules.users-willem
+        inputs.nix-index-database.nixosModules.nix-index
       ];
 
       nixpkgs.overlays = builtins.attrValues self.overlays;
diff --git a/flake.lock b/flake.lock
index 26d7fc2..87da5e3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -234,6 +234,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1699156599,
+        "narHash": "sha256-Qk9ZE/pG9lNIGUVNArJxL0Hc0Soa92eQPPIhcDwWinU=",
+        "owner": "Mic92",
+        "repo": "nix-index-database",
+        "rev": "5388a4002179d6778d212dc2fdcc7ac3fdbd5b65",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nixos-apple-silicon": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -386,6 +406,7 @@
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
+        "nix-index-database": "nix-index-database",
         "nixos-apple-silicon": "nixos-apple-silicon",
         "nixpkgs": "nixpkgs_3",
         "pre-commit-hooks": "pre-commit-hooks"
diff --git a/flake.nix b/flake.nix
index c4d4e1a..02cbe62 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,19 +3,30 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+
     darwin.url = "github:lnl7/nix-darwin";
     darwin.inputs.nixpkgs.follows = "nixpkgs";
+
     emacs-overlay.url = "github:nix-community/emacs-overlay";
     emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
+
     fenix.url = "github:nix-community/fenix";
+
     flake-parts.url = "github:hercules-ci/flake-parts";
+
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
+
     hyprland.url = "github:hyprwm/Hyprland";
+
     nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon";
     nixos-apple-silicon.inputs.nixpkgs.follows = "nixpkgs";
+
     pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
     pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
+
+    nix-index-database.url = "github:Mic92/nix-index-database";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = inputs: