From f877b003d55e9ceb0d883de3eda4c1cb11322925 Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Thu, 20 Dec 2018 23:37:33 +0100
Subject: [PATCH] update font and hdpi settings

---
 x11/.Xresources | 14 +++++---------
 x11/.xinitrc    |  7 ++++++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/x11/.Xresources b/x11/.Xresources
index edb65a2..e248029 100644
--- a/x11/.Xresources
+++ b/x11/.Xresources
@@ -3,7 +3,7 @@
 ! Xft settings
 !-------------------------------------------------------------------------------
 
-Xft.dpi: 112
+Xft.dpi: 120
 Xft.autohint: false
 Xft.lcdfilter:  lcddefault
 Xft.hintstyle:  hintfull
@@ -23,21 +23,17 @@ URxvt*lineSpace:            0
 URxvt*skipBuiltinGlyphs:    true
 
 ! Fonts
-URxvt*font:                 xft:Hack:style=Regular:size=11, \
+URxvt*font:                 xft:Fira Code:style=Regular:size=11, \
                             xft:Droid Sans Fallback:style=Regular, \
-                            xft:Droid Sans Japanese:style=Regular, \
                             xft:unifont:style=Medium
-URxvt*boldFont:             xft:Hack:style=Bold:size=11, \
+URxvt*boldFont:             xft:Fira Code:style=Bold:size=11, \
                             xft:Droid Sans Fallback:style=Regular, \
-                            xft:Droid Sans Japanese:style=Regular, \
                             xft:unifont:style=Medium
-URxvt*italicFont:           xft:Hack:style=Regular:size=11, \
+URxvt*italicFont:           xft:Fira Code:style=Regular:size=11, \
                             xft:Droid Sans Fallback:style=Regular, \
-                            xft:Droid Sans Japanese:style=Regular, \
                             xft:unifont:style=Medium
-URxvt*boldItalicFont:       xft:Hack:style=Bold:size=11, \
+URxvt*boldItalicFont:       xft:Fira Code:style=Bold:size=11, \
                             xft:Droid Sans Fallback:style=Regular, \
-                            xft:Droid Sans Japanese:style=Regular, \
                             xft:unifont:style=Medium
 
 ! Scrollbar
diff --git a/x11/.xinitrc b/x11/.xinitrc
index 2816430..eb8f408 100755
--- a/x11/.xinitrc
+++ b/x11/.xinitrc
@@ -13,7 +13,12 @@ fi
 
 eval $(gpg-agent -s --enable-ssh-support --daemon --write-env-file $HOME/.gpg-agent-info)
 
-xrdb $HOME/.Xresources
+DISPLAY_SCALE=1.25
+export GDK_DPI_SCALE=$DISPLAY_SCALE
+export QT_AUTO_SCREEN_SCALE_FACTOR=$DISPLAY_SCALE
+
+[[ -f ~/.Xresources ]] && xrdb -merge -I$HOME ~/.Xresources
+
 
 case $1 in
     xterm)