From bb3792d748313be218398e8d6e14853afbc61f83 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Sat, 13 Jan 2024 00:38:42 -0500
Subject: [PATCH] fcitx: Use wayland front-end for GTK

Fixes the warning notification shown on boot.
---
 containers/shared.nix |  1 -
 home/hyprland.nix     |  1 -
 modules/hyprland.nix  | 10 ++++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/containers/shared.nix b/containers/shared.nix
index 4d0c80d8..c2b0f37d 100644
--- a/containers/shared.nix
+++ b/containers/shared.nix
@@ -41,7 +41,6 @@
       MOZ_ENABLE_WAYLAND = "1";
       XDG_RUNTIME_DIR = "/run/user/1000";
       DISPLAY = ":0";
-      GTK_IM_MODULE = "fcitx";
       QT_IM_MODULE = "fcitx";
       XMODIFIERS = "@im=fcitx";
       SDL_IM_MODULE = "fcitx";
diff --git a/home/hyprland.nix b/home/hyprland.nix
index 08fb7b84..cdf828e0 100644
--- a/home/hyprland.nix
+++ b/home/hyprland.nix
@@ -60,7 +60,6 @@ in
   xdg.configFile."hypr/hyprland.conf".text = with config.lib.stylix.colors; /* bash */ ''
     env=XCURSOR_SIZE,24
     env=BROWSER,librewolf
-    env=GTK_IM_MODULE,fcitx
     env=QT_IM_MODULE,fcitx
     env=XMODIFIERS,@im=fcitx
     env=SDL_IM_MODULE,fcitx
diff --git a/modules/hyprland.nix b/modules/hyprland.nix
index 17016f99..86773ce1 100644
--- a/modules/hyprland.nix
+++ b/modules/hyprland.nix
@@ -3,8 +3,14 @@
 {
   programs.hyprland.enable = true;
 
-  i18n.inputMethod.enabled = "fcitx5";
-  i18n.inputMethod.fcitx5.addons = [ pkgs.fcitx5-mozc ];
+  i18n.inputMethod = {
+    enabled = "fcitx5";
+
+    fcitx5 = {
+      addons = with pkgs; [ fcitx5-mozc ];
+      waylandFrontend = true;
+    };
+  };
 
   security.pam.services.swaylock = { };