overlays/systems/users: tidy up random stuff

1 files changed, 17 insertions, 19 deletions

diff --git a/users/default.nix b/users/default.nix
index 9209724..c654583 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -4,31 +4,29 @@
   self,
   ...
 }: let
-  inherit (inputs.hm.lib) homeManagerConfiguration;
-
   /*
   basic homeManagerConfiguration wrapper. defaults to x86_64-linux
   and gives basic, nice defaults
   */
-  mapUsers = lib.mapAttrs (
-    name: args:
-      homeManagerConfiguration (args
-        // {
-          modules =
-            [
-              ./${name}/home.nix
+  mkUser = name: args:
+    inputs.hm.lib.homeManagerConfiguration (args
+      // {
+        modules =
+          [
+            ./${name}/home.nix
+
+            {
+              _module.args.osConfig = {};
+              programs.home-manager.enable = true;
+            }
+          ]
+          ++ (args.modules or []);
 
-              {
-                _module.args.osConfig = {};
-                programs.home-manager.enable = true;
-              }
-            ]
-            ++ (args.modules or []);
+        extraSpecialArgs = {inherit inputs self;};
+        pkgs = args.pkgs or inputs.nixpkgs.legacyPackages."x86_64-linux";
+      });
 
-          extraSpecialArgs = {inherit inputs self;};
-          pkgs = args.pkgs or inputs.nixpkgs.legacyPackages."x86_64-linux";
-        })
-  );
+  mapUsers = lib.mapAttrs mkUser;
 in {
   flake.homeConfigurations = mapUsers {
     seth = {};