fontconfig: tweak fonts after Noto fiasco

.config/X11/xresources

@@ -59,11 +59,11 @@ xterm.metaSendsEscape:      true
 
 urxvt.termName:             xterm-256color
 
-urxvt.font:                 xft:SauceCodePro Nerd Font:style=regular:size=9
+urxvt.font:                 xft:Source Code Pro:style=regular:size=9
-urxvt.imFont:               xft:SauceCodePro Nerd Font:style=regular:size=9
+urxvt.imFont:               xft:Source Code Pro:style=regular:size=9
-urxvt.boldFont:             xft:SauceCodePro Nerd Font:style=bold:size=9
+urxvt.boldFont:             xft:Source Code Pro:style=bold:size=9
-urxvt.italicFont:           xft:SauceCodePro Nerd Font:style=italic:size=9
+urxvt.italicFont:           xft:Source Code Pro:style=italic:size=9
-urxvt.boldItalicFont:       xft:SauceCodePro Nerd Font:style=bold,italic:size=9
+urxvt.boldItalicFont:       xft:Source Code Pro:style=bold,italic:size=9
 
 
 urxvt.iso14755:             false

.config/dunst/dunstrc

@@ -1,5 +1,5 @@
 [global]
-    font = Noto Sans 10
+    font = Noto Sans 9.5
     
     # Allow a small subset of html markup:
     #   <b>bold</b>

.config/fontconfig/fonts.conf

@@ -1,44 +1,58 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+
     <match>
-        <test name="family">
+        <test name="family"><string>Noto Sans</string></test>
-            <string>sans-serif</string>
+        <edit name="family" mode="assign" binding="strong">
-        </test>
+            <string>NotoSans Nerd Font</string>
-        <edit name="family" mode="prepend" binding="weak">
+        </edit>
+    </match>
+    <match>
+        <test name="family"><string>Noto Serif</string></test>
+        <edit name="family" mode="assign" binding="strong">
+            <string>NotoSerif Nerd Font</string>
+        </edit>
+    </match>
+    <match>
+        <test name="family"><string>Source Code Pro</string></test>
+        <edit name="family" mode="assign" binding="strong">
+            <string>SauceCodePro Nerd Font</string>
+        </edit>
+    </match>
+
+    <match>
+        <test qual="any" name="family"><string>sans-serif</string></test>
+        <edit name="family" mode="prepend" binding="same">
+            <string>NotoSans Nerd Font</string>
             <string>Noto Sans</string>
             <string>Noto Color Emoji</string>
         </edit>
     </match>
+    <match target="font">
+        <test qual="all" name="family" compare="eq"><string>Noto Sans</string></test>
+        <edit name="hintstyle" mode="assign"><const>hintnone</const></edit>
+    </match>
     <match>
-        <test name="family">
+        <test qual="any" name="family"><string>serif</string></test>
-            <string>serif</string>
+        <edit name="family" mode="prepend" binding="same">
-        </test>
+            <string>NotoSerif Nerd Font</string>
-        <edit name="family" mode="prepend" binding="weak">
             <string>Noto Serif</string>
             <string>Noto Color Emoji</string>
         </edit>
     </match>
     <match>
-        <test name="family">
+        <test qual="any" name="family"><string>monospace</string></test>
-            <string>monospace</string>
+        <edit name="family" mode="prepend" binding="same">
-        </test>
+            <string>SauceCodePro Nerd Font Mono</string>
-        <edit name="family" mode="prepend" binding="weak">
+            <string>Source Code Pro</string>
-            <string>Sauce Code Pro</string>
-            <string>Noto Color Emoji</string>
-        </edit>
-    </match>
-    <match>
-        <test name="family">
-            <string>Apple Color Emoji</string>
-        </test>
-        <edit name="family" mode="prepend" binding="weak">
             <string>Noto Color Emoji</string>
         </edit>
     </match>
     <match target="font">
-        <edit name="hintstyle" mode="assign">
+        <test qual="all" name="family" compare="eq"><string>SauceCodePro Nerd Font Mono</string></test>
-            <const>hintfull</const>
+        <edit name="hintstyle" mode="assign"><const>hintfull</const></edit>
-        </edit>
+        <edit name="lcdfilter" mode="assign"><const>lcddefault</const></edit>
+        <edit name="rgba" mode="assign"><const>rgb</const></edit>
     </match>
 </fontconfig>

.config/termite/config

@@ -1,5 +1,5 @@
 [options]
-font = SauceCodePro 9
+font = Source Code Pro 9
 scrollback_lines = 1000000
 cursor_blink = off
 size_hints = true