From 71e34c0a530a468487230d9f225d7e69c08bd751 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Sun, 26 Feb 2023 02:23:39 +0100
Subject: [PATCH] Move to fcitx

---
 kagami-air-m1/configuration.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/kagami-air-m1/configuration.nix b/kagami-air-m1/configuration.nix
index f75e631..5d9cfc1 100644
--- a/kagami-air-m1/configuration.nix
+++ b/kagami-air-m1/configuration.nix
@@ -67,9 +67,14 @@
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
   # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-  i18n.inputMethod.enabled = "ibus";
-  i18n.inputMethod.ibus.engines = (with pkgs.ibus-engines; [ bamboo mozc libpinyin ]);
+  i18n.inputMethod = {
+    enabled = "fcitx5";
+    fcitx5.addons = with pkgs; [
+      fcitx5-mozc
+      fcitx5-unikey
+      fcitx5-gtk
+    ];
+  };
   console = {
     # font = "ter-v32n";
     keyMap = "jp106";
@@ -163,11 +168,6 @@
 
   # Environment variables
   environment.variables = {
-    # Input method overrides
-    GTK_IM_MODULE = "ibus";
-    QT_IM_MODULE = "ibus";
-    "XMODIFIERS=@im" = "ibus";
-
     # Basic editor setup
     EDITOR = "kak";
     VISUAL = "kak";