diff --git a/modules/default.nix b/modules/default.nix
index b9c71a9..09a4da8 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,15 +1,19 @@
+{ lib, ... }:
+let
+  b = builtins;
+
+  module_files =
+    b.readDir ./. |>
+    lib.filterAttrs (name: type:
+      ( (lib.strings.hasSuffix ".nix" name
+        && name != "default.nix"
+        && type == "regular" )
+      || ( type == "directory"
+        && b.pathExists ./${name}/default.nix))
+    ) |>
+    b.attrNames |>
+    b.map (f: ./${f});
+in
 {
-  imports = [
-    ./cli
-    ./packages.nix
-    ./desktop
-    ./gaming
-    ./hardware.nix
-    ./network.nix
-    ./services.nix
-    ./fonts.nix
-    ./ld.nix
-    ./nvidia.nix
-    ./corsairLink.nix
-  ];
-}
+  imports = module_files;
+}
\ No newline at end of file