diff --git a/home-manager/default.nix b/home-manager/default.nix
index c652124..099dce0 100755
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -1,59 +1,73 @@
 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 [
-      "bat"
-      "firefox"
-      "obs-studio"
-      "qbittorrent"
-      "steam"
-    ])
+    ) {} (map
+      (name: {
+        "${name}" =
+          import (modulesPath
+            + "/${name}");
+      })
+      [
+        "bat"
+        "firefox"
+        "obs-studio"
+        "qbittorrent"
+        "steam"
+      ])
     // builtins.foldl' (
       emptySet: importedModules:
         emptySet // importedModules
-    ) {} (map importFile [
-      "bottom"
-      "brave"
-      "direnv"
-      "freetube"
-      "git"
-      "helix"
-      "home-manager"
-      "lazygit"
-      "mpv"
-      "nextcloud"
-      "nushell"
-      "starship"
-      "vscode"
-      "wezterm"
-      "yazi"
-      "zellij"
-      "zoxide"
-    ])
+    ) {} (map
+      (name: {
+        "${name}" =
+          import (modulesPath
+            + "/${name}.nix");
+      })
+      [
+        "bottom"
+        "brave"
+        "direnv"
+        "freetube"
+        "git"
+        "helix"
+        "home-manager"
+        "lazygit"
+        "mpv"
+        "nextcloud"
+        "nushell"
+        "starship"
+        "vscode"
+        "wezterm"
+        "yazi"
+        "zellij"
+        "zoxide"
+      ])
     // builtins.foldl' (
       emptySet: importedModules:
         emptySet // importedModules
-    ) {} (map importMisc [
-      "android"
-      "commandLine"
-      "desktop"
-      "entertainment"
-      "internet"
-      "productionArt"
-      "productionAudio"
-      "productionVideo"
-      "productionWriting"
-      "tracking"
-      "virtualization"
-    ]);
+    ) {} (map
+      (name: {
+        "misc-${name}" =
+          import (modulesPath
+            + "/misc/${name}.nix");
+      })
+      [
+        "android"
+        "commandLine"
+        "desktop"
+        "entertainment"
+        "internet"
+        "productionArt"
+        "productionAudio"
+        "productionVideo"
+        "productionWriting"
+        "tracking"
+        "virtualization"
+      ]);
 in {
   flake.homeModules = {
     desktop = {
diff --git a/nixos/default.nix b/nixos/default.nix
index f24fe13..5ccc197 100755
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -1,55 +1,64 @@
 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 [
-      "services"
-    ])
+    ) {} (map
+      (name: {
+        "${name}" =
+          import (modulesPath
+            + "/${name}");
+      })
+      [
+        "services"
+      ])
     // builtins.foldl' (
       emptySet: importedModules:
         emptySet // importedModules
-    ) {} (map importFile [
-      "accounts"
-      "android"
-      "audio"
-      "bluetooth"
-      "corectrl"
-      "dconf"
-      "disks"
-      "doas"
-      "environment"
-      "firejail"
-      "flatpak"
-      "fonts"
-      "gnome"
-      "greetd"
-      "gvfs"
-      "home-manager"
-      "locale"
-      "network"
-      "nix"
-      "nur"
-      "ollama"
-      "plasma"
-      "printing"
-      "regreet"
-      "rsyncd"
-      "sddm"
-      "sops"
-      "ssh"
-      "steam"
-      "syncthing"
-      "sysstat"
-      "system"
-      "virtualization"
-      "xserver"
-    ]);
+    ) {} (map
+      (name: {
+        "${name}" =
+          import (modulesPath
+            + "/${name}.nix");
+      })
+      [
+        "accounts"
+        "android"
+        "audio"
+        "bluetooth"
+        "corectrl"
+        "dconf"
+        "disks"
+        "doas"
+        "environment"
+        "firejail"
+        "flatpak"
+        "fonts"
+        "gnome"
+        "greetd"
+        "gvfs"
+        "home-manager"
+        "locale"
+        "network"
+        "nix"
+        "nur"
+        "ollama"
+        "plasma"
+        "printing"
+        "regreet"
+        "rsyncd"
+        "sddm"
+        "sops"
+        "ssh"
+        "steam"
+        "syncthing"
+        "sysstat"
+        "system"
+        "virtualization"
+        "xserver"
+      ]);
 in {
   flake.nixosModules = {
     personal = {