From 52ea78741bd45732b5478a64f316a42b5fbe4335 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Wed, 18 Oct 2023 21:50:35 +0100
Subject: [PATCH] im/fcitx5: use home.sessionSearchVariables for QT_PLUGIN_PATH

---
 modules/i18n/input-method/fcitx5.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/i18n/input-method/fcitx5.nix b/modules/i18n/input-method/fcitx5.nix
index 3599fd2dc..610df25fa 100644
--- a/modules/i18n/input-method/fcitx5.nix
+++ b/modules/i18n/input-method/fcitx5.nix
@@ -23,13 +23,15 @@ in {
   config = mkIf (im.enabled == "fcitx5") {
     i18n.inputMethod.package = fcitx5Package;
 
-    home.sessionVariables = {
-      GLFW_IM_MODULE = "ibus"; # IME support in kitty
-      GTK_IM_MODULE = "fcitx";
-      QT_IM_MODULE = "fcitx";
-      XMODIFIERS = "@im=fcitx";
-      QT_PLUGIN_PATH =
-        "$QT_PLUGIN_PATH\${QT_PLUGIN_PATH:+:}${fcitx5Package}/${pkgs.qt6.qtbase.qtPluginPrefix}";
+    home = {
+      sessionVariables = {
+        GLFW_IM_MODULE = "ibus"; # IME support in kitty
+        GTK_IM_MODULE = "fcitx";
+        QT_IM_MODULE = "fcitx";
+        XMODIFIERS = "@im=fcitx";
+      };
+      sessionSearchVariables.QT_PLUGIN_PATH =
+        [ "${fcitx5Package}/${pkgs.qt6.qtbase.qtPluginPrefix}" ];
     };
 
     systemd.user.services.fcitx5-daemon = {