fcitx ded

6 files changed, 21 insertions, 110 deletions

diff --git a/hosts/local/gui.nix b/hosts/local/gui.nix
index 1532013..de16ac8 100644
--- a/hosts/local/gui.nix
+++ b/hosts/local/gui.nix
@@ -49,7 +49,7 @@
     # chat
     signal-desktop
     telegram-desktop
-    electrum
+    # electrum
     # xdg whatever bs
     glib # gio
     desktop-file-utils
@@ -58,19 +58,23 @@
     gparted
   ];
 
-  i18n.inputMethod = {
-    enable = true;
-    type = "fcitx5";
-    fcitx5.addons = with pkgs; [
-      fcitx5-mozc
-      # mozc-ut is better, wat do
-      fcitx5-gtk
-      libsForQt5.fcitx5-qt
-      fcitx5-lua
-      fcitx5-configtool
-      fcitx5-rime
-    ];
-  };
+  # i18n.inputMethod = {
+  #   enable = true;
+  #   type = "fcitx5";
+  #   fcitx5.addons = with pkgs; [
+  #     fcitx5-mozc
+  #     # mozc-ut is better, wat do
+  #     # fcitx5-gtk
+  #     # libsForQt5.fcitx5-qt
+  #     fcitx5-lua
+  #     fcitx5-configtool
+  #     fcitx5-rime
+  #   ];
+  # };
+  #
+  # https://github.com/NixOS/nixpkgs/issues/454887
+  #   #
+  #
   environment.variables = {
     GTK_IM_MODULE = "fcitx";
     QT_IM_MODULE = "fcitx";
diff --git a/hosts/local/i3.nix b/hosts/local/i3.nix
index da9d503..da5dcaf 100644
--- a/hosts/local/i3.nix
+++ b/hosts/local/i3.nix
@@ -38,11 +38,6 @@ in {
     defaultSession = "none+i3";
   };
 
-  environment.sessionVariables = {
-    GTK_IM_MODULE = "fcitx";
-    QT_IM_MODULE = "fcitx";
-    XMODIFIERS = "@im=fcitx";
-  };
   # gnome stuff
   services.gvfs.enable = true;
   programs.dconf.enable = true;
@@ -76,14 +71,6 @@ in {
   ];
   services.flatpak.enable = true;
 
-  # cjk input
-  # i18n = {
-  #   inputMethod = {
-  #     type = "fcitx5";
-  #     fcitx5.addons = with pkgs; [fcitx5-rime fcitx5-mozc];
-  #   };
-  # };
-
   fonts = {
     enableDefaultPackages = true;
     fontconfig = {
diff --git a/hosts/local/niri.nix b/hosts/local/niri.nix
index be92df0..ee5fae2 100644
--- a/hosts/local/niri.nix
+++ b/hosts/local/niri.nix
@@ -35,14 +35,9 @@
     _JAVA_AWT_WM_NONREPARENTING = "1";
     MOZ_ENABLE_WAYLAND = "1";
 
-    # GTK_IM_MODULE = "fcitx";
-    # QT_IM_MODULE = "fcitx";
-    # SDL_IM_MODULE = "fcitx";
-
     XDG_CURRENT_DESKTOP = "sway";
     GDK_BACKEND = "wayland";
     XDG_SESSION_TYPE = "wayland";
-    XMODIFIERS = "@im=fcitx";
   };
 
   xdg.portal = {
@@ -146,25 +141,6 @@
   ];
   services.speechd.enable = true;
 
-  # cjk input
-
-  i18n.inputMethod = {
-    type = "fcitx5";
-    enable = true;
-    fcitx5 = {
-      # enabled = true;
-      addons = with pkgs; [
-        rime-data
-        fcitx5-rime
-        fcitx5-mozc
-        fcitx5-configtool
-        fcitx5-chinese-addons
-        fcitx5-gtk
-        libsForQt5.fcitx5-qt
-      ];
-      waylandFrontend = true;
-    };
-  };
   services.xserver.desktopManager.runXdgAutostartIfNone = true;
 
   fonts = {
@@ -226,6 +202,8 @@
     jack.enable = true;
   };
 
+  i18n.inputMethod.fcitx5.waylandFrontend = true;
+
   # pipewire requires these off
   # sound.enable = true;
   # hardware.pulseaudio.enable = true;
diff --git a/hosts/local/p16/keyboard.nix b/hosts/local/p16/keyboard.nix
index f6cfa8c..d335f22 100644
--- a/hosts/local/p16/keyboard.nix
+++ b/hosts/local/p16/keyboard.nix
@@ -4,26 +4,6 @@
     HandlePowerKey = "ignore";
   };
 
-  # config file keeps getting rewritten but I don't know by who
-  # i18n.inputMethod = {
-  #   enable = true;
-  #   type = "fcitx5";
-  #   fcitx5.addons = with pkgs; [
-  #     fcitx5-mozc
-  #     # mozc-ut is better, wat do
-  #     fcitx5-gtk
-  #     libsForQt5.fcitx5-qt
-  #     fcitx5-lua
-  #     fcitx5-configtool
-  #     fcitx5-rime
-  #   ];
-  # };
-  environment.variables = {
-    QT_IM_MODULE = "fcitx";
-    XMODIFIERS = "@im=fcitx";
-    FCITX_SOCKET = "default";
-  };
-
   #kmonad
   services.kmonad = {
     enable = true;
diff --git a/hosts/local/s15/keyboard.nix b/hosts/local/s15/keyboard.nix
index 88f8545..19b05be 100644
--- a/hosts/local/s15/keyboard.nix
+++ b/hosts/local/s15/keyboard.nix
@@ -9,26 +9,6 @@
     HandlePowerKey=ignore
   '';
 
-  # config file keeps getting rewritten but I don't know by who
-  #  i18n.inputMethod = {
-  #    enabled = "fcitx5";
-  #    fcitx5.addons = with pkgs; [
-  #      fcitx5-mozc
-  #      # mozc-ut is better, wat do
-  #      fcitx5-gtk
-  #      libsForQt5.fcitx5-qt
-  #      fcitx5-lua
-  #      fcitx5-configtool
-  #      fcitx5-rime
-  #    ];
-  #  };
-  environment.variables = {
-    GTK_IM_MODULE = "fcitx";
-    QT_IM_MODULE = "fcitx";
-    XMODIFIERS = "@im=fcitx";
-    FCITX_SOCKET = "default";
-  };
-
   #kmonad
   services.kmonad = lib.mkIf (pkgs.system == "x86_64-linux") {
     enable = true;
diff --git a/hosts/local/sway.nix b/hosts/local/sway.nix
index 0fb8020..30834c3 100644
--- a/hosts/local/sway.nix
+++ b/hosts/local/sway.nix
@@ -69,14 +69,9 @@
     _JAVA_AWT_WM_NONREPARENTING = "1";
     MOZ_ENABLE_WAYLAND = "1";
 
-    # GTK_IM_MODULE = "fcitx";
-    # QT_IM_MODULE = "fcitx";
-    # SDL_IM_MODULE = "fcitx";
-
     XDG_CURRENT_DESKTOP = "sway";
     GDK_BACKEND = "wayland";
     XDG_SESSION_TYPE = "wayland";
-    XMODIFIERS = "@im=fcitx";
   };
 
   environment.systemPackages = with pkgs; [
@@ -113,20 +108,7 @@
   # cjk input
 
   i18n.inputMethod = {
-    type = "fcitx5";
-    enable = true;
-    fcitx5 = {
-      # enabled = true;
-      addons = with pkgs; [
-        rime-data
-        fcitx5-rime
-        fcitx5-mozc
-        fcitx5-configtool
-        fcitx5-chinese-addons
-        fcitx5-gtk
-      ];
-      waylandFrontend = true;
-    };
+    waylandFrontend = true;
   };
   services.xserver.desktopManager.runXdgAutostartIfNone = true;