mirror of
https://github.com/nix-community/home-manager
synced 2024-07-03 03:48:31 +02:00
46dc2e5d9f
The conversion from `concatMapStrings` to `concatStringsSep` introduced in https://github.com/nix-community/home-manager/pull/2481 creates an unintended behavior change where the formatted config does not end in a newline.[1] This is problematic for manipulation at the Nix level. In particular, this cause a regression in the generation of gtk2 settings due to concatenated of the formatted config and `gtk2.extraConfig` without a newline in between. This commit restores `concatMapStrings` to match the previous behavior and adds a newline to the final string for the generated gtk2 config. The test case for gtk2-basic-config was also updated to check behavior at concatenation boundaries. [1] - https://github.com/nix-community/home-manager/pull/2481#discussion_r830648706
26 lines
491 B
Nix
26 lines
491 B
Nix
{ config, lib, pkgs, ... }:
|
|
|
|
with lib;
|
|
|
|
{
|
|
config = {
|
|
gtk = {
|
|
enable = true;
|
|
theme.name = "Adwaita";
|
|
gtk2.extraConfig = "gtk-can-change-accels = 1";
|
|
};
|
|
|
|
test.stubs.dconf = { };
|
|
|
|
nmt.script = ''
|
|
assertFileExists home-files/.gtkrc-2.0
|
|
|
|
assertFileContent home-files/.gtkrc-2.0 \
|
|
${./gtk2-basic-config-expected.conf}
|
|
|
|
assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
|
|
'GTK2_RC_FILES=.*/.gtkrc-2.0'
|
|
'';
|
|
};
|
|
}
|