major refactor

- `mkHost` now accepts an optional `specialArgs` argument to be passed to
  `nixosSystem()`
- the `modules` argument for `mkHMUser` is now optional

2 files changed, 8 insertions, 4 deletions

diff --git a/util/host.nix b/util/host.nix
index 90f1dec..869b674 100644
--- a/util/host.nix
+++ b/util/host.nix
@@ -3,12 +3,13 @@
 		name,
 		modules,
 		system ? "x86_64-linux",
+		specialArgs ? {},
 		version ? "22.11",
 		pkgs,
 	}: {
 		${name} = with pkgs.lib;
 			nixosSystem {
-				inherit system;
+				inherit system specialArgs;
 				modules =
 					[
 						../hosts/common
@@ -27,8 +28,11 @@
 
 						home-manager.nixosModules.home-manager
 						{
-							home-manager.useGlobalPkgs = true;
-							home-manager.useUserPackages = true;
+							home-manager = {
+								useGlobalPkgs = true;
+								useUserPackages = true;
+								extraSpecialArgs = specialArgs;
+							};
 						}
 					]
 					++ modules;
diff --git a/util/user.nix b/util/user.nix
index 3d16651..62c29f2 100644
--- a/util/user.nix
+++ b/util/user.nix
@@ -4,7 +4,7 @@
 		stateVersion ? "22.11",
 		system ? "x86_64-linux",
 		channel,
-		modules,
+		modules ? [],
 	}:
 		home-manager.lib.homeManagerConfiguration {
 			pkgs = channel.legacyPackages.${system};