diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index 02470090..0be124d6 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -60,18 +60,6 @@
     ManagedOOMSwap = "kill";
   };
 
-  # TODO: move this to gui machines only
-  fonts = {
-    enableDefaultFonts = true;
-    fonts = with pkgs; [ font-awesome noto-fonts-emoji hack-font ];
-    fontconfig.enable = true;
-    fontconfig.defaultFonts = {
-      emoji = [ "Font Awesome 6 Free" "Noto Color Emoji" ];
-      monospace = [ "Hack" ];
-      serif = [ "DejaVu Serif" ];
-      sansSerif = [ "DejaVu Sans" ];
-    };
-  };
 
   system.activationScripts.nixClosureDiff = {
     supportsDryActivation = true;
diff --git a/hosts/common/programs/assorted.nix b/hosts/common/programs/assorted.nix
index ad4e3e71..4aa89cf6 100644
--- a/hosts/common/programs/assorted.nix
+++ b/hosts/common/programs/assorted.nix
@@ -143,8 +143,9 @@
     guiApps = {
       package = null;
       suggestedPrograms = [
-        "web-browser"
+        "fontconfig"  # for default fonts
         "tuiApps"
+        "web-browser"
       ] ++ lib.optional (pkgs.system == "x86_64-linux") "x86GuiApps"
       ++ [
         # "celluloid"  # mpv frontend
diff --git a/hosts/common/programs/default.nix b/hosts/common/programs/default.nix
index faddcb0c..5c1f84ce 100644
--- a/hosts/common/programs/default.nix
+++ b/hosts/common/programs/default.nix
@@ -6,6 +6,7 @@
     ./assorted.nix
     ./cozy.nix
     ./epiphany.nix
+    ./fontconfig.nix
     ./git.nix
     ./gnome-feeds.nix
     ./gpodder.nix
diff --git a/hosts/common/programs/fontconfig.nix b/hosts/common/programs/fontconfig.nix
new file mode 100644
index 00000000..eb0a29d1
--- /dev/null
+++ b/hosts/common/programs/fontconfig.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+{
+  fonts = lib.mkIf config.sane.programs.fontconfig.enabled {
+    fontconfig.enable = true;
+    fontconfig.defaultFonts = lib.mkDefault {
+      emoji = [ "Font Awesome 6 Free" "Noto Color Emoji" ];
+      monospace = [ "Hack" ];
+      serif = [ "DejaVu Serif" ];
+      sansSerif = [ "DejaVu Sans" ];
+    };
+    enableDefaultFonts = lib.mkDefault true;
+    fonts = with pkgs; lib.mkDefault [ font-awesome noto-fonts-emoji hack-font ];
+  };
+}