X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=x%2F.xinitrc;h=f2daf3130a4e654d583a0a5d58692994064c1cec;hb=006f2b070968a203c44232591024870d88e80411;hp=08f1db1b64719ed7443dcd7d054de4b21f580335;hpb=f2a1c89978a8ec6f129660a28f5c424b5f55bcd2;p=dotfiles.git

diff --git a/x/.xinitrc b/x/.xinitrc
old mode 100644
new mode 100755
index 08f1db1..f2daf31
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,13 +1,16 @@
-fbgrab /tmp/bg.png
+#!/bin/bash
+urxvtd -q -o -f &
+xautolock -locker ~/.local/bin/lock.sh &
+dunst &
 
-envfile="$HOME/.gnupg/gpg-agent.env"
-if [[ -e "$envfile" ]] && kill -0 $(grep GPG_AGENT_INFO "$envfile" | cut -d: -f 2) 2>/dev/null
-then
-	eval "$(cat "$envfile")"
-else
-	eval "$(gpg-agent --daemon --enable-ssh-support --write-env-file "$envfile")"
+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
-export GPG_AGENT_INFO
-export SSH_AUTH_SOCK
 
 exec i3