From e7dc9d0b9040a35da96b193de4644e8ea56db330 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 20 Aug 2019 13:32:15 +0200
Subject: [PATCH] nixos/fontconfig: harmonize file names

---
 .../modules/config/fonts/fontconfig-penultimate.nix  | 12 ++++++------
 nixos/modules/config/fonts/fontconfig.nix            |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix
index 7e2ee474fe1..1c06ec37ca6 100644
--- a/nixos/modules/config/fonts/fontconfig-penultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix
@@ -151,7 +151,7 @@ let
     </fontconfig>
   '';
 
-  rejectType1 = pkgs.writeText "fc-53-no-type1.conf" ''
+  rejectType1 = pkgs.writeText "fc-53-nixos-reject-type1.conf" ''
     <?xml version="1.0"?>
     <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
     <fontconfig>
@@ -169,7 +169,7 @@ let
   '';
 
   # The configuration to be included in /etc/font/
-  penultimateConf = pkgs.runCommand "font-penultimate-conf" {
+  penultimateConf = pkgs.runCommand "fontconfig-penultimate-conf" {
     preferLocalBuild = true;
   } ''
     support_folder=$out/etc/fonts/conf.d
@@ -231,8 +231,8 @@ let
     ln -s ${localConf}        $latest_folder/../local.conf
     ''}
 
-    ln -s ${defaultFontsConf} $support_folder/52-default-fonts.conf
-    ln -s ${defaultFontsConf} $latest_folder/52-default-fonts.conf
+    ln -s ${defaultFontsConf} $support_folder/52-nixos-default-fonts.conf
+    ln -s ${defaultFontsConf} $latest_folder/52-nixos-default-fonts.conf
 
     ${optionalString cfg.allowBitmaps ''
     rm $support_folder/53-no-bitmaps.conf
@@ -240,8 +240,8 @@ let
     ''}
 
     ${optionalString (!cfg.allowType1) ''
-    ln -s ${rejectType1} $support_folder/53-no-type1.conf
-    ln -s ${rejectType1} $latest_folder/53-no-type1.conf
+    ln -s ${rejectType1} $support_folder/53-nixos-reject-type1.conf
+    ln -s ${rejectType1} $latest_folder/53-nixos-reject-type1.conf
     ''}
   '';
 
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 8e5d381370f..4c62ed41157 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -145,7 +145,7 @@ let
 
   # bitmap font options
   # priority 53
-  rejectBitmaps = pkgs.writeText "fc-53-nixos-bitmaps.conf" ''
+  rejectBitmaps = pkgs.writeText "fc-53-no-bitmaps.conf" ''
     <?xml version="1.0"?>
     <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
     <fontconfig>
@@ -243,9 +243,9 @@ let
     ln -s ${defaultFontsConf} $support_folder/52-nixos-default-fonts.conf
     ln -s ${defaultFontsConf} $latest_folder/52-nixos-default-fonts.conf
 
-    # 53-nixos-bitmaps.conf
-    ln -s ${rejectBitmaps} $support_folder/53-nixos-bitmaps.conf
-    ln -s ${rejectBitmaps} $latest_folder/53-nixos-bitmaps.conf
+    # 53-no-bitmaps.conf
+    ln -s ${rejectBitmaps} $support_folder/53-no-bitmaps.conf
+    ln -s ${rejectBitmaps} $latest_folder/53-no-bitmaps.conf
 
     ${optionalString (!cfg.allowType1) ''
     # 53-nixos-reject-type1.conf