From b68fec17407aa70fdd4cc5c88667ac2d2f49658a Mon Sep 17 00:00:00 2001
From: Max Christian Pohle
Date: Fri, 26 Jun 2020 10:13:58 +0200
Subject: Hotfixes to improve compatibility with python

---
 utils/Xresources        |  5 ++---
 utils/default-font.conf | 29 ++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 14 deletions(-)

(limited to 'utils')

diff --git a/utils/Xresources b/utils/Xresources
index 5723999..08969ac 100644
--- a/utils/Xresources
+++ b/utils/Xresources
@@ -1,6 +1,5 @@
-! #include "/home/max/.config/base16-xresources/xresources/base16-tomorrow-night.Xresources"
-! #include "/home/max/.config/base16-xresources/xresources/base16-google-light.Xresources"
-#include "/home/max/.local/share/base16/base16-xresources/xresources/base16-tomorrow.Xresources"
+#include "/home/max/.local/share/base16/base16-xresources/xresources/base16-tomorrow-night.Xresources"
+! #include "/home/max/.local/share/base16/base16-xresources/xresources/base16-tomorrow.Xresources"
 
 urxvt.scrollBar: false
 urxvt.background: base00
diff --git a/utils/default-font.conf b/utils/default-font.conf
index cf01d6d..d7b43e2 100644
--- a/utils/default-font.conf
+++ b/utils/default-font.conf
@@ -1,24 +1,31 @@
 <?xml version="1.0"?>
-<!-- this is a configuration file for fontconfig and should be copied or linked to ~/.config/fontconfig/conf.d/ -->
+<!-- this is a configuration file for fontconfig and should be copied or linked to ~/.config/fontconfig/fonts.conf -->
 <!DOCTYPE fontconfig SYSTEM "/etc/fonts/fonts.dtd">
 <fontconfig>
     <match target="pattern">
-        <test qual="any" name="family"><string>monospace</string></test>
-        <edit mode="prepend" name="family"><string>Hack Nerd Font Mono</string></edit>
-        <edit mode="prepend" name="family"><string>Hack</string></edit>
-        <edit mode="prepend" name="family"><string>emoji</string></edit>
-        <edit mode="prepend" name="family"><string>emojione</string></edit>
-        <edit mode="prepend" name="family"><string>FuraCode Nerd Font Mono Medium</string></edit>
+        <test name="family"><string>monospace</string></test>
+        <edit name="family" mode="prepend">
+            <string>Hack Nerd Font Mono</string>
+            <string>Hack</string>
+            <string>emoji</string>
+            <string>emojione</string>
+            <string>FuraCode Nerd Font Mono Medium</string>
+            <string>FiraCode Retina Retina</string>
+        </edit>
         <test name="slant" compare="not_eq"><const>italic</const></test>
         <edit mode="assign" name="style"><string>bold</string></edit>
     </match>
     <match target="pattern">
-        <test qual="any" name="family"><string>serif</string></test>
-        <edit name="family" mode="prepend" binding="same"><string>Noto Serif</string></edit>
+        <test name="family"><string>serif</string></test>
+        <edit name="family" mode="prepend">
+            <string>Noto Serif</string>
+        </edit>
     </match>
     <match target="pattern">
-        <test qual="any" name="family"><string>sans-serif</string></test>
-        <edit name="family" mode="prepend" binding="same"><string>Noto Sans</string></edit>
+        <test name="family"><string>sans-serif</string></test>
+        <edit name="family" mode="prepend">
+            <string>Noto Sans</string>
+        </edit>
     </match>
     <match target="pattern">
         <edit name="dpi" mode="assign"><double>102</double></edit>
-- 
cgit v1.2.3