Generalize X startup stuff

.Xresources

@@ -17,3 +17,5 @@
 *.color14:    #9AEDFE
 *.color7:     #BFBFBF
 *.color15:    #E6E6E6
+
+!Xft.dpi: 192

.xinitrc

@@ -1,4 +1,25 @@
 #!/bin/sh
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+if [ -f $sysresources ]; then
+    xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f $userresources ]; then
+    xrdb -merge $userresources
+fi
+
+if [ -f $usermodmap ]; then
+    xmodmap $usermodmap
+fi
+
 
 if [ -d /etc/X11/xinit/xinitrc.d ] ; then
  for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
@@ -10,7 +31,5 @@ fi
 setxkbmap "us,us" ",intl" "grp:shifts_toggle"
 xset m 0 0
 
-[ -f ~/.Xmodmap ] && xmodmap ~/.Xmodmap
-
 mkdir -p $HOME/.local/share/bspwm
 exec bspwm >$HOME/.local/share/bspwm/output.log 2>$HOME/.local/share/bspwm/error.log