From 961481549f14dd5fec255234bf9c37cafef0703a Mon Sep 17 00:00:00 2001
From: stitchy <stitchy@stitchy.moe>
Date: Sat, 8 Mar 2025 22:45:52 +0000
Subject: [PATCH] feat(fcitx): proper themeing and fix wayland issues

---
 config/hypr/hyprland.conf     |  9 +++++----
 config/zshrc                  |  3 ---
 users/stitchynyan/default.nix | 11 +++++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index ca9a8ee..a7c6887 100755
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -54,12 +54,13 @@ decoration {
     noise=.03
     vibrancy=.2
     vibrancy_darkness=0.5
+    input_methods=true
     }
 
-    # Other
-    rounding=15
-    inactive_opacity=.8
-    fullscreen_opacity=1 multiplier
+  # Other
+  rounding=15
+  inactive_opacity=.8
+  fullscreen_opacity=1 multiplier
 }
 
 animations {
diff --git a/config/zshrc b/config/zshrc
index cd1d0bc..f513bde 100755
--- a/config/zshrc
+++ b/config/zshrc
@@ -99,9 +99,6 @@ eval "$(zoxide init zsh)"
 #export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
 export PATH="${PATH}:/home/flyingstitchman/.cargo/bin"
 
-# Fcitx for Xwayland
-XMODIFIERS=@im=fcitx
-
  # Clean Up
 export QT_QPA_PLATFORM=wayland
 export QT_QPA_PLATFORMTHEME=qt5ct
diff --git a/users/stitchynyan/default.nix b/users/stitchynyan/default.nix
index 46da119..5b13f72 100644
--- a/users/stitchynyan/default.nix
+++ b/users/stitchynyan/default.nix
@@ -68,10 +68,13 @@
     inputMethod = {
       enable = true;
       type = "fcitx5";
-      fcitx5.addons = with pkgs; [
-        fcitx5-mozc
-        fcitx5-nord
-      ];
+      fcitx5 = {
+        waylandFrontend = true;
+        addons = with pkgs; [
+          fcitx5-mozc
+          fcitx5-fluent
+        ];
+      };
     };
   };
 }