From 57dabc434b529e35e02a93add3cb904561790d3d Mon Sep 17 00:00:00 2001
From: Daniel Thwaites <danthwaites30@btinternet.com>
Date: Sun, 9 Jul 2023 16:39:13 +0100
Subject: [PATCH] Adjust KDE fonts :bug:

The smallest readable font was actually too small to read.
I've increased it to the normal font size to be consistent with
what the user has configured.

The font for window titles was also missing.
---
 modules/kde/hm.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/kde/hm.nix b/modules/kde/hm.nix
index 17f8f4ba..158f0dd7 100644
--- a/modules/kde/hm.nix
+++ b/modules/kde/hm.nix
@@ -43,6 +43,10 @@ let
     DisabledValue = 1;
   };
 
+  desktopFont = "${sansSerif.name},${toString sizes.desktop},-1,5,50,0,0,0,0,0";
+  applicationFont = "${sansSerif.name},${toString sizes.applications},-1,5,50,0,0,0,0,0";
+  monospaceFont = "${monospace.name},${toString sizes.terminal},-1,5,50,0,0,0,0,0";
+
   kdeglobals = {
     # The existence of this group makes the following settings unable to
     # be changed by the user, as specified at
@@ -54,19 +58,13 @@ let
       ColorScheme = "Breeze";
       widgetStyle = "Oxygen";
 
-      shadeSortColumn = true;
-
-      XftAntialias = true;
-      XftHintStyle = "hintmedium";
-      XftSubPixel = "none";
-
-      desktopFont = "${sansSerif.name},${toString sizes.desktop},-1,5,50,0,0,0,0,0";
-      menuFont = "${sansSerif.name},${toString sizes.desktop},-1,5,50,0,0,0,0,0";
-      taskbarFont = "${sansSerif.name},${toString sizes.desktop},-1,5,50,0,0,0,0,0";
-      toolBarFont = "${sansSerif.name},${toString sizes.desktop},-1,5,50,0,0,0,0,0";
-      font = "${sansSerif.name},${toString sizes.applications},-1,5,50,0,0,0,0,0";
-      smallestReadableFont = "${sansSerif.name},${toString (sizes.applications / 2)},-1,5,50,0,0,0,0,0";
-      fixed = "${monospace.name},${toString sizes.terminal},-1,5,50,0,0,0,0,0";
+      inherit desktopFont;
+      fixed = monospaceFont;
+      font = applicationFont;
+      menuFont = desktopFont;
+      taskbarFont = desktopFont;
+      toolBarFont = desktopFont;
+      smallestReadableFont = desktopFont;
     };
 
     "ColorEffects:Disabled".Enable = false;
@@ -86,6 +84,8 @@ let
       inactiveBlend = "${base03-rgb-r},${base03-rgb-g},${base03-rgb-b}";
       inactiveBackground = "${base00-rgb-r},${base00-rgb-g},${base00-rgb-b}";
       inactiveForeground = "${base05-rgb-r},${base05-rgb-g},${base05-rgb-b}";
+
+      activeFont = desktopFont;
     };
 
     DesktopIcons = icons;