Auto commit by The Sugar System.

[sugar.git] / dot-files / _xinitrc

diff --git a/dot-files/_xinitrc b/dot-files/_xinitrc
index b9007057c9e8ba09a87919a700a87aef56105d2d..84cac20dec9df75a97e01d715599fa843eda9f49 100644 (file)
--- a/dot-files/_xinitrc
+++ b/dot-files/_xinitrc
@@ -2,8 +2,8 @@
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
-sysresources=/etc/X11/xinit/.Xresources
-sysmodmap=/etc/X11/xinit/.Xmodmap
+sysresources=/usr/pkg/lib/X11/xinit/.Xresources
+sysmodmap=/usr/pkg/lib/X11/xinit/.Xmodmap
 
 # merge in defaults and keymaps
 if [ -d "/usr/local/lib/X11/fonts/Unicode" ]; then
@@ -11,6 +11,16 @@ if [ -d "/usr/local/lib/X11/fonts/Unicode" ]; then
     xset fp rehash
 fi
 
+if [ -d "/usr/pkg/lib/X11/fonts/local/" ]; then
+    xset fp+ /usr/pkg/lib/X11/fonts/local/
+    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
@@ -33,13 +43,21 @@ if [ -d "/usr/pkg/bin" ]; then
 fi
 
 LANG="ja_JP.UTF-8"; export LANG
+GTK_PATH="/usr/pkg/lib/gtk-2.0"; export GTK_PATH
 GTK_IM_MODULE="uim"; export GTK_IM_MODULE
 
 # start some nice programs
 xhost +localhost
 
 # Set the mouse speed
-xset m 5 4
+if [ `hostname` != "seras" ]; then
+    xset m 5 4
+fi
+
+# 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..."
 
@@ -47,4 +65,7 @@ echo ".xinitrc is going to exec window manager..."
 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