diff --git a/bashrc b/bashrc index d76565f..f41d142 100644 --- a/bashrc +++ b/bashrc @@ -14,6 +14,9 @@ fi # Source custom libs if [ -d $HOME/.bash/libs ]; then for lib in $(ls $HOME/.bash/libs/*.bash); do source $lib; done; fi +# Source rc.d/* +if [ -d $HOME/.bash/rc.d ]; then for file in $(ls $HOME/.bash/rc.d/*); do source $file; done; fi + # Source alias definitions if [ -f $HOME/.bash_aliases ]; then source $HOME/.bash_aliases; fi if [ -f $HOME/.bash/aliases ]; then source $HOME/.bash/aliases; fi @@ -28,38 +31,3 @@ if [ -f $HOME/.bash/completion ]; then source $HOME/.bash/completion; fi if [ -d $HOME/.bash/completion ]; then for file in $(ls $HOME/.bash/completion/*); do source $file; done; fi if [ -d $HOME/.bash/completion.d ]; then for file in $(ls $HOME/.bash/completion.d/*); do source $file; done; fi -# Customize the prompt -if [ "$UID" -eq 0 ]; then - export PS1='\[\e[01;31m\]\u@\h\[\e[01;34m\] \w \$\[\e[0m\] ' -else - export PS1='\[\e[01;32m\]\u@\h\[\e[01;34m\] \w \$\[\e[0m\] ' -fi - -smiley() { - ret_val=$? - if [ "$ret_val" = "0" ] - then - echo -e "\e[01;32m:)\e[0m" - else - echo -e "\e[01;31m:(\e[0m" - fi -} - -#export PS1='\[\e[01;32m\]\u@\h\[\e[01;34m\] \w \$\[\e[0m\] '"\$(smiley) " - -# Enable colors for ls, etc. Prefer ~/.dir_colors #64489 -if [[ -f ~/.dir_colors ]]; then - eval `dircolors -b ~/.dir_colors` -elif [[ -f /etc/DIR_COLORS ]]; then - eval `dircolors -b /etc/DIR_COLORS` -fi - -# Change the window title of X terminals -case $TERM in - xterm*|rxvt*|urxvt*|Eterm) - PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\007"' - ;; - screen*) - PROMPT_COMMAND='echo -ne "\033k${USER}@${HOSTNAME%%.*}\033\\"' - ;; -esac diff --git a/rc.d/colors b/rc.d/colors new file mode 100644 index 0000000..5d5fa7d --- /dev/null +++ b/rc.d/colors @@ -0,0 +1,8 @@ +#!/bin/bash + +# Enable colors for ls, etc. Prefer ~/.dir_colors #64489 +if [[ -f ~/.dir_colors ]]; then + eval `dircolors -b ~/.dir_colors` +elif [[ -f /etc/DIR_COLORS ]]; then + eval `dircolors -b /etc/DIR_COLORS` +fi diff --git a/rc.d/prompt b/rc.d/prompt new file mode 100644 index 0000000..1de8e77 --- /dev/null +++ b/rc.d/prompt @@ -0,0 +1,21 @@ +#!/bin/bash + +# Customize the prompt +if [ "$UID" -eq 0 ]; then + export PS1='\[\e[01;31m\]\u@\h\[\e[01;34m\] \w \$\[\e[0m\] ' +else + export PS1='\[\e[01;32m\]\u@\h\[\e[01;34m\] \w \$\[\e[0m\] ' +fi + +# Add a smiley at end of prompt showing last command status code +#smiley() { +# ret_val=$? +# if [ "$ret_val" = "0" ] +# then +# echo -e "\e[01;32m:)\e[0m" +# else +# echo -e "\e[01;31m:(\e[0m" +# fi +#} +#export PS1='\[\e[01;32m\]\u@\h\[\e[01;34m\] \w \$\[\e[0m\] '"\$(smiley) " + diff --git a/rc.d/rvm b/rc.d/rvm new file mode 100644 index 0000000..40cb341 --- /dev/null +++ b/rc.d/rvm @@ -0,0 +1,10 @@ +#!/bin/bash + +# Load RVM into a shell session *as a function* +[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" + +# Add RVM to PATH for scripting +PATH=$PATH:$HOME/.rvm/bin + +# Source bash completion for RVM +[[ -r "$HOME/.rvm/scripts/completion" ]] && source "$HOME/.rvm/scripts/completion" diff --git a/rc.d/termtitle b/rc.d/termtitle new file mode 100644 index 0000000..d6c6581 --- /dev/null +++ b/rc.d/termtitle @@ -0,0 +1,11 @@ +#!/bin/bash + +# Change the window title of X terminals +case $TERM in + xterm*|rxvt*|urxvt*|Eterm) + PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\007"' + ;; + screen*) + PROMPT_COMMAND='echo -ne "\033k${USER}@${HOSTNAME%%.*}\033\\"' + ;; +esac