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, 27 insertions, 46 deletions

diff --git a/users/seth/desktop/gnome.nix b/users/seth/desktop/gnome.nix
index 40cbe99..482dae6 100644
--- a/users/seth/desktop/gnome.nix
+++ b/users/seth/desktop/gnome.nix
@@ -1,49 +1,30 @@
-{
-	config,
-	pkgs,
-	...
-}: let
-	inherit (config.seth) desktop;
-	homePackages =
-		if desktop == "gnome"
-		then with pkgs; [adw-gtk3] ++ (with pkgs.gnomeExtensions; [appindicator blur-my-shell caffeine])
-		else [];
-	dconfSettings =
-		if desktop == "gnome"
-		then {
-			"org/gnome/shell" = {
-				disable-user-extensions = false;
-				enabled-extensions = [
-					"[email protected]"
-					"[email protected]"
-					"[email protected]"
-				];
-				favorite-apps = [
-					"firefox.desktop"
-					"org.gnome.Nautilus.desktop"
-					"discord.desktop"
-				];
-			};
+{pkgs, ...}: {
+	home.packages = with pkgs; [adw-gtk3] ++ (with pkgs.gnomeExtensions; [appindicator blur-my-shell caffeine]);
 
-			"org/gnome/desktop/interface" = {
-				color-scheme = "prefer-dark";
-			};
-		}
-		else {};
+	dconf.settings = {
+		"org/gnome/shell" = {
+			disable-user-extensions = false;
+			enabled-extensions = [
+				"[email protected]"
+				"[email protected]"
+				"[email protected]"
+			];
+			favorite-apps = [
+				"firefox.desktop"
+				"org.gnome.Nautilus.desktop"
+				"discord.desktop"
+			];
+		};
+		"org/gnome/desktop/interface" = {
+			color-scheme = "prefer-dark";
+		};
+	};
 
-	gtkConfig =
-		if desktop == "gnome"
-		then {
-			enable = true;
-
-			theme = {
-				name = "adw-gtk3";
-				package = pkgs.adw-gtk3;
-			};
-		}
-		else {};
-in {
-	home.packages = homePackages;
-	dconf.settings = dconfSettings;
-	gtk = gtkConfig;
+	gtk = {
+		enable = true;
+		theme = {
+			name = "adw-gtk3";
+			package = pkgs.adw-gtk3;
+		};
+	};
 }