From 667f2f5040967398e2fde3227497f59c32729ea7 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Wed, 25 Jan 2023 15:43:11 +0100
Subject: [PATCH] Replace ibus with fcitx

---
 home/modules/linux/graphical/default.nix  | 14 +++++++-------
 home/modules/programs/my-sway/default.nix |  2 +-
 nki-home/configuration.nix                | 18 +++++++++++++-----
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/home/modules/linux/graphical/default.nix b/home/modules/linux/graphical/default.nix
index 37ddee2..3e435c2 100644
--- a/home/modules/linux/graphical/default.nix
+++ b/home/modules/linux/graphical/default.nix
@@ -67,12 +67,12 @@ in
     };
 
     # IBus configuration
-    dconf.settings."desktop/ibus/general" = {
-      engines-order = hm.gvariant.mkArray hm.gvariant.type.string [ "xkb:jp::jpn" "mozc-jp" "Bamboo" ];
-      reload-engines = hm.gvariant.mkArray hm.gvariant.type.string [ "xkb:jp::jpn" "mozc-jp" "Bamboo" ];
-    };
-    dconf.settings."desktop/ibus/general/hotkey" = {
-      triggers = hm.gvariant.mkArray hm.gvariant.type.string [ "<Super>z" ];
-    };
+    # dconf.settings."desktop/ibus/general" = {
+    #   engines-order = hm.gvariant.mkArray hm.gvariant.type.string [ "xkb:jp::jpn" "mozc-jp" "Bamboo" ];
+    #   reload-engines = hm.gvariant.mkArray hm.gvariant.type.string [ "xkb:jp::jpn" "mozc-jp" "Bamboo" ];
+    # };
+    # dconf.settings."desktop/ibus/general/hotkey" = {
+    #   triggers = hm.gvariant.mkArray hm.gvariant.type.string [ "<Super>z" ];
+    # };
   };
 }
diff --git a/home/modules/programs/my-sway/default.nix b/home/modules/programs/my-sway/default.nix
index 2704152..b45ae34 100644
--- a/home/modules/programs/my-sway/default.nix
+++ b/home/modules/programs/my-sway/default.nix
@@ -49,7 +49,7 @@ let
 
 in
 {
-  imports = [ ./ibus.nix ];
+  # imports = [ ./ibus.nix ];
 
   options.programs.my-sway = {
     enable = mkEnableOption "Enable the sway configuration";
diff --git a/nki-home/configuration.nix b/nki-home/configuration.nix
index fc678dc..18b5a61 100644
--- a/nki-home/configuration.nix
+++ b/nki-home/configuration.nix
@@ -73,8 +73,16 @@
   };
   # Select internationalisation properties.
   i18n.defaultLocale = "ja_JP.UTF-8";
-  i18n.inputMethod.enabled = "ibus";
-  i18n.inputMethod.ibus.engines = (with pkgs.ibus-engines; [ bamboo mozc libpinyin ]);
+  # 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 = "Lat2-Terminus16";
   #   keyMap = "us";
@@ -157,9 +165,9 @@
   # Environment variables
   environment.variables = {
     # Input method overrides
-    GTK_IM_MODULE = "ibus";
-    QT_IM_MODULE = "ibus";
-    "XMODIFIERS=@im" = "ibus";
+    # GTK_IM_MODULE = "ibus";
+    # QT_IM_MODULE = "ibus";
+    # "XMODIFIERS=@im" = "ibus";
 
     # Basic editor setup
     EDITOR = "kak";