diff --git a/.bash.d/bashrc_alias b/.bash.d/bashrc_alias
index 4dde28f..81e3f20 100644
--- a/.bash.d/bashrc_alias
+++ b/.bash.d/bashrc_alias
@@ -13,6 +13,8 @@
 alias ll='ls -l'
 alias la='ls -a'
 alias cp='cp -i'
-alias mv='cp -i'
+alias mv='mv -i'
 alias rm='rm -i'
 alias grep='grep --color=auto'
+alias vi='vim'
+

diff --git a/.bash.d/bashrc_alias b/.bash.d/bashrc_alias
index 4dde28f..81e3f20 100644
--- a/.bash.d/bashrc_alias
+++ b/.bash.d/bashrc_alias
@@ -13,6 +13,8 @@
 alias ll='ls -l'
 alias la='ls -a'
 alias cp='cp -i'
-alias mv='cp -i'
+alias mv='mv -i'
 alias rm='rm -i'
 alias grep='grep --color=auto'
+alias vi='vim'
+
diff --git a/.bash.d/bashrc_set b/.bash.d/bashrc_set
index afad796..b264c91 100644
--- a/.bash.d/bashrc_set
+++ b/.bash.d/bashrc_set
@@ -34,5 +34,4 @@
 #
 # 上記以外の設定については、help set で確認のこと。
 #
-set -o vi
 

diff --git a/.bash.d/bashrc_alias b/.bash.d/bashrc_alias
index 4dde28f..81e3f20 100644
--- a/.bash.d/bashrc_alias
+++ b/.bash.d/bashrc_alias
@@ -13,6 +13,8 @@
 alias ll='ls -l'
 alias la='ls -a'
 alias cp='cp -i'
-alias mv='cp -i'
+alias mv='mv -i'
 alias rm='rm -i'
 alias grep='grep --color=auto'
+alias vi='vim'
+
diff --git a/.bash.d/bashrc_set b/.bash.d/bashrc_set
index afad796..b264c91 100644
--- a/.bash.d/bashrc_set
+++ b/.bash.d/bashrc_set
@@ -34,5 +34,4 @@
 #
 # 上記以外の設定については、help set で確認のこと。
 #
-set -o vi
 
diff --git a/.bashrc b/.bashrc
index 75288ab..71c0713 100644
--- a/.bashrc
+++ b/.bashrc
@@ -13,31 +13,34 @@
 
 
 # 各種設定ファイルを読み込む。
-for CONF_FILE in `\ls -1 .bash.d/bashrc_* 2> /dev/null`; do
+for CONF_FILE in `\ls -1 ~/.bash.d/bashrc_* 2> /dev/null`; do
 	. ${CONF_FILE}
 done
 
 
 # システムに依存のファイルを読み込む
 UNAME=`uname`
-for CONF_FILE in `\ls -1 .bash.d/bashrc-${UNAME}* 2> /dev/null`; do
+for CONF_FILE in `\ls -1 ~/.bash.d/bashrc-${UNAME}* 2> /dev/null`; do
 	. ${CONF_FILE}
 done
 
 
 # 端末に応じた設定 ファイルを読み込む
-for CONF_FILE in `\ls -1 .bash.d/bashrc-${TERM}* 2> /dev/null`; do
+for CONF_FILE in `\ls -1 ~/.bash.d/bashrc-${TERM}* 2> /dev/null`; do
 	. ${CONF_FILE}
 done
 
 
 # ホストに応じた設定 ファイルを読み込む
 HOSTNAME=`hostname`
-for CONF_FILE in `\ls -1 .bashrc/bashrc-${HOSTNAME}* 2> /dev/null`; do
+for CONF_FILE in `\ls -1 ~/.bashrc/bashrc-${HOSTNAME}* 2> /dev/null`; do
 	. ${CONF_FILE}
 done
 
 
+# その他設定
+export EDITOR=vim
+
 
 # Completion options
 #