Auto commit by The Sugar System.

[sugar.git] / dot-files / _xinitrc

diff --git a/dot-files/_xinitrc b/dot-files/_xinitrc
index d0986d779ece8ee830b1ca3badf24b0ba84ba3db..6698c21770d8d74497e00e90cddf99f216b28386 100644 (file)
--- a/dot-files/_xinitrc
+++ b/dot-files/_xinitrc
@@ -16,6 +16,11 @@ if [ -d "/usr/pkg/lib/X11/fonts/local/" ]; then
     xset fp rehash
 fi
 
+if [ -d "/usr/pkg/lib/X11/fonts/intlfonts/" ]; then
+    xset fp+ /usr/pkg/lib/X11/fonts/intlfonts/
+    xset fp rehash
+fi
+
 if [ -f $sysresources ]; then
     xrdb -merge $sysresources
 fi
@@ -45,12 +50,26 @@ GTK_IM_MODULE="uim"; export GTK_IM_MODULE
 xhost +localhost
 
 # Set the mouse speed
-xset m 5 4
+if [ `hostname` != "seras" ]; then
+    xset m 5 4
+fi
+
+# Disable the beep / bell.
+xset -b
+
+# Launch ssh-agent-manager
+if which ssh-agent-manager 2>&1 >/dev/null; then
+    eval `ssh-agent-manager -s`
+fi
 
 echo ".xinitrc is going to exec window manager..."
 
 # start the window manager
-if which quartz-wm 2>&1 >/dev/null; then
-    quartz-wm --only-proxy &
+#if which quartz-wm 2>&1 >/dev/null; then
+#    quartz-wm --only-proxy &
+#fi
+if which vmware-user 2>&1 >/dev/null; then
+    vmware-user &
 fi
-exec fluxbox
+exec /usr/pkg/bin/fluxbox
+exec /usr/pkg/bin/twm