refactor: cleaned up folds

home-manager/default.nix

@@ -1,15 +1,17 @@
 let
   modulesPath = ./modules;
 
-  importFolder = name: {"${name}" = import (modulesPath + "/${name}");};
-  importFile = name: {"${name}" = import (modulesPath + "/${name}.nix");};
-  importMisc = name: {"misc-${name}" = import (modulesPath + "/misc/${name}.nix");};
-
   modules =
     builtins.foldl' (
       emptySet: importedModules:
         emptySet // importedModules
-    ) {} (map importFolder [
+    ) {} (map
+      (name: {
+        "${name}" =
+          import (modulesPath
+            + "/${name}");
+      })
+      [
         "bat"
         "firefox"
         "obs-studio"
@@ -19,7 +21,13 @@ let
     // builtins.foldl' (
       emptySet: importedModules:
         emptySet // importedModules
-    ) {} (map importFile [
+    ) {} (map
+      (name: {
+        "${name}" =
+          import (modulesPath
+            + "/${name}.nix");
+      })
+      [
         "bottom"
         "brave"
         "direnv"
@@ -41,7 +49,13 @@ let
     // builtins.foldl' (
       emptySet: importedModules:
         emptySet // importedModules
-    ) {} (map importMisc [
+    ) {} (map
+      (name: {
+        "misc-${name}" =
+          import (modulesPath
+            + "/misc/${name}.nix");
+      })
+      [
         "android"
         "commandLine"
         "desktop"

nixos/default.nix

@@ -1,20 +1,29 @@
 let
   modulesPath = ./modules;
 
-  importFolder = name: {"${name}" = import (modulesPath + "/${name}");};
-  importFile = name: {"${name}" = import (modulesPath + "/${name}.nix");};
-
   modules =
     builtins.foldl' (
       emptySet: importedModules:
         emptySet // importedModules
-    ) {} (map importFolder [
+    ) {} (map
+      (name: {
+        "${name}" =
+          import (modulesPath
+            + "/${name}");
+      })
+      [
         "services"
       ])
     // builtins.foldl' (
       emptySet: importedModules:
         emptySet // importedModules
-    ) {} (map importFile [
+    ) {} (map
+      (name: {
+        "${name}" =
+          import (modulesPath
+            + "/${name}.nix");
+      })
+      [
         "accounts"
         "android"
         "audio"