dircolors: apply extraConfig after settings (#1890)

Applying extraConfig before settings made it unable to override the
defaults.

modules/misc/news.nix

@@ -1880,6 +1880,13 @@ in
           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'.
+        '';
+      }
     ];
   };
 }

modules/programs/dircolors.nix

@@ -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)

tests/modules/programs/dircolors/settings-expected.conf

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