nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-08 19:46:05 +01:00
Code Activity

fcitx5: fix iniFormat usage (#6899)

Browse source
This commit is contained in:
awwpotato 2025-04-23 13:10:12 -07:00 • committed by GitHub
parent 6d1f834ca6
commit d31710fb2c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/i18n/input-method/fcitx5.nix
View file

@ -222,7 +222,7 @@ in
optionalFile = optionalFile =
p: f: v: p: f: v:
lib.optionalAttrs (v != { }) { lib.optionalAttrs (v != { }) {
"fcitx5/${p}".source = f v; "fcitx5/${p}".source = f "fcitx5-${builtins.replaceStrings [ "/" ] [ "-" ] p}" v;
}; };
in in
lib.attrsets.mergeAttrsList [ lib.attrsets.mergeAttrsList [
@ -249,7 +249,7 @@ in
else if builtins.isString attrs.theme then else if builtins.isString attrs.theme then
pkgs.writeText "fcitx5-theme.conf" attrs.theme pkgs.writeText "fcitx5-theme.conf" attrs.theme
else else
iniFormat.generate attrs.theme iniFormat.generate "fcitx5-${name}-theme" attrs.theme
)) ))
] ]
) cfg.themes; ) cfg.themes;

4
tests/modules/i18n/input-method/fcitx5/old-enable.nix
View file

@ -20,7 +20,7 @@ lib.mkIf config.test.enableBig {
ScaleWithDPI=True ScaleWithDPI=True
''; '';
}; };
classicUiConfig = "Theme=example"; settings.addons.classicui.globalSection.Theme = "example";
}; };
}; };
@ -32,8 +32,8 @@ lib.mkIf config.test.enableBig {
nmt.script = '' nmt.script = ''
assertFileExists home-files/.config/systemd/user/fcitx5-daemon.service assertFileExists home-files/.config/systemd/user/fcitx5-daemon.service
assertFileExists home-files/.config/fcitx5/conf/classicui.conf
assertFileExists home-files/.local/share/fcitx5/themes/example/theme.conf assertFileExists home-files/.local/share/fcitx5/themes/example/theme.conf
assertFileExists home-files/.local/share/fcitx5/conf/classicui.conf
assertFileNotRegex home-path/etc/profile.d/hm-session-vars.sh 'GTK_IM_MODULE' assertFileNotRegex home-path/etc/profile.d/hm-session-vars.sh 'GTK_IM_MODULE'
assertFileNotRegex home-path/etc/profile.d/hm-session-vars.sh 'QT_IM_MODULE' assertFileNotRegex home-path/etc/profile.d/hm-session-vars.sh 'QT_IM_MODULE'
''; '';