# HG changeset patch # User Meredith Howard # Date 1427666018 14400 # Node ID 6a6b1f67a46e577016b4938dc92e0dca2ca74c13 # Parent ff95afc589ead4beb0d9a2e62fd8b6765d9af2da# Parent d94a247836c8c371c30fcc7622efb418c4f9d564 Merge from default diff --git a/.bashrc b/.bashrc --- a/.bashrc +++ b/.bashrc @@ -5,8 +5,7 @@ if [ -f ~/.bashrc.dist ]; then source ~/.bashrc.dist fi -export EDITOR=vim -export PERL_CPANM_OPT='-n --prompt --reinstall' +source ~/.profile.common if [ -d ~/bin ]; then export PATH="$HOME/bin:$PATH" diff --git a/.gitconfig b/.gitconfig --- a/.gitconfig +++ b/.gitconfig @@ -18,3 +18,7 @@ [branch] autosetuprebase = always + +[include] + path = ~/.gitconfig.local + diff --git a/.profile.common b/.profile.common new file mode 100644 --- /dev/null +++ b/.profile.common @@ -0,0 +1,12 @@ +# simple profile stuff that is common to both zsh and bash + +export EDITOR=vim +export PERL_CPANM_OPT='-n --prompt --reinstall' +export DEVEL_REPL_PROFILE='Standard' + +alias hgcd='cd $(hg root)' + +if [ -f ~/.profile.common.local ]; then + source ~/.profile.common.local +fi + diff --git a/.zshrc b/.zshrc --- a/.zshrc +++ b/.zshrc @@ -35,8 +35,7 @@ export PATH="$HOME/bin:/usr/local/bin:/u # export LANG=en_US.UTF-8 -export EDITOR='vim' -export PERL_CPANM_OPT='-n --prompt --reinstall' +source ~/.profile.common typeset -U path @@ -50,8 +49,6 @@ if [ -d ~/.rbenv ]; then eval "$(rbenv init - zsh)" fi -alias hgcd='cd $(hg root)' - if [ -f ~/.zshrc.local ]; then source ~/.zshrc.local fi