Merge pull request #52 from tswicegood/rvm-enhancements
Optimize how RVM is loaded and add RVM auto completion.
diff --git a/aliases/general.aliases.bash b/aliases/general.aliases.bash
index d91fbbb..79bd7aa 100644
--- a/aliases/general.aliases.bash
+++ b/aliases/general.aliases.bash
@@ -17,9 +17,10 @@
alias c='clear'
alias k='clear'
+alias cls='clear'
alias edit="$EDITOR"
-alias page="$PAGER"
+alias pager="$PAGER"
alias q="exit"
@@ -48,22 +49,25 @@
function aliases-help() {
echo "Generic Alias Usage"
echo
- echo " sl = ls"
- echo " ls = ls -G"
- echo " la = ls -AF"
- echo " ll = ls -al"
- echo " l = ls -a"
- echo " c/k = clear"
- echo " .. = cd .."
- echo " ... = cd ../.."
- echo " - = cd -"
- echo " h = history"
- echo " md = mkdir -p"
- echo " rd = rmdir"
- echo " editor = $EDITOR"
- echo " pager = $PAGER"
- echo " piano = pianobar"
- echo " q = exit"
- echo " irc = $IRC_CLIENT"
- echo
+ echo " sl = ls"
+ echo " ls = ls -G"
+ echo " la = ls -AF"
+ echo " ll = ls -al"
+ echo " l = ls -a"
+ echo " c/k/cls = clear"
+ echo " .. = cd .."
+ echo " ... = cd ../.."
+ echo " - = cd -"
+ echo " h = history"
+ echo " md = mkdir -p"
+ echo " rd = rmdir"
+ echo " editor = $EDITOR"
+ echo " pager = $PAGER"
+ echo " piano = pianobar"
+ echo " q = exit"
+ echo " irc = $IRC_CLIENT"
+ echo " md = mkdir -p"
+ echo " rd = rmdir"
+ echo " rb = ruby"
+ echo
}
diff --git a/themes/doubletime/doubletime.theme.bash b/themes/doubletime/doubletime.theme.bash
index c5a8a42..91844f0 100644
--- a/themes/doubletime/doubletime.theme.bash
+++ b/themes/doubletime/doubletime.theme.bash
@@ -37,8 +37,14 @@
history -a
history -c
history -r
+ if [[ -z "$THEME_PROMPT_CLOCK_FORMAT" ]]
+ then
+ clock="\t"
+ else
+ clock=$THEME_PROMPT_CLOCK_FORMAT
+ fi
PS1="
-\t $(scm_char) [\[$THEME_PROMPT_HOST_COLOR\]\u@${THEME_PROMPT_HOST}\[$reset_color\]] $(virtualenv_prompt)\w
+$clock $(scm_char) [\[$THEME_PROMPT_HOST_COLOR\]\u@${THEME_PROMPT_HOST}\[$reset_color\]] $(virtualenv_prompt)\w
$(doubletime_scm_prompt)\[$reset_color\] $ "
PS2='> '
PS4='+ '