Update a lot of my dotfiles regarding my new configuration: <https://docs.pphg.tech/hardware/dell_xps_15_9560/dell_xps_15_9560_arch_linux_base/> and <https://docs.pphg.tech/hardware/dell_xps_15_9560/dell_xps_15_9560_arch_linux_bspwm_in_xfce/>

dotfiles/xinitrc

@@ -3,15 +3,43 @@
 # {{@@ env['dotdrop_warning'] @@}}
 #
 
-# User Xdefaults
-#if [ -f $HOME/.Xdefaults ]; then
-#	xrdb -merge -I$HOME ~/.Xresources
-#fi
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+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
+
+# start some nice programs
+
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+ for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+  [ -x "$f" ] && . "$f"
+ done
+ unset f
+fi
+
+# Start gnome keyring deamon
+eval $(/u)
 
 # Start gnome keyring daemon
 eval $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets)
 export $(gnome-keyring-daemon --start --components=pkcs11,secrets,gpg)
 # Tells dbus to add DISPLAY to its own environment variables
 dbus-update-activation-environment --systemd DISPLAY
-# load Xresources
-exec bspwm