X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/6328d9c25dba0cccbadb09b2f9d54e4781fe8f18..c6a94b49c00ea320c67909cbe0d2df2f95d4fbb9:/xinitrc

diff --git a/xinitrc b/xinitrc
index f79ee4a..b7597ec 100644
--- a/xinitrc
+++ b/xinitrc
@@ -1,11 +1,18 @@
 #!/bin/sh
 
-userresources=$HOME/.Xresources
+logfile=$XDG_DATA_HOME/xorg/xinit.log
+userresources=$XDG_CONFIG_HOME/xinit/Xresources
+userresources_d=$XDG_CONFIG_HOME/xinit/Xresources.d
 usermodmap=$HOME/.Xmodmap
-userprofile=$HOME/.xprofile
+userprofile_d=$XDG_CONFIG_HOME/xinit/xprofile.d
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 
+# redirect all further output
+exec 2>&1 >>"$logfile"
+
+printf "\n%s  Reading '~/.xinitrc'\n" $(date --iso-8601=minutes)
+
 # merge in defaults and keymaps
 if [ -f $sysresources ]; then
     xrdb -merge $sysresources
@@ -19,6 +26,10 @@ if [ -f "$userresources" ]; then
     xrdb -merge "$userresources"
 fi
 
+if [ -f $userresources_d/$(hostname) ]; then
+    xrdb -merge $userresources_d/$(hostname)
+fi
+
 if [ -f "$usermodmap" ]; then
     xmodmap "$usermodmap"
 fi
@@ -31,8 +42,16 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
     unset f
 fi
 
+if [ -d "$userprofile_d" ] ; then
+    for f in $userprofile_d/?*.sh ; do
+        [ -f "$f" ] && source "$f"
+    done
+    unset f
+fi
+
 if [ -f "$userprofile" ]; then
     source "$userprofile"
 fi
 
+echo "Start Awesome"
 exec awesome