major refactor

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

1 files changed, 10 insertions, 10 deletions

diff --git a/hosts/common/packages.nix b/hosts/common/packages.nix
index a2f5c15..174e984 100644
--- a/hosts/common/packages.nix
+++ b/hosts/common/packages.nix
@@ -1,15 +1,11 @@
 {
-	config,
 	pkgs,
+	desktop,
 	...
 }: let
-	extraPkgs =
-		if config.sys.gui.enable
-		then with pkgs; [firefox]
-		else [];
-
+	gui = desktop != "";
 	pinentry =
-		if config.sys.desktop == "gnome"
+		if desktop == "gnome"
 		then pkgs.pinentry-gnome
 		else pkgs.pinentry-curses;
 in {
@@ -17,10 +13,14 @@ in {
 		[
 			git
 			neofetch
-			python310
+			python311
 			vim
 		]
-		++ extraPkgs
+		++ (
+			if gui
+			then with pkgs; [firefox]
+			else []
+		)
 		++ [pinentry];
 
 	programs = {
@@ -28,7 +28,7 @@ in {
 			agent = {
 				enable = true;
 				pinentryFlavor =
-					if config.sys.desktop == "gnome"
+					if desktop == "gnome"
 					then "gnome3"
 					else "curses";
 			};