diff --git a/modules/default.nix b/modules/default.nix
index f106bc5..da65bd2 100755
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/helpers.nix b/modules/helpers.nix
new file mode 100755
index 0000000..b6a664b
--- /dev/null
+++ b/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)
+    );
+}
diff --git a/modules/home/cli/android/default.nix b/modules/home/cli/android/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/cli/android/default.nix
+++ b/modules/home/cli/android/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/cli/default.nix b/modules/home/cli/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/cli/default.nix
+++ b/modules/home/cli/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/cli/development/default.nix b/modules/home/cli/development/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/cli/development/default.nix
+++ b/modules/home/cli/development/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/cli/development/editing/default.nix b/modules/home/cli/development/editing/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/cli/development/editing/default.nix
+++ b/modules/home/cli/development/editing/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/cli/development/tooling/default.nix b/modules/home/cli/development/tooling/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/cli/development/tooling/default.nix
+++ b/modules/home/cli/development/tooling/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/cli/development/versioning/default.nix b/modules/home/cli/development/versioning/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/cli/development/versioning/default.nix
+++ b/modules/home/cli/development/versioning/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/cli/files/default.nix b/modules/home/cli/files/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/cli/files/default.nix
+++ b/modules/home/cli/files/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/cli/fun/default.nix b/modules/home/cli/fun/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/cli/fun/default.nix
+++ b/modules/home/cli/fun/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/cli/shell/default.nix b/modules/home/cli/shell/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/cli/shell/default.nix
+++ b/modules/home/cli/shell/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/cli/utilities/default.nix b/modules/home/cli/utilities/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/cli/utilities/default.nix
+++ b/modules/home/cli/utilities/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 40f12a7..7fd896a 100755
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -1,26 +1,6 @@
 { config, ... }:
 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;
-
-  directoryImport =
-    path:
-    builtins.listToAttrs (
-      map (dir: {
-        name = baseNameOf (toString dir);
-        value = import dir;
-      }) (collectDirs path)
-    );
-
+  inherit (import ../helpers.nix) directoryImport;
   modules = directoryImport ./.;
 in
 {
diff --git a/modules/home/gui/apps/browsers/default.nix b/modules/home/gui/apps/browsers/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/browsers/default.nix
+++ b/modules/home/gui/apps/browsers/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/code/default.nix b/modules/home/gui/apps/code/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/code/default.nix
+++ b/modules/home/gui/apps/code/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/default.nix b/modules/home/gui/apps/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/default.nix
+++ b/modules/home/gui/apps/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/emulators/default.nix b/modules/home/gui/apps/emulators/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/emulators/default.nix
+++ b/modules/home/gui/apps/emulators/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/gaming/default.nix b/modules/home/gui/apps/gaming/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/gaming/default.nix
+++ b/modules/home/gui/apps/gaming/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/media/3d/default.nix b/modules/home/gui/apps/media/3d/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/media/3d/default.nix
+++ b/modules/home/gui/apps/media/3d/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/media/audio/audioEditing/audioMetadata/default.nix b/modules/home/gui/apps/media/audio/audioEditing/audioMetadata/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/media/audio/audioEditing/audioMetadata/default.nix
+++ b/modules/home/gui/apps/media/audio/audioEditing/audioMetadata/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/media/audio/audioEditing/audioProduction/default.nix b/modules/home/gui/apps/media/audio/audioEditing/audioProduction/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/media/audio/audioEditing/audioProduction/default.nix
+++ b/modules/home/gui/apps/media/audio/audioEditing/audioProduction/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/media/audio/audioEditing/default.nix b/modules/home/gui/apps/media/audio/audioEditing/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/media/audio/audioEditing/default.nix
+++ b/modules/home/gui/apps/media/audio/audioEditing/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/media/audio/audioPlaying/default.nix b/modules/home/gui/apps/media/audio/audioPlaying/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/media/audio/audioPlaying/default.nix
+++ b/modules/home/gui/apps/media/audio/audioPlaying/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/media/audio/default.nix b/modules/home/gui/apps/media/audio/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/media/audio/default.nix
+++ b/modules/home/gui/apps/media/audio/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/media/default.nix b/modules/home/gui/apps/media/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/media/default.nix
+++ b/modules/home/gui/apps/media/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/media/docs/default.nix b/modules/home/gui/apps/media/docs/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/media/docs/default.nix
+++ b/modules/home/gui/apps/media/docs/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/media/docs/docEditing/default.nix b/modules/home/gui/apps/media/docs/docEditing/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/media/docs/docEditing/default.nix
+++ b/modules/home/gui/apps/media/docs/docEditing/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/media/docs/docViewing/default.nix b/modules/home/gui/apps/media/docs/docViewing/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/media/docs/docViewing/default.nix
+++ b/modules/home/gui/apps/media/docs/docViewing/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/media/images/default.nix b/modules/home/gui/apps/media/images/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/media/images/default.nix
+++ b/modules/home/gui/apps/media/images/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/media/images/imageEditing/default.nix b/modules/home/gui/apps/media/images/imageEditing/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/media/images/imageEditing/default.nix
+++ b/modules/home/gui/apps/media/images/imageEditing/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/media/images/imageViewing/default.nix b/modules/home/gui/apps/media/images/imageViewing/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/media/images/imageViewing/default.nix
+++ b/modules/home/gui/apps/media/images/imageViewing/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/media/llms/default.nix b/modules/home/gui/apps/media/llms/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/media/llms/default.nix
+++ b/modules/home/gui/apps/media/llms/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/media/video/default.nix b/modules/home/gui/apps/media/video/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/media/video/default.nix
+++ b/modules/home/gui/apps/media/video/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/media/video/videoEditing/default.nix b/modules/home/gui/apps/media/video/videoEditing/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/media/video/videoEditing/default.nix
+++ b/modules/home/gui/apps/media/video/videoEditing/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/media/video/videoPlaying/default.nix b/modules/home/gui/apps/media/video/videoPlaying/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/media/video/videoPlaying/default.nix
+++ b/modules/home/gui/apps/media/video/videoPlaying/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/messaging/default.nix b/modules/home/gui/apps/messaging/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/messaging/default.nix
+++ b/modules/home/gui/apps/messaging/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/messaging/discord/default.nix b/modules/home/gui/apps/messaging/discord/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/messaging/discord/default.nix
+++ b/modules/home/gui/apps/messaging/discord/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/messaging/matrix/default.nix b/modules/home/gui/apps/messaging/matrix/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/messaging/matrix/default.nix
+++ b/modules/home/gui/apps/messaging/matrix/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/sharing/default.nix b/modules/home/gui/apps/sharing/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/sharing/default.nix
+++ b/modules/home/gui/apps/sharing/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/apps/tools/default.nix b/modules/home/gui/apps/tools/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/apps/tools/default.nix
+++ b/modules/home/gui/apps/tools/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/default.nix b/modules/home/gui/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/default.nix
+++ b/modules/home/gui/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/desktop/default.nix b/modules/home/gui/desktop/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/desktop/default.nix
+++ b/modules/home/gui/desktop/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/desktop/hypr/default.nix b/modules/home/gui/desktop/hypr/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/desktop/hypr/default.nix
+++ b/modules/home/gui/desktop/hypr/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/desktop/theming/default.nix b/modules/home/gui/desktop/theming/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/desktop/theming/default.nix
+++ b/modules/home/gui/desktop/theming/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/desktop/wayland/default.nix b/modules/home/gui/desktop/wayland/default.nix
index f106bc5..da65bd2 100755
--- a/modules/home/gui/desktop/wayland/default.nix
+++ b/modules/home/gui/desktop/wayland/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/home/gui/desktop/wayland/waybar/config/settings.nix b/modules/home/gui/desktop/wayland/waybar/config/settings.nix
index dc2671a..ed09a39 100755
--- a/modules/home/gui/desktop/wayland/waybar/config/settings.nix
+++ b/modules/home/gui/desktop/wayland/waybar/config/settings.nix
@@ -153,7 +153,7 @@ in
     };
 
     "custom/weather" = {
-      exec = "/home/${user0}/Files/Projects/dotfiles/home/modules/gui/desktop/wayland/waybar/config/scripts/get_weather.sh Winnipeg";
+      exec = "/home/${user0}/Files/Projects/dotfiles/modules/home/gui/desktop/wayland/waybar/config/scripts/get_weather.sh Winnipeg";
       return-type = "json";
       format = "{}";
       tooltip = true;
diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/cat-waves.png b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/cat-waves.png
new file mode 100755
index 0000000..ded59d8
Binary files /dev/null and b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/cat-waves.png differ
diff --git a/modules/nixos/core/default.nix b/modules/nixos/core/default.nix
index f106bc5..da65bd2 100755
--- a/modules/nixos/core/default.nix
+++ b/modules/nixos/core/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 6893b14..1836e09 100755
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,25 +1,5 @@
 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;
-
-  directoryImport =
-    path:
-    builtins.listToAttrs (
-      map (dir: {
-        name = baseNameOf (toString dir);
-        value = import dir;
-      }) (collectDirs path)
-    );
-
+  inherit (import ../helpers.nix) directoryImport;
   modules = directoryImport ./.;
 in
 {
diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
index f106bc5..da65bd2 100755
--- a/modules/nixos/desktop/default.nix
+++ b/modules/nixos/desktop/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/nixos/desktop/hypr/default.nix b/modules/nixos/desktop/hypr/default.nix
index f106bc5..da65bd2 100755
--- a/modules/nixos/desktop/hypr/default.nix
+++ b/modules/nixos/desktop/hypr/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/nixos/desktop/wayland/default.nix b/modules/nixos/desktop/wayland/default.nix
index f106bc5..da65bd2 100755
--- a/modules/nixos/desktop/wayland/default.nix
+++ b/modules/nixos/desktop/wayland/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/nixos/hardware/default.nix b/modules/nixos/hardware/default.nix
index f106bc5..da65bd2 100755
--- a/modules/nixos/hardware/default.nix
+++ b/modules/nixos/hardware/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/nixos/programs/default.nix b/modules/nixos/programs/default.nix
index f106bc5..da65bd2 100755
--- a/modules/nixos/programs/default.nix
+++ b/modules/nixos/programs/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix
index f106bc5..da65bd2 100755
--- a/modules/nixos/services/default.nix
+++ b/modules/nixos/services/default.nix
@@ -1,9 +1,10 @@
 let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
+  importList =
+    let
+      content = builtins.readDir ./.;
+      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+    in
+    map (name: ./. + "/${name}") dirContent;
 in
 {
   imports = importList;
diff --git a/systems/desktop/config/filesystem.nix b/systems/desktop/config/filesystem.nix
index e46b984..b71c625 100755
--- a/systems/desktop/config/filesystem.nix
+++ b/systems/desktop/config/filesystem.nix
@@ -71,11 +71,11 @@ in
     in
     {
       "/" = {
-        device = "/dev/disk/by-uuid/58987815-99d2-4a26-b260-529a4e78b854";
+        device = "/dev/disk/by-uuid/abf85775-d233-4303-ad03-652137d0fa6f";
         fsType = "ext4";
       };
       "/boot" = {
-        device = "/dev/disk/by-uuid/D39C-83F7";
+        device = "/dev/disk/by-uuid/73E2-4DC1";
         fsType = "vfat";
         options = desktop.boot.options;
       };
@@ -85,7 +85,7 @@ in
     // (builtins.listToAttrs (map sambaMounts sambaDrives));
 
   swapDevices = [
-    { device = "/dev/disk/by-uuid/f5d9890c-b341-47b0-8726-40afb645db56"; }
+    { device = "/dev/disk/by-uuid/1a8c0107-315e-427a-bc82-9e73dc3bf8f3"; }
   ];
 
   systemd.tmpfiles.rules = [