From 8f4f57f9a67367881b1a36f93856ffef8646d428 Mon Sep 17 00:00:00 2001
From: Louis Opter <louis@opter.org>
Date: Sat, 7 Sep 2024 13:25:40 -0700
Subject: [PATCH] qt: update tooling for Plasma 6

---
 modules/misc/qt/kconfig.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/misc/qt/kconfig.nix b/modules/misc/qt/kconfig.nix
index f7c35573b..76bf7c686 100644
--- a/modules/misc/qt/kconfig.nix
+++ b/modules/misc/qt/kconfig.nix
@@ -17,13 +17,13 @@ in {
       powermanagementprofilesrc.AC.HandleButtonEvents.lidAction = 32;
     };
     description = ''
-      A set of values to be modified by {command}`kwriteconfig5`.
+      A set of values to be modified by {command}`kwriteconfig6`.
 
       The example value would cause the following command to run in the
       activation script:
 
       ``` shell
-      kwriteconfig5 --file $XDG_CONFIG_HOME/powermanagementprofilesrc \
+      kwriteconfig6 --file $XDG_CONFIG_HOME/powermanagementprofilesrc \
                     --group AC \
                     --group HandleButtonEvents \
                     --group lidAction \
@@ -53,7 +53,7 @@ in {
             lib.mapAttrsToList
             (group: value: toLine file (path ++ [ group ]) value) value
           else
-            "run test -f '${configHome}/${file}' && run ${pkgs.libsForQt5.kconfig}/bin/kwriteconfig5 --file '${configHome}/${file}' ${
+            "run ${pkgs.kdePackages.kconfig}/bin/kwriteconfig6 --file '${configHome}/${file}' ${
               lib.concatMapStringsSep " " (x: "--group ${x}")
               (lib.lists.init path)
             } --key '${lib.lists.last path}' ${toValue value}";
@@ -62,7 +62,7 @@ in {
       in builtins.concatStringsSep "\n" lines}
 
       # TODO: some way to only call the dbus calls needed
-      run ${pkgs.libsForQt5.qttools.bin}/bin/qdbus org.kde.KWin /KWin reconfigure || echo "KWin reconfigure failed"
+      run ${pkgs.kdePackages.qttools}/bin/qdbus org.kde.KWin /KWin reconfigure || echo "KWin reconfigure failed"
       # the actual values are https://github.com/KDE/plasma-workspace/blob/c97dddf20df5702eb429b37a8c10b2c2d8199d4e/kcms/kcms-common_p.h#L13
       for changeType in {0..10}; do
         # even if one of those calls fails the others keep running