X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=x%2F.xinitrc;h=dfabfa311c98b726ca3ab56b41c12cc6fa76bddc;hb=c59a11e7dc0bdceb25590ce97ab2eab76ec5818a;hp=6c2f66672a635c07e28e208f97374dc554e79c36;hpb=081b167a47e0ed34514535fe67501dfd006b3061;p=dotfiles.git

diff --git a/x/.xinitrc b/x/.xinitrc
old mode 100644
new mode 100755
index 6c2f666..dfabfa3
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,15 +1,15 @@
+#!/bin/bash
+xautolock -locker ~/.local/bin/lock.sh &
+dunst &
+
+eval "$(gpg-agent --daemon)"
 xrdb -merge ~/.Xresources
-urxvtd -q -o -f
 
-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")"
+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
 
-setxkbmap -layout dvorak,ru -variant ,phonetic_dvorak -option compose:ralt,grp:menu_toggle
 exec i3