Merge branch 'master' of github.com:dopefishh/dotfiles

[dotfiles.git] / x / .xinitrc

diff --git a/x/.xinitrc b/x/.xinitrc
index b757c66..dfabfa3 100755 (executable)
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,5 +1,15 @@
 #!/bin/bash
+xautolock -locker ~/.local/bin/lock.sh &
+dunst &
 
 eval "$(gpg-agent --daemon)"
+xrdb -merge ~/.Xresources
+
+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
 
 exec i3