diff --git a/src/user/modules/default.nix b/src/user/modules/default.nix
index 01abb97..7126bfd 100644
--- a/src/user/modules/default.nix
+++ b/src/user/modules/default.nix
@@ -1,9 +1,14 @@
+{ lib, ... }:
+
+with lib;
+let
+  mkModules = dir: recursiveUpdate
+    (attrsets.mapAttrs (_: moduleDir: {
+      inherit (moduleDir) default;
+    }) (filterAttrs (n: v: isAttrs v) (attrsets.mapAttrs (_: v: builtins.readDir v) dir)))
+    { inherit (dir) default; };
+
+in
 {
-  imports = [
-    ./bash
-    ./git
-    ./gui
-    ./security
-    ./utils
-  ];
+  imports = mkModules ./.;
 }