summaryrefslogtreecommitdiff
path: root/configs/profile/root-image/etc/skel/.xinitrc
diff options
context:
space:
mode:
Diffstat (limited to 'configs/profile/root-image/etc/skel/.xinitrc')
-rw-r--r--configs/profile/root-image/etc/skel/.xinitrc52
1 files changed, 48 insertions, 4 deletions
diff --git a/configs/profile/root-image/etc/skel/.xinitrc b/configs/profile/root-image/etc/skel/.xinitrc
index bc2b43a..ee22bef 100644
--- a/configs/profile/root-image/etc/skel/.xinitrc
+++ b/configs/profile/root-image/etc/skel/.xinitrc
@@ -1,5 +1,49 @@
-code=$(cat ~/.codecheck | grep XKBMAP= | cut -d '=' -f 2)
-[ "$code" = "0" ] && code='us'
-setxkbmap $code
+#!/bin/sh
-exec startlxde
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+ xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+ xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+ xrdb -merge "$userresources"
+fi
+
+if [ -f "$usermodmap" ]; then
+ xmodmap "$usermodmap"
+fi
+
+
+# start some nice programs
+
+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
+
+
+# start a destop environment
+
+if [ "${DESKTOP_SESSION}" == 'LXDE' ]
+then exec startlxde
+if [ "${DESKTOP_SESSION}" == 'mate' ]
+then exec mate-session
+else twm &
+ xclock -geometry 50x50-1+1 &
+ xterm -geometry 80x50+494+51 &
+ xterm -geometry 80x20+494-0 &
+ exec xterm -geometry 80x66+0+0 -name login
+fi