From 2633e7bcf3b42447d88dbb5645c2f7d0cb9a1418 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 15 Feb 2023 02:52:52 -0500
Subject: improve mkHost

---
 util/host.nix |  6 +++---
 util/user.nix | 27 +++++++++++++++------------
 2 files changed, 18 insertions(+), 15 deletions(-)

(limited to 'util')

diff --git a/util/host.nix b/util/host.nix
index 637f0f3..c1dc5dd 100644
--- a/util/host.nix
+++ b/util/host.nix
@@ -5,8 +5,8 @@
 		system ? "x86_64-linux",
 		version ? "22.11",
 		pkgs,
-	}:
-		with pkgs.lib;
+	}: {
+		${name} = with pkgs.lib;
 			nixosSystem {
 				inherit system;
 				modules =
@@ -22,7 +22,6 @@
 
 							# Enable nix flakes
 							nix.package = pkgs.nixFlakes;
-							nix.settings.experimental-features = ["nix-command" "flakes"];
 						})
 
 						home-manager.nixosModules.home-manager
@@ -33,4 +32,5 @@
 					]
 					++ modules;
 			};
+	};
 }
diff --git a/util/user.nix b/util/user.nix
index e69d46c..3d16651 100644
--- a/util/user.nix
+++ b/util/user.nix
@@ -4,20 +4,23 @@
 		stateVersion ? "22.11",
 		system ? "x86_64-linux",
 		channel,
+		modules,
 	}:
 		home-manager.lib.homeManagerConfiguration {
 			pkgs = channel.legacyPackages.${system};
-			modules = [
-				../users/${username}/home.nix
-				{
-					nixpkgs.config.allowUnfree = true;
-					systemd.user.startServices = true;
-					home = {
-						inherit username stateVersion;
-						homeDirectory = "/home/${username}";
-					};
-					programs.home-manager.enable = true;
-				}
-			];
+			modules =
+				[
+					../users/${username}/home.nix
+					{
+						nixpkgs.config.allowUnfree = true;
+						systemd.user.startServices = true;
+						home = {
+							inherit username stateVersion;
+							homeDirectory = "/home/${username}";
+						};
+						programs.home-manager.enable = true;
+					}
+				]
+				++ modules;
 		};
 }
-- 
cgit v1.2.3