movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-29 12:35:10 +03:00
Code Activity

nixos/fcitx5: fix evaluation (#338621)

Browse source
This commit is contained in:
éclairevoyant 2024-08-31 14:28:20 +00:00 • committed by GitHub
commit 075c6ce71f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/i18n/input-method/fcitx5.nix
View file

@ -119,15 +119,15 @@ in
]; ];
environment.etc = environment.etc =
let let
lib.optionalFile = p: f: v: lib.optionalAttrs (v != { }) { optionalFile = p: f: v: lib.optionalAttrs (v != { }) {
"xdg/fcitx5/${p}".text = f v; "xdg/fcitx5/${p}".text = f v;
}; };
in in
lib.attrsets.mergeAttrsList [ lib.attrsets.mergeAttrsList [
(lib.optionalFile "config" (lib.generators.toINI { }) cfg.settings.globalOptions) (optionalFile "config" (lib.generators.toINI { }) cfg.settings.globalOptions)
(lib.optionalFile "profile" (lib.generators.toINI { }) cfg.settings.inputMethod) (optionalFile "profile" (lib.generators.toINI { }) cfg.settings.inputMethod)
(lib.concatMapAttrs (lib.concatMapAttrs
(name: value: lib.optionalFile (name: value: optionalFile
"conf/${name}.conf" "conf/${name}.conf"
(lib.generators.toINIWithGlobalSection { }) (lib.generators.toINIWithGlobalSection { })
value) value)

14
nixos/tests/fcitx5/default.nix
View file

@ -14,22 +14,20 @@ rec {
pkgs.alacritty pkgs.alacritty
]; ];
services.xserver = { services.displayManager.autoLogin = {
enable = true;
displayManager = {
lightdm.enable = true;
autoLogin = {
enable = true; enable = true;
user = "alice"; user = "alice";
}; };
};
services.xserver = {
enable = true;
displayManager.lightdm.enable = true;
desktopManager.xfce.enable = true; desktopManager.xfce.enable = true;
}; };
i18n.inputMethod = { i18n.inputMethod = {
enabled = "fcitx5"; enable = true;
type = "fcitx5";
fcitx5.addons = [ fcitx5.addons = [
pkgs.fcitx5-chinese-addons pkgs.fcitx5-chinese-addons
pkgs.fcitx5-hangul pkgs.fcitx5-hangul