X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=x%2F.xinitrc;h=2d7271dd3a992c5c68afff5493d651f9ff214d21;hb=8a098d0edf56fcbcd680ce68329afb1f707f2243;hp=08f1db1b64719ed7443dcd7d054de4b21f580335;hpb=c6bc324f898008d786ac435aa48d6febb3733cba;p=dotfiles.git

diff --git a/x/.xinitrc b/x/.xinitrc
old mode 100644
new mode 100755
index 08f1db1..2d7271d
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,13 +1,30 @@
-fbgrab /tmp/bg.png
-
-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")"
+#!/bin/bash
+#To fix java applications in tiling (e.g. arduino)
+export _JAVA_AWT_WM_NONREPARENTING=1
+
+# notifications
+dunst &
+
+# gpg agent
+eval "$(gpg-agent --daemon)"
+
+# XResources
+xrdb -merge ~/.Xresources
+
+# auto locking but not on laptop
+if [ $(hostname) != "ygdrassil" ]; then
+	xautolock -locker slock -time 10 &
 fi
-export GPG_AGENT_INFO
-export SSH_AUTH_SOCK
 
-exec i3
+# Other system wide xinit files
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+	for f in /etc/X11/xinit/xinitrc.d/?*.sh; do
+		[ -x "$f" ] && . "$f"
+	done
+fi
+
+# status bar
+while true; do xsetroot -name "$(bar)"; sleep 1m; done &
+
+# wm
+while true; do dwm 1>/tmp/dwm.log 2>&1; done