lib: move back to mapHMUsers

3 files changed, 22 insertions, 35 deletions

diff --git a/parts/lib/configs.nix b/parts/lib/configs.nix
index b1413a8..a3c20a6 100644
--- a/parts/lib/configs.nix
+++ b/parts/lib/configs.nix
@@ -3,9 +3,9 @@
   self,
   ...
 }: let
-  inherit (builtins) attrNames elemAt mapAttrs zipAttrsWith;
+  inherit (builtins) attrNames mapAttrs;
   inherit (inputs) nixpkgs hm;
-  inherit (nixpkgs.lib) genAttrs optional splitString;
+  inherit (nixpkgs.lib) genAttrs optional;
 
   mkSystemCfg = name: {
     profile,
@@ -45,18 +45,9 @@
         ++ optional pkgs.stdenv.isDarwin ../../users/${name}/darwin.nix
         ++ modules;
     };
-
-  genHMUsersForSys = users: system: let
-    users' = users system;
-    formattedUsers = map (u: "${u}@${system}") (attrNames users');
-  in
-    genAttrs formattedUsers (user: let
-      name = elemAt (splitString "@" user) 0;
-    in
-      mkHMCfg name users'.${name});
 in {
   inherit mkHMCfg mkSystemCfg;
-  genHMUsers = users: systems: zipAttrsWith (_: v: elemAt v 0) (map (genHMUsersForSys users) systems);
+  mapHMUsers = mapAttrs mkHMCfg;
 
   mapSystems = mapAttrs mkSystemCfg;
 
diff --git a/users/default.nix b/users/default.nix
index 864ed65..2b783d1 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -1,14 +1,28 @@
 {
-  config,
   inputs,
   self,
   ...
 }: let
-  inherit (self.lib.configs) genHMUsers genHMModules;
-  users = import ./users.nix inputs;
+  inherit (self.lib.configs) genHMModules mapHMUsers;
+  inherit (inputs) getchoo nixpkgs nix-index-database nur;
+
+  users = let
+    seth = system: {
+      pkgs = import nixpkgs {
+        inherit system;
+        overlays = [nur.overlay getchoo.overlays.default];
+      };
+
+      modules = [
+        nix-index-database.hmModules.nix-index
+      ];
+    };
+  in {
+    seth = seth "x86_64-linux";
+  };
 in {
   flake = {
-    homeConfigurations = genHMUsers users config.systems;
-    homeManagerModules = genHMModules (users "x86_64-linux");
+    homeConfigurations = mapHMUsers users;
+    homeManagerModules = genHMModules users;
   };
 }
diff --git a/users/users.nix b/users/users.nix
deleted file mode 100644
index af8a9ae..0000000
--- a/users/users.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  getchoo,
-  nixpkgs,
-  nix-index-database,
-  nur,
-  ...
-}: system: {
-  seth = {
-    pkgs = import nixpkgs {
-      inherit system;
-      overlays = [nur.overlay getchoo.overlays.default];
-    };
-
-    modules = [
-      nix-index-database.hmModules.nix-index
-    ];
-  };
-}