X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fskel%2F.xinitrc;h=1e413ffc8ff253ac1754e76c0c6f18f72340af44;hb=0567eb37fc3229a6dde4bb83f4e510023f0e3a5f;hp=d2c5bcabe214fb1f53a7d6bf7a76bf328e522d55;hpb=619e0de06b76617ae33acdeafc455210dc58d729;p=grml-etc.git

diff --git a/etc/skel/.xinitrc b/etc/skel/.xinitrc
index d2c5bca..1e413ff 100755
--- a/etc/skel/.xinitrc
+++ b/etc/skel/.xinitrc
@@ -1,65 +1,25 @@
 #!/bin/sh
-# Filename:      .xinitrc
-# Purpose:       specify details for xserver
+# Filename:      ~/.xinitrc
+# Purpose:       main configuration file of X startup
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
-# License:       This file is licensed under the GPL v2.
-# Latest change: Mon Jun 12 13:56:28 CEST 2006 [mika]
+# License:       This file is licensed under the GPL v2 or any later version.
 ################################################################################
 
-# is something goes wrong fall back to plain xterm:
-#  failsafe="xterm -ls -T failsafe -geometry 80x24-0-0"
-#  trap "exec $failsafe" EXIT 1 2 13 15
-
-# set wallpaper
-# wmsetbg -t /usr/share/grml/desktop.png &
-  if [ -x /usr/bin/Esetroot ] ; then
-     [ -r /usr/share/grml/desktop.jpg ] && Esetroot -scale /usr/share/grml/desktop.jpg &
-  fi
-
-# print info text
-  if [ -x /usr/bin/osd_cat ] ; then
-    echo "Starting X window system and loading window manager..." | \
-    osd_cat -c white -A center -p middle -f "-misc-fixed-medium-r-normal-*-*-150-*-*-c-*-iso8859-15" &
-  fi
-
-# add at least one entry to xauth
-#  xauth add $DISPLAY MIT-MAGIC-COOKIE-1 `mcookie`
-
-# set default cursor
-  xsetroot -cursor_name left_ptr
-
-## set mouse speed behaviour:
-# fast:
-# xset m 4 2
-# normal:
-  xset m 2 5
-# slow:
-# xset m 1 1
-
-# other settings:
-# xset m 20/10 4
-
-# xresources
-  [ -r $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources
-
-# keybindings
-  . /etc/sysconfig/keyboard && \
-  if [ $XKEYBOARD == "us" ] ; then
-    [ -r $HOME/.Xmodmap ] && xmodmap $HOME/.Xmodmap
-  fi
-  if [ $XKEYBOARD == "de" ] ; then
-    [ -r $HOME/.Xmodmap.german ] && xmodmap $HOME/.Xmodmap.german
-  fi
-# mouse for lefty:
-# xmodmap -e "pointer = 3 2 1"
-# mouse for right hander:
-# xmodmap -e "pointer = 1 2 3"
-
-# start browser with startpage.html
-  grml-info &
-
-# default entry, use e.g. 'grml-x windowmanager' for changing
-  exec /usr/bin/wm-ng
+# configuration: by default all scripts from ~/.xinitrc.d are executed,
+# but it's possible to configure this through a configuration file
+if [ -r "$HOME/.config/${distri}/xinitrc" ] ; then
+  . "$HOME/.config/${distri}/xinitrc"
+elif [ -r "$HOME/.config/grml/xinitrc" ] ; then
+  . "$HOME/.config/grml/xinitrc"
+fi
+
+# execute all existing scripts
+for f in ~/.xinitrc.d/* ; do
+  "$f"
+done
+
+# default entry, use e.g. 'grml-x windowmanager' for changing or just adjust manually
+exec /usr/bin/x-window-manager
 
 ## END OF FILE #################################################################