feat(lib.create): Expose users module with specified usersDir

metacraft-labs · Jan 24, 2025 · 35c6d21 · 35c6d21
1 parent 39c9877
commit 35c6d21
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/flake.nix b/flake.nix
@@ -244,6 +244,9 @@
           machinesDir ? null,
           usersDir ? null,
         }:
+        let
+          utils = import ./lib { inherit usersDir rootDir machinesDir; };
+        in
         {
           dirs = {
             lib = self + "/lib";
@@ -260,7 +263,11 @@
                 usersDir
                 ;
             };
-            utils = import ./lib { inherit usersDir rootDir machinesDir; };
+            inherit utils;
+          };
+
+          modules = {
+            users = import ./modules/users.nix utils;
           };
         };
     };

diff --git a/modules/users.nix b/modules/users.nix
@@ -1,8 +1,4 @@
-{
-  usersDir,
-  rootDir,
-  machinesDir,
-}:
+utils:
 {
   config,
   lib,
@@ -12,7 +8,6 @@ let
   cfg = config.users;
   enabled = cfg.includedUsers != [ ] || cfg.includedGroups != [ ];
 
-  utils = import ../lib { inherit usersDir rootDir machinesDir; };
   allUsers = utils.usersInfo;
   allGroups =
     let