Skip to content

Commit

Permalink
Split out .bashrc.
Browse files Browse the repository at this point in the history
This way, I can use `bundle exec bash` and still have all the shell
goodness. (Otherwise, that would be `bundle exec bash -l`.)
  • Loading branch information
matthewtodd committed Feb 15, 2010
1 parent 032cdce commit 84d5728
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 30 deletions.
36 changes: 36 additions & 0 deletions bashrc
@@ -0,0 +1,36 @@
# Use ~/.bashrc for things that you want around in subshells that wouldn't
# otherwise be inherited. So, aliases, completions, and functions.

alias coffee='countdown 5 "The coffee should be ready."'
alias water='countdown 42 "The water should be boiling by now."'

alias ls='ls -Gh'
alias git=hub
alias migrate='rake db:migrate db:test:prepare'
alias rails='generate-rails-app'
alias ri='ri --system'
alias sc='script/console'
alias ss='script/server'
alias v=mvim
alias wip='rake cucumber:wip'

function p {
cd ~/Code/$1; ls
}

function pi {
cd ~/Code/.inactive/$1; ls
}

if [ -f ${HOME}/.homebrew/etc/bash_completion ]; then
. ${HOME}/.homebrew/etc/bash_completion
fi

complete -C "directory-complete ${HOME}/Code" -o default p
complete -C "directory-complete ${HOME}/Code/.inactive" -o default pi
complete -C rake-complete -o default rake
complete -W "ls refresh start stop" downloads

if [ -f ${HOME}/.homebrew/Library/Contributions/brew_bash_completion.sh ]; then
. ${HOME}/.homebrew/Library/Contributions/brew_bash_completion.sh
fi
34 changes: 4 additions & 30 deletions profile
@@ -1,33 +1,12 @@
# vim: set filetype=sh :
alias coffee='countdown 5 "The coffee should be ready."'
alias water='countdown 42 "The water should be boiling by now."'

alias ls='ls -Gh'
alias git=hub
alias migrate='rake db:migrate db:test:prepare'
alias rails='generate-rails-app'
alias ri='ri --system'
alias sc='script/console'
alias ss='script/server'
alias v=mvim
alias wip='rake cucumber:wip'

function p {
cd ~/Code/$1; ls
}

function pi {
cd ~/Code/.inactive/$1; ls
}
# Use ~/.profile for things that can be inherited by subshells. As far as I
# know right now, that just means environment variables.

# histappend and HIST* envars from
# http://blog.macromates.com/2008/working-with-history-in-bash/
shopt -s histappend

if [ -f ${HOME}/.homebrew/etc/bash_completion ]; then
. ${HOME}/.homebrew/etc/bash_completion
fi

export EDITOR=vim
export GEM_OPEN_EDITOR=mvim
export GIT_PS1_SHOWDIRTYSTATE=yes
Expand All @@ -49,11 +28,6 @@ xterm*|rxvt*)
;;
esac

complete -C "directory-complete ${HOME}/Code" -o default p
complete -C "directory-complete ${HOME}/Code/.inactive" -o default pi
complete -C rake-complete -o default rake
complete -W "ls refresh start stop" downloads

if [ -f ${HOME}/.homebrew/Library/Contributions/brew_bash_completion.sh ]; then
. ${HOME}/.homebrew/Library/Contributions/brew_bash_completion.sh
if [ -f ~/.bashrc ]; then
. ~/.bashrc
fi

0 comments on commit 84d5728

Please sign in to comment.