!garnix -> hercules-ci

2 files changed, 25 insertions, 14 deletions

diff --git a/users/default.nix b/users/default.nix
index 77836f5..2dc930c 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -3,21 +3,14 @@
   self,
   ...
 }: let
-  inherit (self.lib.configs) genHMCfgs genHMModules;
-
-  users = {
-    seth = {
-      nixpkgsArgs = {
-        overlays = with inputs; [nur.overlay getchoo.overlays.default];
-      };
-      modules = [
-        inputs.nix-index-database.hmModules.nix-index
-      ];
-    };
-  };
+  inherit (self.lib.configs) mapHMUsers genHMModules;
+  users = import ./users.nix inputs;
 in {
+  perSystem = {system, ...}: {
+    homeConfigurations = mapHMUsers (users system);
+  };
+
   flake = {
-    homeConfigurations = genHMCfgs users;
-    homeManagerModules = genHMModules users;
+    homeManagerModules = genHMModules (users "x86_64-linux");
   };
 }
diff --git a/users/users.nix b/users/users.nix
new file mode 100644
index 0000000..af8a9ae
--- /dev/null
+++ b/users/users.nix
@@ -0,0 +1,18 @@
+{
+  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
+    ];
+  };
+}