diff --git a/modules/hm/fcitx5/profile b/modules/hm/fcitx5/profile deleted file mode 100644 index ff69493..0000000 --- a/modules/hm/fcitx5/profile +++ /dev/null @@ -1,22 +0,0 @@ -[Groups/0] -# Group Name -Name=Default -# Layout -Default Layout=jp -# Default Input Method -DefaultIM=keyboard-jp - -[Groups/0/Items/0] -# Name -Name=keyboard-jp -# Layout -Layout=jp - -[Groups/0/Items/1] -# Name -Name=mozc -# Layout -Layout=jp - -[GroupOrder] -0=Default \ No newline at end of file diff --git a/modules/hm/gui.nix b/modules/hm/gui.nix index 48d4542..da94301 100644 --- a/modules/hm/gui.nix +++ b/modules/hm/gui.nix @@ -17,12 +17,27 @@ }; # input method config - home.file.".config/fcitx5/profile" = { - recursive = true; - source = ./fcitx5/profile; - }; home.file.".config/fcitx5/config" = { recursive = true; source = ./fcitx5/config; }; + + i18n.inputMethod.fcitx5.settings.inputMethod = { + GroupOrder = { + "0" = "Default"; + }; + "Groups/0" = { + Name = "Default"; + "Default Layout" = "jp"; + DefaultIM = "mozc"; + }; + "Groups/0/Items/0" = { + Name = "ja"; + Layout = ""; + }; + "Groups/0/Items/1" = { + Name = "mozc"; + Layout = ""; + }; + }; } diff --git a/modules/nixos/desktop.nix b/modules/nixos/desktop.nix index f13bb77..e546d84 100644 --- a/modules/nixos/desktop.nix +++ b/modules/nixos/desktop.nix @@ -34,7 +34,6 @@ xwayland-satellite google-chrome vscode - fcitx5 fcitx5-mozc ]; environment.sessionVariables = { @@ -43,7 +42,8 @@ }; i18n.inputMethod = { - enabled = "fcitx5"; + enable = true; + type = "fcitx5"; fcitx5 = { addons = with pkgs; [ fcitx5-mozc