summary refs log tree commit diff
path: root/bashrc
diff options
context:
space:
mode:
Diffstat (limited to 'bashrc')
-rwxr-xr-xbashrc12
1 files changed, 2 insertions, 10 deletions
diff --git a/bashrc b/bashrc
index 85038ec..ee36ce2 100755
--- a/bashrc
+++ b/bashrc
@@ -1,4 +1,4 @@
-export EDITOR="emacsclient -a ''"
+export EDITOR="vim"
 export HISTFILE=
 export LANG="en_US.UTF-8"
 export LC_ALL="$LANG"
@@ -9,13 +9,8 @@ export GOPATH="${HOME}/gocode"
 
 [ -z "$PS1" ] && return
 
-[ "${BASH_VERSINFO}" -gt 3 ] && shopt -s autocd
-
 # prompts
-export PS1="\W % "
-
-alias e="$EDITOR"
-alias et="emacsclient -nw"
+export PS1="\h:\w % "
 
 alias cp="cp -i"
 alias l="ls"
@@ -54,6 +49,3 @@ __add_to_path_if_exists "${HOME}/src/source/dist"
 __add_to_path_if_exists "/opt/twitter/opt/go/libexec/bin"
 __add_to_path_if_exists "/opt/twitter/bin"
 __source_file_if_exists "/opt/twitter/rvm/scripts/rvm"
-
-DOTFILES_DIR=$(dirname $(realpath $BASH_SOURCE))
-__add_to_path_if_exists "${DOTFILES_DIR}/bin"