xidlehook: replace xautolock with xidlehook

[dotfiles.git] / xinitrc

diff --git a/xinitrc b/xinitrc
index 268260f94c00b063c72aca63d691020c21bfe8c8..b7597ec8e50b6c6dd7a1cf3e736b3373b6852250 100644 (file)
--- a/xinitrc
+++ b/xinitrc
@@ -4,7 +4,7 @@ logfile=$XDG_DATA_HOME/xorg/xinit.log
 userresources=$XDG_CONFIG_HOME/xinit/Xresources
 userresources_d=$XDG_CONFIG_HOME/xinit/Xresources.d
 usermodmap=$HOME/.Xmodmap
 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
 
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 


@@ -42,6 +42,13 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
     unset f
 fi
 
     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
 if [ -f "$userprofile" ]; then
     source "$userprofile"
 fi