From c559542f0aa87971a7f4c1b3478fe33cc904b902 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Fri, 21 Jun 2024 11:23:28 -0400
Subject: [PATCH] gtk: explicitly set default font size

Fixes #5562
---
 modules/misc/gtk.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/misc/gtk.nix b/modules/misc/gtk.nix
index 6454eb2ae..e1ae250fd 100644
--- a/modules/misc/gtk.nix
+++ b/modules/misc/gtk.nix
@@ -221,10 +221,9 @@ in {
 
   config = mkIf cfg.enable (let
     gtkIni = optionalAttrs (cfg.font != null) {
-      gtk-font-name = let
-        fontSize =
-          optionalString (cfg.font.size != null) " ${toString cfg.font.size}";
-      in "${cfg.font.name}" + fontSize;
+      gtk-font-name =
+        let fontSize = if cfg.font.size != null then cfg.font.size else 10;
+        in "${cfg.font.name} ${toString fontSize}";
     } // optionalAttrs (cfg.theme != null) { gtk-theme-name = cfg.theme.name; }
       // optionalAttrs (cfg.iconTheme != null) {
         gtk-icon-theme-name = cfg.iconTheme.name;
@@ -245,10 +244,9 @@ in {
       '' + cfg4.extraCss;
 
     dconfIni = optionalAttrs (cfg.font != null) {
-      font-name = let
-        fontSize =
-          optionalString (cfg.font.size != null) " ${toString cfg.font.size}";
-      in "${cfg.font.name}" + fontSize;
+      font-name =
+        let fontSize = if cfg.font.size != null then cfg.font.size else 10;
+        in "${cfg.font.name} ${toString fontSize}";
     } // optionalAttrs (cfg.theme != null) { gtk-theme = cfg.theme.name; }
       // optionalAttrs (cfg.iconTheme != null) {
         icon-theme = cfg.iconTheme.name;