From 259af48fe5dc004c11aa2b1339814138517616bf Mon Sep 17 00:00:00 2001
From: Viktor Titov <nukdokplex@nukdokplex.ru>
Date: Tue, 16 Dec 2025 20:48:22 +0500
Subject: [PATCH] qt: use qt.qt{5,6}ctSettings options (#2095)

Link: https://github.com/nix-community/stylix/pull/2095

Reviewed-by: NAHO <trueNAHO@users.noreply.github.com>
---
 flake/dev/flake.lock |  6 ++---
 modules/qt/hm.nix    | 61 +++++++++++++++++++-------------------------
 2 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/flake/dev/flake.lock b/flake/dev/flake.lock
index 22043fee..bf7de24a 100644
--- a/flake/dev/flake.lock
+++ b/flake/dev/flake.lock
@@ -97,11 +97,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764736872,
-        "narHash": "sha256-4mqLegNQeD54X7enm6EI9aNWl6CaIfyhl5PaYoGYwqk=",
+        "lastModified": 1765859973,
+        "narHash": "sha256-LN5O0h9GSgcDE/sz4+sLS3CbQALru1x4lh9hrxpeHwI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3366918730bb6b699395a9d237397f1d710a94b3",
+        "rev": "7df150f0d3857cf68dae443813b27acfb201b2d8",
         "type": "github"
       },
       "original": {
diff --git a/modules/qt/hm.nix b/modules/qt/hm.nix
index 44098703..b1869f3b 100644
--- a/modules/qt/hm.nix
+++ b/modules/qt/hm.nix
@@ -75,46 +75,37 @@
 
       home.packages = lib.optional (config.qt.style.name == "kvantum") kvantumPackage;
 
-      qt = {
-        enable = true;
-        style.name = recommendedStyle;
-        platformTheme.name = config.stylix.targets.qt.platform;
-      };
-
-      xdg.configFile =
+      qt =
         let
-          qtctConf = ''
-            [Appearance]
-            custom_palette=true
-          ''
-          + lib.optionalString (config.qt.style ? name) ''
-            style=${config.qt.style.name}
-          ''
-          + lib.optionalString (icons != null) ''
-            icon_theme=${icons}
-          ''
-          + ''
-            [Fonts]
-            fixed="${config.stylix.fonts.monospace.name},${toString config.stylix.fonts.sizes.applications}"
-            general="${config.stylix.fonts.sansSerif.name},${toString config.stylix.fonts.sizes.applications}"
-          '';
+          qtctSettings = {
+            Appearance = {
+              custom_palette = true;
+              style = lib.mkIf (config.qt.style ? name) config.qt.style.name;
+              icon_theme = lib.mkIf (icons != null) icons;
+            };
 
+            Fonts = {
+              fixed = ''"${config.stylix.fonts.monospace.name},${toString config.stylix.fonts.sizes.applications}"'';
+              general = ''"${config.stylix.fonts.sansSerif.name},${toString config.stylix.fonts.sizes.applications}"'';
+            };
+          };
         in
-        lib.mkMerge [
-          (lib.mkIf (config.qt.style.name == "kvantum") {
-            "Kvantum/kvantum.kvconfig".source =
-              (pkgs.formats.ini { }).generate "kvantum.kvconfig"
-                { General.theme = "Base16Kvantum"; };
+        {
+          enable = true;
+          style.name = recommendedStyle;
+          platformTheme.name = config.stylix.targets.qt.platform;
 
-            "Kvantum/Base16Kvantum".source =
-              "${kvantumPackage}/share/Kvantum/Base16Kvantum";
-          })
+          qt5ctSettings = lib.mkIf (config.qt.platformTheme.name == "qtct") qtctSettings;
+          qt6ctSettings = lib.mkIf (config.qt.platformTheme.name == "qtct") qtctSettings;
+        };
 
-          (lib.mkIf (config.qt.platformTheme.name == "qtct") {
-            "qt5ct/qt5ct.conf".text = qtctConf;
-            "qt6ct/qt6ct.conf".text = qtctConf;
-          })
-        ];
+      xdg.configFile = lib.mkIf (config.qt.style.name == "kvantum") {
+        "Kvantum/kvantum.kvconfig".source =
+          (pkgs.formats.ini { }).generate "kvantum.kvconfig"
+            { General.theme = "Base16Kvantum"; };
+        "Kvantum/Base16Kvantum".source =
+          "${kvantumPackage}/share/Kvantum/Base16Kvantum";
+      };
     }
   );
 }