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, 24 insertions, 26 deletions

diff --git a/hosts/common/fonts.nix b/hosts/common/fonts.nix
index c49f99c..78993cf 100644
--- a/hosts/common/fonts.nix
+++ b/hosts/common/fonts.nix
@@ -1,34 +1,32 @@
 {
-	config,
 	pkgs,
+	desktop,
 	...
 }: let
-	guiFonts =
-		if config.sys.gui.enable
-		then
-			with pkgs; [
-				noto-fonts
-				noto-fonts-extra
-				noto-fonts-emoji
-				noto-fonts-cjk-sans
-				fira-code
-				(nerdfonts.override {fonts = ["FiraCode"];})
-			]
-		else [];
-
-	guiDefaultFonts =
-		if config.sys.gui.enable
-		then {
-			serif = ["Noto Serif"];
-			sansSerif = ["Noto Sans"];
-			emoji = ["Noto Color Emoji"];
-			monospace = ["Fira Code"];
-		}
-		else {};
+	gui = desktop != "";
 in {
 	fonts = {
-		enableDefaultFonts = true;
-		fonts = guiFonts;
-		fontconfig.defaultFonts = guiDefaultFonts;
+		enableDefaultFonts = gui;
+		fonts =
+			if gui
+			then
+				with pkgs; [
+					noto-fonts
+					noto-fonts-extra
+					noto-fonts-emoji
+					noto-fonts-cjk-sans
+					fira-code
+					(nerdfonts.override {fonts = ["FiraCode"];})
+				]
+			else [];
+		fontconfig.defaultFonts =
+			if gui
+			then {
+				serif = ["Noto Serif"];
+				sansSerif = ["Noto Sans"];
+				emoji = ["Noto Color Emoji"];
+				monospace = ["Fira Code"];
+			}
+			else {};
 	};
 }