xinit: load host specific Xresources

diff --git a/Xresources b/xinit/Xresources
similarity index 94%
rename from Xresources
rename to xinit/Xresources
index 3203bec6a2dcef001ef9871885e9de3cab15ae7e..db7941862035869644ff8c24cd9d42dc1057616f 100644 (file)
--- a/Xresources
+++ b/xinit/Xresources
@@ -7,7 +7,13 @@ URxvt*iconFile:     src/dotfiles/icons/shell.png
 ! {{{1 Font
 URxvt.font:              xft:Hack:size=10
 URxvt.skipBuiltinGlyphs: true
 ! {{{1 Font
 URxvt.font:              xft:Hack:size=10
 URxvt.skipBuiltinGlyphs: true

+

 Xft.antialias: true
 Xft.antialias: true

+Xft.autohint:  0
+Xft.hinting:   true
+Xft.hintstyle: hintfull
+Xft.lcdfilter: lcddefault
+Xft.rgba:      rgb

 
 ! {{{1 Scrolling
 URxvt*.scrollBar: false
 
 ! {{{1 Scrolling
 URxvt*.scrollBar: false

diff --git a/xinit/Xresources.d/skull-canyon b/xinit/Xresources.d/skull-canyon
new file mode 100644 (file)
index 0000000..7931cad
--- /dev/null
+++ b/xinit/Xresources.d/skull-canyon
@@ -0,0 +1 @@
+Xft.dpi:       168

diff --git a/xinitrc b/xinitrc
index 996327e4becaf580e7635eb1d556f7783cc4ae85..268260f94c00b063c72aca63d691020c21bfe8c8 100644 (file)
--- a/xinitrc
+++ b/xinitrc
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 logfile=$XDG_DATA_HOME/xorg/xinit.log
 #!/bin/sh
 
 logfile=$XDG_DATA_HOME/xorg/xinit.log

-userresources=$HOME/.Xresources
+userresources=$XDG_CONFIG_HOME/xinit/Xresources
+userresources_d=$XDG_CONFIG_HOME/xinit/Xresources.d

 usermodmap=$HOME/.Xmodmap
 userprofile=$XDG_CONFIG_HOME/xinit/xprofile
 sysresources=/etc/X11/xinit/.Xresources
 usermodmap=$HOME/.Xmodmap
 userprofile=$XDG_CONFIG_HOME/xinit/xprofile
 sysresources=/etc/X11/xinit/.Xresources


@@ -25,6 +26,10 @@ if [ -f "$userresources" ]; then
     xrdb -merge "$userresources"
 fi
 
     xrdb -merge "$userresources"
 fi
 

+if [ -f $userresources_d/$(hostname) ]; then
+    xrdb -merge $userresources_d/$(hostname)
+fi
+

 if [ -f "$usermodmap" ]; then
     xmodmap "$usermodmap"
 fi
 if [ -f "$usermodmap" ]; then
     xmodmap "$usermodmap"
 fi