colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixosTests.fcitx5: make use of the newly added settings option

Browse Source
This commit is contained in:
Nick Cao 2023-08-15 08:36:07 +08:00
parent eb2b0b09b3
commit fecb8c7752
No known key found for this signature in database
3 changed files with 37 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/tests/fcitx5/config
View File

@ -1,11 +0,0 @@
[Hotkey]
EnumerateSkipFirst=False
[Hotkey/TriggerKeys]
0=Control+space
[Hotkey/EnumerateForwardKeys]
0=Alt+Shift_L
[Hotkey/EnumerateBackwardKeys]
0=Alt+Shift_R

47
nixos/tests/fcitx5/default.nix
View File

@ -36,6 +36,43 @@ rec {
pkgs.fcitx5-m17n
pkgs.fcitx5-mozc
];
fcitx5.settings = {
globalOptions = {
"Hotkey"."EnumerateSkipFirst" = "False";
"Hotkey/TriggerKeys"."0" = "Control+space";
"Hotkey/EnumerateForwardKeys"."0" = "Alt+Shift_L";
"Hotkey/EnumerateBackwardKeys"."0" = "Alt+Shift_R";
};
inputMethod = {
"GroupOrder" = {
"0" = "NixOS_test";
};
"Groups/0" = {
"Default Layout" = "us";
"DefaultIM" = "wbx";
"Name" = "NixOS_test";
};
"Groups/0/Items/0" = {
"Name" = "keyboard-us";
};
"Groups/0/Items/1" = {
"Layout" = "us";
"Name" = "wbx";
};
"Groups/0/Items/2" = {
"Layout" = "us";
"Name" = "hangul";
};
"Groups/0/Items/3" = {
"Layout" = "us";
"Name" = "m17n_sa_harvard-kyoto";
};
"Groups/0/Items/4" = {
"Layout" = "us";
"Name" = "mozc";
};
};
};
};
};
@ -43,7 +80,6 @@ rec {
let
user = nodes.machine.users.users.alice;
xauth = "${user.home}/.Xauthority";
fcitx_confdir = "${user.home}/.config/fcitx5";
in
''
start_all()
@ -56,15 +92,6 @@ rec {
machine.succeed("su - ${user.name} -c 'kill $(pgrep fcitx5)'")
machine.sleep(1)
machine.copy_from_host(
"${./profile}",
"${fcitx_confdir}/profile",
)
machine.copy_from_host(
"${./config}",
"${fcitx_confdir}/config",
)
machine.succeed("su - ${user.name} -c 'alacritty >&2 &'")
machine.succeed("su - ${user.name} -c 'fcitx5 >&2 &'")
machine.sleep(10)

27
nixos/tests/fcitx5/profile
View File

@ -1,27 +0,0 @@
[Groups/0]
Name=NixOS_test
Default Layout=us
DefaultIM=wbx
[Groups/0/Items/0]
Name=keyboard-us
Layout=
[Groups/0/Items/1]
Name=wbx
Layout=us
[Groups/0/Items/2]
Name=hangul
Layout=us
[Groups/0/Items/3]
Name=m17n_sa_harvard-kyoto
Layout=us
[Groups/0/Items/4]
Name=mozc
Layout=us
[GroupOrder]
0=NixOS_test