dircolors: apply extraConfig after settings (#1890)

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

View file

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