diff --git a/.bashrc.d/com-editor b/.bashrc.d/com-editor
new file mode 100644
index 0000000..607d877
--- /dev/null
+++ b/.bashrc.d/com-editor
@@ -0,0 +1,6 @@
+# vim: ts=4 sw=4 sts=4 ff=unix fenc=utf-8:
+[[ "$-" != *i* ]] && return
+echo "[load] ${BASH_SOURCE:-$0}"
+
+EDITOR=vim
+export EDITOR

diff --git a/.bashrc.d/com-editor b/.bashrc.d/com-editor
new file mode 100644
index 0000000..607d877
--- /dev/null
+++ b/.bashrc.d/com-editor
@@ -0,0 +1,6 @@
+# vim: ts=4 sw=4 sts=4 ff=unix fenc=utf-8:
+[[ "$-" != *i* ]] && return
+echo "[load] ${BASH_SOURCE:-$0}"
+
+EDITOR=vim
+export EDITOR
diff --git a/.bashrc.d/com-prompt b/.bashrc.d/com-prompt
index 7f5886f..62e08ec 100644
--- a/.bashrc.d/com-prompt
+++ b/.bashrc.d/com-prompt
@@ -2,11 +2,16 @@
 [[ "$-" != *i* ]] && return
 echo "[load] ${BASH_SOURCE:-$0}"
 
-# git-prompt.sh 読み込み
-SCRIPT_DIR=$(cd $(dirname ${BASH_SOURCE:-$0}); pwd)
-if [ -f "${SCRIPT_DIR}/git-prompt-simple.sh" ]; then
-	. "${SCRIPT_DIR}/git-prompt-simple.sh"
-fi
+# git ブランチ表示用
+function __ps1_git_branch() {
+	git rev-parse --abbrev-ref HEAD 2>/dev/null|sed "s/^\(.*\)$/(\1)/"
+}
+
+# git 状態表示用 (変更発生時 ! を表示する)
+function __ps1_git_status() {
+	git status --short 2>/dev/null| head -n 1 | sed "s/^.*$/!/"
+}
+
 
 # プロンプト設定
 #	PS1		: 通常プロンプト定義
@@ -90,10 +95,10 @@
 C_CLR='\[\e[39m\]'
 
 PS1_PROMPT=
-PS1_PROMPT="${PS1_PROMPT}${C_CYN}[\u@\h:\W("
-PS1_PROMPT="${PS1_PROMPT}${C_YEL}\$(__git_ps1_branch ' (%s)')"
-PS1_PROMPT="${PS1_PROMPT}${C_RED}\$(__git_ps1_status ' (%s)')"
-PS1_PROMPT="${PS1_PROMPT}${C_CYN})]\\$ "
+PS1_PROMPT="${PS1_PROMPT}${C_CYN}[\u@\h:\W"
+PS1_PROMPT="${PS1_PROMPT}${C_YEL}\$(__ps1_git_branch)"
+#PS1_PROMPT="${PS1_PROMPT}${C_RED}\$(__ps1_git_status)"
+PS1_PROMPT="${PS1_PROMPT}${C_CYN}]\\$ "
 PS1_PROMPT="${PS1_PROMPT}${C_CLR}"
 PS1="${PS1_PROMPT}"
 PS2='>'

diff --git a/.bashrc.d/com-editor b/.bashrc.d/com-editor
new file mode 100644
index 0000000..607d877
--- /dev/null
+++ b/.bashrc.d/com-editor
@@ -0,0 +1,6 @@
+# vim: ts=4 sw=4 sts=4 ff=unix fenc=utf-8:
+[[ "$-" != *i* ]] && return
+echo "[load] ${BASH_SOURCE:-$0}"
+
+EDITOR=vim
+export EDITOR
diff --git a/.bashrc.d/com-prompt b/.bashrc.d/com-prompt
index 7f5886f..62e08ec 100644
--- a/.bashrc.d/com-prompt
+++ b/.bashrc.d/com-prompt
@@ -2,11 +2,16 @@
 [[ "$-" != *i* ]] && return
 echo "[load] ${BASH_SOURCE:-$0}"
 
-# git-prompt.sh 読み込み
-SCRIPT_DIR=$(cd $(dirname ${BASH_SOURCE:-$0}); pwd)
-if [ -f "${SCRIPT_DIR}/git-prompt-simple.sh" ]; then
-	. "${SCRIPT_DIR}/git-prompt-simple.sh"
-fi
+# git ブランチ表示用
+function __ps1_git_branch() {
+	git rev-parse --abbrev-ref HEAD 2>/dev/null|sed "s/^\(.*\)$/(\1)/"
+}
+
+# git 状態表示用 (変更発生時 ! を表示する)
+function __ps1_git_status() {
+	git status --short 2>/dev/null| head -n 1 | sed "s/^.*$/!/"
+}
+
 
 # プロンプト設定
 #	PS1		: 通常プロンプト定義
@@ -90,10 +95,10 @@
 C_CLR='\[\e[39m\]'
 
 PS1_PROMPT=
-PS1_PROMPT="${PS1_PROMPT}${C_CYN}[\u@\h:\W("
-PS1_PROMPT="${PS1_PROMPT}${C_YEL}\$(__git_ps1_branch ' (%s)')"
-PS1_PROMPT="${PS1_PROMPT}${C_RED}\$(__git_ps1_status ' (%s)')"
-PS1_PROMPT="${PS1_PROMPT}${C_CYN})]\\$ "
+PS1_PROMPT="${PS1_PROMPT}${C_CYN}[\u@\h:\W"
+PS1_PROMPT="${PS1_PROMPT}${C_YEL}\$(__ps1_git_branch)"
+#PS1_PROMPT="${PS1_PROMPT}${C_RED}\$(__ps1_git_status)"
+PS1_PROMPT="${PS1_PROMPT}${C_CYN}]\\$ "
 PS1_PROMPT="${PS1_PROMPT}${C_CLR}"
 PS1="${PS1_PROMPT}"
 PS2='>'
diff --git a/.bashrc.d/git-prompt-simple.sh b/.bashrc.d/git-prompt-simple.sh
deleted file mode 100755
index 5ccf47d..0000000
--- a/.bashrc.d/git-prompt-simple.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-# vim: ts=4 sw=4 sts=4 ff=unix fenc=utf-8:
-[[ "$-" != *i* ]] && return
-echo "[load] ${BASH_SOURCE:-$0}"
-
-__git_ps1_branch() {
-BRANCH=$(git rev-parse --abbrev-ref HEAD 2> /dev/null)
-	if [ ! -z $BRANCH ]; then
-		echo -n "${BRANCH}"
-	fi
-}
-__git_ps1_status() {
-	if [ ! -z "$(git status --short 2> /dev/null)" ]; then
-		STATUS=!
-	fi
-	echo -n "${STATUS}"
-}
-