From 80177419d83eb40abcd38e5a733105a29b8bab55 Mon Sep 17 00:00:00 2001
From: Stefan Ritter <xeno@thehappy.de>
Date: Tue, 19 Apr 2005 04:08:49 +0200
Subject: xinitrc update

---
 xorg/xinitrc | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'xorg')

diff --git a/xorg/xinitrc b/xorg/xinitrc
index e65fb7d..c9a4cf2 100755
--- a/xorg/xinitrc
+++ b/xorg/xinitrc
@@ -1,10 +1,24 @@
 #!/bin/bash
 
+WM='fvwm2'
+WALLPAPER='media/bilder/wallpaper/wood_3.png'
+
 setxkbmap de neo
 xset +fp /usr/share/fonts/local
 xset fp rehash
-xrandr --output LVDS1 --off --output VGA1 --auto
-feh --bg-scale media/bilder/wallpaper/wood_3.png
-xscreensaver -no-splash &
 
-exec ssh-agent i3
+if [ -e /usr/bin/xrandr ]; then
+	if [ $(hostname) = "galahad" ]; then
+		xrandr --output LVDS1 --off --output VGA1 --auto
+	fi
+fi
+
+if [ -e "$WALLPAPER" -a /usr/bin/feh]; then
+	feh --bg-scale $WALLPAPER
+fi
+
+if [ -e /usr/bin/xscreensaver ]; then
+	xscreensaver -no-splash &
+fi
+
+exec ssh-agent $WM
-- 
cgit v1.2.3