refactor: cleaned up nixos and home dirs

modules/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/helpers.nix

@@ -0,0 +1,23 @@
+{
+  directoryImport =
+    let
+      collectDirs =
+        path:
+        let
+          content = builtins.readDir path;
+          subdirs = builtins.filter (name: content.${name} == "directory") (builtins.attrNames content);
+          buildPath = name: path + "/${name}";
+
+          thisDirs = map buildPath subdirs;
+          subDirs = builtins.concatMap collectDirs thisDirs;
+        in
+        [ path ] ++ subDirs;
+    in
+    path:
+    builtins.listToAttrs (
+      map (dir: {
+        name = baseNameOf (toString dir);
+        value = import dir;
+      }) (collectDirs path)
+    );
+}

modules/home/cli/android/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/cli/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/cli/development/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/cli/development/editing/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/cli/development/tooling/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/cli/development/versioning/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/cli/files/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/cli/fun/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/cli/shell/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/cli/utilities/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/default.nix

@@ -1,26 +1,6 @@
 { config, ... }:
 let
-  collectDirs =
+  inherit (import ../helpers.nix) directoryImport;
-    path:
-    let
-      content = builtins.readDir path;
-      subdirs = builtins.filter (name: content.${name} == "directory") (builtins.attrNames content);
-      buildPath = name: path + "/${name}";
-
-      thisDirs = map buildPath subdirs;
-      subDirs = builtins.concatMap collectDirs thisDirs;
-    in
-    [ path ] ++ subDirs;
-
-  directoryImport =
-    path:
-    builtins.listToAttrs (
-      map (dir: {
-        name = baseNameOf (toString dir);
-        value = import dir;
-      }) (collectDirs path)
-    );
-
   modules = directoryImport ./.;
 in
 {

modules/home/gui/apps/browsers/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/code/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/emulators/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/gaming/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/media/3d/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/media/audio/audioEditing/audioMetadata/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/media/audio/audioEditing/audioProduction/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/media/audio/audioEditing/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/media/audio/audioPlaying/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/media/audio/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/media/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/media/docs/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/media/docs/docEditing/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/media/docs/docViewing/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/media/images/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/media/images/imageEditing/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/media/images/imageViewing/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/media/llms/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/media/video/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/media/video/videoEditing/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/media/video/videoPlaying/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/messaging/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/messaging/discord/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/messaging/matrix/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/sharing/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/apps/tools/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/desktop/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/desktop/hypr/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/desktop/theming/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/home/gui/desktop/wayland/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/nixos/core/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/nixos/default.nix

@@ -1,25 +1,5 @@
 let
-  collectDirs =
+  inherit (import ../helpers.nix) directoryImport;
-    path:
-    let
-      content = builtins.readDir path;
-      subdirs = builtins.filter (name: content.${name} == "directory") (builtins.attrNames content);
-      buildPath = name: path + "/${name}";
-
-      thisDirs = map buildPath subdirs;
-      subDirs = builtins.concatMap collectDirs thisDirs;
-    in
-    [ path ] ++ subDirs;
-
-  directoryImport =
-    path:
-    builtins.listToAttrs (
-      map (dir: {
-        name = baseNameOf (toString dir);
-        value = import dir;
-      }) (collectDirs path)
-    );
-
   modules = directoryImport ./.;
 in
 {

modules/nixos/desktop/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/nixos/desktop/hypr/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/nixos/desktop/wayland/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/nixos/hardware/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/nixos/programs/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;

modules/nixos/services/default.nix

@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
+  importList =
-
+    let
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+      content = builtins.readDir ./.;
-
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-  importList = map (name: ./. + "/${name}") dirContent;
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;