diff --git a/common.nix b/common.nix
index 54b3ad2..ca082a7 100644
--- a/common.nix
+++ b/common.nix
@@ -5,7 +5,13 @@ all: {
   options,
   ...
 }: {
-  imports = [all];
+  imports = [
+    all
+
+    inputs.nix-index-database.nixosModules.nix-index
+  ];
+
+  programs.nix-index-database.comma.enable = true;
 
   boot.loader = {
     systemd-boot.editor = lib.mkDefault false;
diff --git a/flake.nix b/flake.nix
index 1c38f78..bfcee50 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,6 +31,11 @@
       url = "github:sodiboo/niri-flake";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nix-index-database = {
+      url = "github:nix-community/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   nixConfig = {
diff --git a/home-manager/common.nix b/home-manager/common.nix
index 538c05f..27d4f8a 100644
--- a/home-manager/common.nix
+++ b/home-manager/common.nix
@@ -6,8 +6,12 @@ inputs: all: {
 }: {
   imports = [
     all
+
+    inputs.nix-index-database.homeModules.nix-index
   ];
 
+  programs.nix-index-database.comma.enable = true;
+
   programs.direnv = {
     enable = lib.mkDefault true;
     nix-direnv.enable = lib.mkDefault true;
diff --git a/modules/workstation.nix b/modules/workstation.nix
index 2e35405..11a74b9 100644
--- a/modules/workstation.nix
+++ b/modules/workstation.nix
@@ -32,8 +32,6 @@ in {
     services.gvfs.enable = lib.mkDefault true;
     services.udisks2.enable = lib.mkDefault true;
 
-    programs.nix-index-database.comma.enable = true;
-
     console = {
       earlySetup = lib.mkDefault false;
     };