add bar, fix xinitrc, add vdirsyncer to imap and update config.h

[dotfiles.git] / x / .xinitrc

diff --git a/x/.xinitrc b/x/.xinitrc
old mode 100644 (file)
new mode 100755 (executable)
index 53c756f..763a2b5
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,14 +1,17 @@
+#!/bin/bash
+PATH=$PATH:~/.local/bin
+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
 
-exec i3
+while true; do xsetroot -name "$(bar)"; sleep 1m; done &
+while true; do dwm >dwm.log 2>&1; done