Merge from default mhoward-lt

Sun, 29 Mar 2015 17:53:38 -0400

author
Meredith Howard <mhoward@roomag.org>
date
Sun, 29 Mar 2015 17:53:38 -0400
branch
mhoward-lt
changeset 175
6a6b1f67a46e
parent 172
ff95afc589ea (current diff)
parent 174
d94a247836c8 (diff)
child 834
fc9b092f10f7

Merge from default

.gitconfig file | annotate | diff | comparison | revisions
--- 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"
--- a/.gitconfig
+++ b/.gitconfig
@@ -18,3 +18,7 @@
 
 [branch]
 	autosetuprebase = always
+
+[include]
+	path = ~/.gitconfig.local
+
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
+
--- 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

mercurial