--- a/Xdefaults	Wed Jul 08 15:48:02 2009 +0900
+++ b/Xdefaults	Wed Jul 08 15:50:47 2009 +0900
@@ -34,9 +34,17 @@
 
 
 !! RXVT
+<<<<<<< local
 URxvt*font: xft:Kochi Gothic:antialias=true:size=10:spacing=20
+=======
+URxvt*font: xft:Kochi Gothic:antialias=true:size=11:spacing=20, \
+	xft:Dejavu Sans Mono
+>>>>>>> other
 !URxvt*font: xft:IPAGothic-14:antialias=true
+<<<<<<< local
 URxvt*lineSpace: 1
+=======
+>>>>>>> other
 URxvt*foreground: White
 URxvt*background: Black
 URxvt*termName: xterm
@@ -55,9 +63,3 @@
 
 URxvt.geometry: 80x24
 
-
-!!! Kinput2
-Kinput2*ConversionStartKeys: \
-        Mod2<Key>space
-Kinput2*font xft:Kochi Gothic:antialias=true:size=14:spacing=20
-

--- a/xinitrc	Wed Jul 08 15:48:02 2009 +0900
+++ b/xinitrc	Wed Jul 08 15:50:47 2009 +0900
@@ -1,24 +1,21 @@
-#!/bin/bash --login
-# $Id: DoT-xinitrc,v 1.2 2008/11/12 17:04:04 kent Exp $
+#!/bin/sh
+# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
+
 
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-sysresources=/etc/X11/xinit/.Xresources
-sysmodmap=/etc/X11/xinit/.Xmodmap
-
-# merge in defaults and keymaps
+# japanese input method
+LANG="ja_JP.UTF-8" scim -d
+export XMODIFIERS="@im=SCIM"
+export GTK_IM_MODULE="scim"
 
-if [ -f "$sysresources" ]; then
-    xrdb -merge "$sysresources"
-fi
+# terminals
+urxvt &
+urxvt &
 
-if [ -f "$sysmodmap" ]; then
-    xmodmap "$sysmodmap"
-fi
+# skippy
+skippy &
 
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
+# window manager
+exec startfluxbox
 
 if [ -f "$usermodmap" ]; then
     xmodmap "$usermodmap"

--- a/zshenv	Wed Jul 08 15:48:02 2009 +0900
+++ b/zshenv	Wed Jul 08 15:50:47 2009 +0900
@@ -1,7 +1,6 @@
 # System-wide .login file for csh(1).
 
-export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/X11R6/bin:/bin:/sbin:/usr/bin:/usr/sbin:$HOME/opt/bin"
-export PATH="$HOME/opt/bin:/usr/local/ptetex3/bin:$PATH"
+export PATH="$HOME/opt/bin:/usr/local/bin:/usr/X11R6/bin:/bin:/sbin:/usr/bin:/usr/sbin"
 export MANPATH=/usr/local/man:`manpath`
 #export DYLD_FALLBACK_LIBRARY_PATH="${HOME}/usr/lib"
 #export DYLD_FRAMEWORK_PATH="/Library/Frameworks:/System/Library/Frameworks"

--- a/zshrc	Wed Jul 08 15:48:02 2009 +0900
+++ b/zshrc	Wed Jul 08 15:50:47 2009 +0900
@@ -15,7 +15,7 @@
 #compinit
 # End of lines added by compinstall
 
-alias ls='gls -F --show-control-chars --color=auto'
+alias ls='ls -F --show-control-chars --color=auto'
 alias la='ls -a'
 alias ll='ls -l'
 alias b='popd'
@@ -24,6 +24,8 @@
 alias octave='GNUTERM=aqua /Applications/Octave.app/Contents/Resources/bin/octave'
 
 alias mail='msmtp --host=nirai.ie.u-ryukyu.ac.jp --port=587 --auth=plain --user=k088511 --from=kent@cr.ie.u-ryukyu.ac.jp'
+alias PASTE='xsel -o'
+alias COPY='xsel -i'
 
 setopt prompt_subst
 PROMPT='%{%}<%{%}%{%}%n%{%}:%{%}%m%{%}%{%}>%{%} '
@@ -45,11 +47,13 @@
 # ~-0 ~-1 ~-2 ... dirs -v の下から
 # pushdminus をセットすると+-が逆転するが，~0 ~1 ~2などは変わらない
 
-eval `gdircolors ~/.dir_colors`
+eval `dircolors ~/.dir_colors`
 zmodload zsh/complist
 export ZLS_COLORS="$LS_COLORS" 
 
 
+disable mkdir
+
 # zsh read followed files
 #  /etc/zshenv, $ZDOTDIR/.zshenv
 #  /etc/zprofile, $ZDOTDIR/.zprofile  IF (login shell)