eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-30 06:59:45 +01:00
Code Issues Releases Wiki Activity

dircolors: apply extraConfig after settings (#1890)

Browse source 
Applying extraConfig before settings made it unable to override the
defaults.
This commit is contained in:
lunik1 2021-03-31 20:01:02 +00:00 committed by GitHub
parent 447ed0fbcb
commit ad04237d51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/misc/news.nix
View file

@ -1880,6 +1880,13 @@ in
https://no-color.org/. https://no-color.org/.
''; '';
} }
{
time = "2021-03-29T21:05:50+00:00";
message = ''
Configuration specified by 'programs.dircolors.extraConfig' is now
applied after 'programs.dircolors.settings'.
'';
}
]; ];
}; };
} }

4
modules/programs/dircolors.nix
View file

@ -204,8 +204,8 @@ in {
}; };
home.file.".dir_colors".text = concatStringsSep "\n" ([ ] home.file.".dir_colors".text = concatStringsSep "\n" ([ ]
++ optional (cfg.extraConfig != "") cfg.extraConfig ++ mapAttrsToList formatLine cfg.settings ++ [ "" ]
++ mapAttrsToList formatLine cfg.settings) + "\n"; ++ optional (cfg.extraConfig != "") cfg.extraConfig);
programs.bash.initExtra = mkIf cfg.enableBashIntegration '' programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
eval $(${pkgs.coreutils}/bin/dircolors -b ~/.dir_colors) eval $(${pkgs.coreutils}/bin/dircolors -b ~/.dir_colors)

4
tests/modules/programs/dircolors/settings-expected.conf
View file

@ -1,5 +1,3 @@
# Extra dircolors configuration.
.7z 01;31 .7z 01;31
.aac 00;36 .aac 00;36
.ace 01;31 .ace 01;31
@ -131,3 +129,5 @@ SETUID 37;41
SOCK 01;35 SOCK 01;35
STICKY 37;44 STICKY 37;44
STICKY_OTHER_WRITABLE 30;42 STICKY_OTHER_WRITABLE 30;42
# Extra dircolors configuration.