diff --git a/modules/default.nix b/modules/default.nix
index a979efd..e559070 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -12,6 +12,7 @@
     ./home.nix
     ./i18n.nix
     # ./minegrub.nix
+    ./nix-index.nix
     ./nix-settings.nix
     ./remote-builds.nix
     ./secrets.nix
diff --git a/modules/nix-index.nix b/modules/nix-index.nix
new file mode 100644
index 0000000..f8d1a19
--- /dev/null
+++ b/modules/nix-index.nix
@@ -0,0 +1,8 @@
+{}: {
+  imports = [
+    inputs.nix-index-database.nixosModules.nix-index
+  ];
+  programs.nix-index-database.comma.enable = true;
+  programs.command-not-found.enable = false; # TODO fix ts
+
+}
\ No newline at end of file
diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix
index 8ab6bd1..f993436 100644
--- a/modules/nix-settings.nix
+++ b/modules/nix-settings.nix
@@ -4,10 +4,6 @@
   ...
 }:
 {
-  imports = [
-    inputs.nix-index-database.nixosModules.nix-index
-  ];
-  programs.nix-index-database.comma.enable = true;
   # Allow unfree packages
   nixpkgs.config.allowUnfreePredicate =
     pkg:
@@ -77,8 +73,5 @@
 
   # nix.nixPath = ["nixpkgs=${pkgs.path}"];
 
-  # disable the database error TODO add nix-index search
-  # programs.command-not-found.enable = false; # TODO fix ts
-
   system.configurationRevision = inputs.self.rev or "dirty";
 }