diff --git a/nixos/modules/i18n/input-method/fcitx5.nix b/nixos/modules/i18n/input-method/fcitx5.nix index a29e26423e06..cba0da6d815f 100644 --- a/nixos/modules/i18n/input-method/fcitx5.nix +++ b/nixos/modules/i18n/input-method/fcitx5.nix @@ -119,15 +119,15 @@ in ]; environment.etc = let - lib.optionalFile = p: f: v: lib.optionalAttrs (v != { }) { + optionalFile = p: f: v: lib.optionalAttrs (v != { }) { "xdg/fcitx5/${p}".text = f v; }; in lib.attrsets.mergeAttrsList [ - (lib.optionalFile "config" (lib.generators.toINI { }) cfg.settings.globalOptions) - (lib.optionalFile "profile" (lib.generators.toINI { }) cfg.settings.inputMethod) + (optionalFile "config" (lib.generators.toINI { }) cfg.settings.globalOptions) + (optionalFile "profile" (lib.generators.toINI { }) cfg.settings.inputMethod) (lib.concatMapAttrs - (name: value: lib.optionalFile + (name: value: optionalFile "conf/${name}.conf" (lib.generators.toINIWithGlobalSection { }) value) diff --git a/nixos/tests/fcitx5/default.nix b/nixos/tests/fcitx5/default.nix index feea621f6b5b..379615bd4413 100644 --- a/nixos/tests/fcitx5/default.nix +++ b/nixos/tests/fcitx5/default.nix @@ -14,22 +14,20 @@ rec { pkgs.alacritty ]; + services.displayManager.autoLogin = { + enable = true; + user = "alice"; + }; + services.xserver = { enable = true; - - displayManager = { - lightdm.enable = true; - autoLogin = { - enable = true; - user = "alice"; - }; - }; - + displayManager.lightdm.enable = true; desktopManager.xfce.enable = true; }; i18n.inputMethod = { - enabled = "fcitx5"; + enable = true; + type = "fcitx5"; fcitx5.addons = [ pkgs.fcitx5-chinese-addons pkgs.fcitx5-hangul