From 3485599042e40cea42b1858d64da076d4e077c9f Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Fri, 11 Apr 2025 17:24:02 +0800
Subject: [PATCH] module.system.gui: fix

---
 modules/system/fileSystems/cluster.nix |  2 +-
 modules/system/gui.nix                 | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/system/fileSystems/cluster.nix b/modules/system/fileSystems/cluster.nix
index eb0f9faf..88dde6d0 100644
--- a/modules/system/fileSystems/cluster.nix
+++ b/modules/system/fileSystems/cluster.nix
@@ -9,7 +9,7 @@ inputs:
     (inputs.lib.mkIf (inputs.config.nixos.model.cluster.nodeType or null == "worker")
       { nixos.system.fileSystems.mount.nfs."192.168.178.1:/nix/persistent/home" = "/remote/home"; })
     # 将一部分由 home-manager 生成软链接的文件改为直接挂载，以兼容集群的设置
-    (let files = [ ".zshrc" ".zshenv" ".profile" ".bashrc" ".bash_profile" ".zlogin" ".gtkrc-2.0" ]; in
+    (let files = [ ".zshrc" ".zshenv" ".profile" ".bashrc" ".bash_profile" ".zlogin" ]; in
     {
       home-manager.users = builtins.listToAttrs (builtins.map
         (user:
diff --git a/modules/system/gui.nix b/modules/system/gui.nix
index f5754aa0..89b1f991 100644
--- a/modules/system/gui.nix
+++ b/modules/system/gui.nix
@@ -50,14 +50,18 @@ inputs:
       };
       systemd.services.display-manager.after = [ "plymouth-quit.service" ];
       # 在 chromium 中输入汉字有可能会漏字，需要这个配置
-      nixos.user.sharedModules = [{ gtk =
+      nixos.user.sharedModules = [(hmInputs: { gtk =
       {
         enable = true;
         iconTheme.name = "klassy";
-        gtk2.extraConfig = ''gtk-im-module="fcitx"'';
+        gtk2 =
+        {
+          extraConfig = ''gtk-im-module="fcitx"'';
+          configLocation = "${hmInputs.config.xdg.configHome}/gtk-2.0/gtkrc";
+        };
         gtk3.extraConfig.gtk-im-module = "fcitx";
         gtk4.extraConfig.gtk-im-module = "fcitx";
-      };}];
+      };})];
     })
     # prefer gui or not
     (inputs.localLib.mkConditional (builtins.elem inputs.config.nixos.model.type [ "desktop" ])