Rewrote systemwide system, fixed broken build

modules/users/default.nix

@@ -31,9 +31,6 @@ let
 in
 {
   imports = [
-    # Import system wide configuration required for user modules
-    ../../user-modules/systemwide/default.nix
-
     # Import systemwide configuration
     ./systemwide.nix
   ];

modules/users/systemwide.nix

@@ -1,13 +1,33 @@
 {
-  lib,
   config,
+  lib,
   ...
 }:
 
 with lib;
 let
-  configuration = (map (user: user.systemwide) (attrValues config.home-manager.users));
+  moduleFiles = [
+    ../../user-modules/desktop/systemwide.nix
+    ../../user-modules/development/systemwide.nix
+    ../../user-modules/gaming/systemwide.nix
+    ../../user-modules/keyring/systemwide.nix
+  ];
+
+  moduleConfig = lists.foldr (file: acc: recursiveUpdate acc (import file)) { } moduleFiles;
+
+  moduleNames = attrNames moduleConfig;
+
+  mkModule =
+    name: moduleConfig:
+    { pkgs, ... }:
+    {
+      config = mkIf (any (user: user.modules.${name}.enable) (attrValues config.home-manager.users)) (
+        if (isAttrs moduleConfig) then moduleConfig else (moduleConfig { inherit config pkgs; })
+      );
+    };
+
+  imports = map (name: mkModule name moduleConfig."${name}") moduleNames;
 in
 {
-  config = configuration;
+  imports = imports;
 }