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, 15 insertions, 28 deletions

diff --git a/hosts/common/desktop/gnome.nix b/hosts/common/desktop/gnome.nix
index af4a0d0..e3f8b21 100644
--- a/hosts/common/desktop/gnome.nix
+++ b/hosts/common/desktop/gnome.nix
@@ -1,30 +1,17 @@
-{
-	config,
-	pkgs,
-	...
-}: let
-	environmentConfig =
-		if config.sys.desktop == "gnome"
-		then {
-			gnome.excludePackages = with pkgs; [
-				epiphany
-				gnome-tour
-			];
-			systemPackages = with pkgs; [
-				adw-gtk3
-				blackbox-terminal
-			];
-		}
-		else {};
+{pkgs, ...}: {
+	environment = {
+		gnome.excludePackages = with pkgs; [
+			epiphany
+			gnome-tour
+		];
+		systemPackages = with pkgs; [
+			adw-gtk3
+			blackbox-terminal
+		];
+	};
 
-	xserverConfig =
-		if config.sys.desktop == "gnome"
-		then {
-			displayManager.gdm.enable = true;
-			desktopManager.gnome.enable = true;
-		}
-		else {};
-in {
-	environment = environmentConfig;
-	services.xserver = xserverConfig;
+	services.xserver = {
+		displayManager.gdm.enable = true;
+		desktopManager.gnome.enable = true;
+	};
 }