From 17d7b38e277deb46b664b52c5cdb40feafe902a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <necoro@necoro.net>
Date: Sat, 8 Jun 2013 11:17:36 +0200
Subject: Cleanup X startup files

---
 .xinitrc | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 .xinitrc

(limited to '.xinitrc')

diff --git a/.xinitrc b/.xinitrc
new file mode 100644
index 0000000..3143dc1
--- /dev/null
+++ b/.xinitrc
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+session=$1
+
+#
+# XKB is not set here anymore -- instead we use the standard altgr_intl
+# with some more options
+# set the following in X11: "terminate:ctrl_alt_bksp,grp:menu_toggle,compose:rwin,caps:escape"
+#
+
+# set IM to XIM, so it reads .XCompose
+export GTK_IM_MODULE=xim
+export QT_IM_MODULE=xim
+
+[ x$GPG_AGENT_INFO = "x" ] && eval $(gpg-agent --daemon)
+
+# start urxvt daemon
+urxvtd -f -o -q
+
+[[ $session == session ]] && exit
+
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+    for i in /etc/X11/xinit/xinitrc.d/* ; do
+        if [ -x "$i" ]; then
+            . "$i"
+        fi
+    done
+fi
+
+xrdb -merge $HOME/.Xresources
+$HOME/.i3/scripts/monitors.sh 2
+
+case $session in
+    [xX]fce|[xX]fce4) exec startxfce4;;
+    *)
+        . $HOME/.fehbg
+        exec i3 -V > $HOME/.i3/i3.log 2>&1
+        ;;
+esac
+# exec herbstluftwm
-- 
cgit v1.2.3