finish up refactor + add glados host

thanks replaycoding uwu

1 files changed, 21 insertions, 18 deletions

diff --git a/util/host.nix b/util/host.nix
index 6a58370..330edb6 100644
--- a/util/host.nix
+++ b/util/host.nix
@@ -1,28 +1,31 @@
-{nixpkgs, home-manager, ...}:
-
 {
+	nixpkgs,
+	home-manager,
+	...
+}: {
 	mkHost = {
 		name,
 		modules,
 		system ? "x86_64-linux",
 		pkgs,
 	}:
-		pkgs.lib.nixosSystem {
-			inherit system;
-			modules =
-				[
-					../hosts/common
+		with pkgs.lib;
+			nixosSystem {
+				inherit system;
+				modules =
+					[
+						../hosts/common
 
-					{
-						networking.hostName = nixpkgs.lib.mkDefault name;
-					}
+						{
+							networking.hostName = mkDefault name;
+						}
 
-					home-manager.nixosModules.home-manager
-					{
-						home-manager.useGlobalPkgs = true;
-						home-manager.useUserPackages = true;
-					}
-				]
-				++ modules;
-		};
+						home-manager.nixosModules.home-manager
+						{
+							home-manager.useGlobalPkgs = true;
+							home-manager.useUserPackages = true;
+						}
+					]
+					++ modules;
+			};
 }