Auto commit by The Sugar System.

diff --git a/dot-files/_xinitrc b/dot-files/_xinitrc
index 6698c21770d8d74497e00e90cddf99f216b28386..0b492ea67ae940235b605be5a9279c05cd65d97a 100644 (file)
--- a/dot-files/_xinitrc
+++ b/dot-files/_xinitrc
@@ -41,6 +41,9 @@ fi
 if [ -d "/usr/pkg/bin" ]; then
     PATH="/usr/pkg/bin:$PATH"; export PATH
 fi
+if [ -d "/usr/local/bin" ]; then
+    PATH="/usr/local/bin:$PATH"; export PATH
+fi
 
 LANG="ja_JP.UTF-8"; export LANG
 GTK_PATH="/usr/pkg/lib/gtk-2.0"; export GTK_PATH
@@ -50,9 +53,12 @@ GTK_IM_MODULE="uim"; export GTK_IM_MODULE
 xhost +localhost
 
 # Set the mouse speed
-if [ `hostname` != "seras" ]; then
-    xset m 5 4
-fi
+case `hostname` in
+    aria.cielonegro.org)
+        xset m 5 4;;
+    yukari.cielonegro.org)
+        :xset m '1.5' 2;;
+esac
 
 # Disable the beep / bell.
 xset -b
@@ -68,8 +74,14 @@ 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
+if which vmware-user >/dev/null 2>&1; then
     vmware-user &
 fi
-exec /usr/pkg/bin/fluxbox
-exec /usr/pkg/bin/twm
+if which VBoxClient >/dev/null 2>&1; then
+    VBoxClient --display
+    VBoxClient --clipboard
+fi
+if which fluxbox >/dev/null 2>&1; then
+    exec fluxbox
+fi
+exec twm

diff --git a/dot-files/_zshenv b/dot-files/_zshenv
index acbbde18c8c840801aa10d96ae6ffd2e01943ef5..713c80869dad9ba3d5074f2ec4b408a450cb740d 100644 (file)
--- a/dot-files/_zshenv
+++ b/dot-files/_zshenv
@@ -34,6 +34,7 @@ append_path PATH /usr/pkg/lib/perl5/site_perl/bin
 append_path PATH /usr/pkg/java/openjdk7/bin
 append_path PATH /usr/local/java-1.7.0/bin
 append_path PATH /usr/local/sbt/bin
+append_path PATH /usr/X11R7/bin
 append_path PATH $HOME/bin
 append_path PATH $HOME/sandbox/_phabricator/arcanist/bin
 # Hope these could be removed someday!
@@ -53,6 +54,7 @@ append_path MANPATH /usr/local/share/man
 append_path MANPATH /opt/local/share/man
 append_path MANPATH /opt/pkg/man
 append_path MANPATH /usr/pkg/man
+append_path MANPATH /usr/X11R7/man
 
 # INFOPATH
 export INFOPATH=""