3 files changed, 43 insertions, 96 deletions
diff --git a/dotrc/_alias b/dotrc/_alias
deleted file mode 100644
index 2b72874..0000000
--- a/dotrc/_alias
+++ /dev/null
@@ -1,92 +0,0 @@
-alias setcore="ulimit -c unlimited"
-
-alias mem=free
-
-#alias XTERM="xterm -vb -bg black -fg grey90 -cr red -sb -sl 5000 -sk -si -ls -geom 80x40 &"
-
-alias diffsrc='rcsdiff *.[ch] *.html makefile >& diff.out'
-
-alias ctags=exctags
-
-alias vi=vim
-
-alias gvim="gvim -geom 80x83"
-
-alias V="vi"
-
-alias ls="ls -Fx"
-alias lsc="ls --color"
-alias lrt="ls -lrt"
-alias la="ls -a"
-alias lsd="ls -1 | egrep /"
-
-alias h="history|more"
-alias hi="history 20"
-alias p="pwd"
-
-alias vc="vi ~/.alias"
-alias sc="source ~/.alias"
-
-alias wenv="env | egrep "
-alias wal="alias | egrep "
-alias wset="set | egrep "
-
-alias pslink="/usr/sbin/ncpd -s /dev/ttyS1 -b 115200"
-alias winamp="wine /home/wine/DriveC/Program\ Files/Winamp/winamp.exe"
-
-alias bug="gvd"
-
-alias status="cvs status | egrep Status:"
-
-. ~/.b_dalias
-
-# Vars
-#
-FIGNORE=.o
-
-
-# Functions
-#
-function setenv ()
-{
-    export $1=$2
-}
-
-function vgrep()
-{
-    local vgargs
-    local vgflist
-    local vgexp
-
-    if [ $1 == "-i" ] ; then
-    	vgargs="-i"
-	shift
-    else
-    	vgargs=""
-    fi
-
-    vgexp="$1"
-    shift
-
-    vgflist=`egrep -l $vgargs "$vgexp" $*`
-
-    if [ "$vgflist" == "" ] ; then
-    	echo "No matches found"
-    else
-    	vi -R -M -c "/$vgexp" $vgflist
-    fi
-}
-
-
-# Directory setting aliases
-#
-alias dsrc="source ~/.b_dalias"
-
-function dset ()
-{
-    echo "export $1=\"$PWD\" ; alias $1='cd \"$PWD\"'" >> ~/.b_dalias
-    dsrc
-}
-
-alias dwot='alias | egrep "=.cd" | egrep -v dwot'
-alias vd="vi ~/.b_dalias"
diff --git a/dotrc/_bash_aliases b/dotrc/_bash_aliases
new file mode 100644
index 0000000..36212eb
--- /dev/null
+++ b/dotrc/_bash_aliases
@@ -0,0 +1,41 @@
+export EDITOR=vim
+
+alias V="vi"
+
+alias ctags="ctags --langmap=c:.c.pc"
+
+alias lss="ls -Fx"
+alias la="lss -a"
+alias va="vi $HOME/.bash_aliases"
+alias sa=". $HOME/.bash_aliases"
+alias lsd="ls -Fx1 | egrep /"
+alias pss="ps -ef"
+alias psu="ps -f -u $LOGNAME"
+alias h="history"
+alias p="pwd"
+
+alias wenv="env | egrep "
+
+if [ -z "$XEDARG" ] ; then
+    export XEDARG="-i -r"
+fi
+
+if [ -e $HOME/.bash_dirs ] ; then
+    . $HOME/.bash_dirs
+fi
+
+# Directory setting
+#
+function dset
+{
+    if [ "$1" == "" ] ; then
+	echo usage: dset name
+    else
+	echo "export $1=\"`pwd`\" ; alias $1='cd \"\$$1\"'" >> $HOME/.bash_dirs
+	. $HOME/.bash_dirs
+    fi
+}
+
+alias dsrc=". $HOME/.bash_dirs"
+alias vd="vi $HOME/.bash_dirs"
+alias dwot="alias | egrep cd"
diff --git a/dotrc/_bashrc b/dotrc/_bashrc
index 2762d37..19429d1 100644
--- a/dotrc/_bashrc
+++ b/dotrc/_bashrc
@@ -1,7 +1,5 @@
-
 if [ "$PS1" != "" ] ; then
-    # PS1='[\w] % '
-    PS1='$ '
+    PS1="`hostname`$ "
 fi
 
-test -s ~/.alias && . ~/.alias
+test -s $HOME/.bash_aliases && . ~/.bash_aliases