From ab3ea6d89795f0413b0e7a4b5c65bff989f7f284 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Thu, 28 Dec 2023 23:01:41 -0500
Subject: ci: make hydraJobs a bit neater

---
 users/default.nix | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'users/default.nix')

diff --git a/users/default.nix b/users/default.nix
index 8aaa0bb..4f81fbb 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -1,17 +1,19 @@
 {
-  lib,
-  withSystem,
   inputs,
   self,
   ...
-}: let
-  /*
-  basic homeManagerConfiguration wrapper. defaults to x86_64-linux
-  and gives basic, nice defaults
-  */
-  mkUser = name: args:
-    inputs.hm.lib.homeManagerConfiguration (args
-      // {
+}: {
+  perSystem = {
+    lib,
+    pkgs,
+    inputs',
+    ...
+  }: let
+    # basic homeManagerConfiguration wrapper with nice defaults
+    mkUser = name: args:
+      inputs.hm.lib.homeManagerConfiguration (lib.recursiveUpdate args {
+        pkgs = args.pkgs or pkgs;
+
         modules =
           [
             ./${name}/home.nix
@@ -24,16 +26,14 @@
           ++ (args.modules or []);
 
         extraSpecialArgs = {
-          inherit inputs self;
-          inputs' = withSystem (args.system or "x86_64-linux") ({inputs', ...}: inputs');
+          inherit inputs inputs' self;
         };
-
-        pkgs = args.pkgs or inputs.nixpkgs.legacyPackages."x86_64-linux";
       });
 
-  mapUsers = lib.mapAttrs mkUser;
-in {
-  flake.homeConfigurations = mapUsers {
-    seth = {};
+    mapUsers = lib.mapAttrs mkUser;
+  in {
+    legacyPackages.homeConfigurations = mapUsers {
+      seth = {};
+    };
   };
 }
-- 
cgit v1.2.3