diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index e4c7c511..41012cf1 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -6,7 +6,6 @@
     ./gitea-actions-runner.nix
     ./gnupg.nix
     ./kanata.nix
-    ./nix-index.nix
     ./nixpad
     ./pipewire.nix
     ./podman.nix
diff --git a/modules/nixos/nix-index.nix b/modules/nixos/nix-index.nix
deleted file mode 100644
index 614416bd..00000000
--- a/modules/nixos/nix-index.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ inputs, ... }:
-
-{
-  imports = [ inputs.nix-index-database.nixosModules.nix-index ];
-
-  programs.nix-index-database.comma.enable = true;
-}
diff --git a/modules2/nix-index.nix b/modules2/nix-index.nix
new file mode 100644
index 00000000..b1fcf010
--- /dev/null
+++ b/modules2/nix-index.nix
@@ -0,0 +1,12 @@
+{ inputs, ... }:
+
+{
+  flake.modules.homeManager.base = {
+    imports = [ inputs.nix-index-database.homeModules.nix-index ];
+
+    programs = {
+      nix-index.enable = true;
+      nix-index-database.comma.enable = true;
+    };
+  };
+}