diff --git a/modules/gnome/home.nix b/modules/gnome/home.nix index ce355da..bf5d04f 100644 --- a/modules/gnome/home.nix +++ b/modules/gnome/home.nix @@ -37,7 +37,6 @@ in sources = [ (mkTuple [ "xkb" "us" ]) (mkTuple [ "ibus" "libpinyin" ]) - (mkTuple [ "ibus" "mozc-jp" ]) ]; xkb-options = [ "" ]; }; @@ -117,21 +116,6 @@ in }; - # IBus Mozc (Japanese) configuration - default to Hiragana input mode - home.file.".config/mozc/ibus_config.textproto".text = '' - engines { - name : "mozc-jp" - longname : "Mozc" - layout : "default" - layout_variant : "" - layout_option : "" - rank : 80 - symbol : "あ" - composition_mode : HIRAGANA - } - active_on_launch: True - ''; - # Configure cursor theme system-wide home.pointerCursor = { name = "Adwaita"; diff --git a/modules/gnome/system.nix b/modules/gnome/system.nix index a2f07b5..0f2b8c1 100644 --- a/modules/gnome/system.nix +++ b/modules/gnome/system.nix @@ -86,8 +86,7 @@ in enable = true; type = "ibus"; ibus.engines = with pkgs.ibus-engines; [ - libpinyin # Chinese Simplified Pinyin - mozc # Japanese (Romaji) + libpinyin ]; }; diff --git a/modules/hyprland/home.nix b/modules/hyprland/home.nix index fc5eaf6..d8cd00f 100644 --- a/modules/hyprland/home.nix +++ b/modules/hyprland/home.nix @@ -18,10 +18,6 @@ Name=rime Layout= - [Groups/0/Items/2] - Name=mozc - Layout= - [GroupOrder] 0=Default ''; @@ -64,15 +60,6 @@ ''; }; - # Mozc addon configuration - 7 candidates per page - xdg.configFile."fcitx5/conf/mozc.conf" = { - force = true; - text = '' - [InputMethod] - PageSize=7 - ''; - }; - # GNOME Keyring for storing WiFi passwords and other secrets services.gnome-keyring = { enable = true; @@ -203,10 +190,7 @@ keyboard-us) ${pkgs.fcitx5}/bin/fcitx5-remote -s rime ;; - rime) - ${pkgs.fcitx5}/bin/fcitx5-remote -s mozc - ;; - mozc|*) + *) ${pkgs.fcitx5}/bin/fcitx5-remote -s keyboard-us ;; esac diff --git a/modules/hyprland/system.nix b/modules/hyprland/system.nix index 542f712..300c656 100644 --- a/modules/hyprland/system.nix +++ b/modules/hyprland/system.nix @@ -69,9 +69,8 @@ in enable = true; type = "fcitx5"; fcitx5.addons = with pkgs; [ - fcitx5-rime # Chinese Simplified/Traditional (more powerful than libpinyin) - fcitx5-mozc # Japanese (Romaji) - fcitx5-gtk # GTK integration + fcitx5-rime + fcitx5-gtk ]; };