xidlehook: replace xautolock with xidlehook

[dotfiles.git] / xinitrc

diff --git a/xinitrc b/xinitrc
index 996327e4becaf580e7635eb1d556f7783cc4ae85..b7597ec8e50b6c6dd7a1cf3e736b3373b6852250 100644 (file)
--- a/xinitrc
+++ b/xinitrc
@@ -1,9 +1,10 @@
 #!/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
+userprofile_d=$XDG_CONFIG_HOME/xinit/xprofile.d
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 
@@ -25,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
@@ -37,6 +42,13 @@ 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