From 9d1fb1179969743f7ab37fb060b0cfd315e43cc7 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Thu, 13 Apr 2023 19:57:56 -0400
Subject: add optional modules arg to mkHMUsers

---
 util/user.nix | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'util')

diff --git a/util/user.nix b/util/user.nix
index e2539c2..3355459 100644
--- a/util/user.nix
+++ b/util/user.nix
@@ -6,20 +6,23 @@
     username,
     pkgs,
     stateVersion ? "22.11",
+    modules ? [],
   }:
     inputs.home-manager.lib.homeManagerConfiguration {
       inherit pkgs;
-      modules = [
-        ../users/${username}/home.nix
-        {
-          home = {
-            inherit username stateVersion;
-            homeDirectory = "/home/${username}";
-          };
+      modules =
+        [
+          ../users/${username}/home.nix
+          {
+            home = {
+              inherit username stateVersion;
+              homeDirectory = "/home/${username}";
+            };
 
-          programs.home-manager.enable = true;
-        }
-      ];
+            programs.home-manager.enable = true;
+          }
+        ]
+        ++ modules;
     };
 
   mapHMUsers = users:
@@ -27,5 +30,9 @@
       mkHMUser {
         inherit username;
         inherit (users.${username}) pkgs stateVersion;
+        modules =
+          if builtins.hasAttr "modules" users.${username}
+          then users.${username}.modules
+          else {};
       });
 }
-- 
cgit v1.2.3