# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1404275118 14400
# Node ID 7d66a2422bbc64cfc1025d50f8965d44aa80e5c9
# Parent  92aa984868e2eee6323e9164697d3824874dabb5# Parent  dadc95ee5fe6e03af538cfac6c7019f36b339535
Merge from default

diff --git a/.bashrc b/.bashrc
new file mode 100644
--- /dev/null
+++ b/.bashrc
@@ -0,0 +1,29 @@
+# .bashrc: executed for non-login shells
+#          probably sourced by .bash_profile though
+
+if [ -f ~/.bashrc.dist ]; then
+  source ~/.bashrc.dist
+fi
+
+export EDITOR=vim
+export PERL_CPANM_OPT='-n --prompt --reinstall'
+
+if [ -d ~/bin ]; then
+  export PATH="$HOME/bin:$PATH"
+fi
+
+if [ -d ~/.plenv ]; then
+  export PATH="$HOME/.plenv/bin:$PATH"
+  eval "$(plenv init -)"
+fi
+
+if [ -d ~/.rbenv ]; then
+  export PATH="$HOME/.rbenv/bin:$PATH"
+  eval "$(rbenv init -)"
+fi
+
+
+if [ -f ~/.bashrc.local ]; then
+  source ~/.bashrc.local
+fi
+
diff --git a/.gitconfig b/.gitconfig
diff --git a/.homedir-setup.rb b/.homedir-setup.rb
new file mode 100755
--- /dev/null
+++ b/.homedir-setup.rb
@@ -0,0 +1,71 @@
+#!/usr/bin/env ruby
+# vim: et sts=2 sw=2 fdm=marker
+
+# we don't yet have rbenv so keep safe for ruby 1.8
+
+if `which git` == ''
+  puts "please install git"
+  exit 1 
+end
+
+
+# just checks and bails after each call
+def do_cmds (*cmds)
+  cmds.each do |cmd|
+    puts "$ #{cmd}"
+    system( cmd ) or exit $?
+  end
+end
+
+
+
+# oh-my-zsh {{{
+  # i have a custom theme and the omz install complains about already
+  # having a directory there.  remove, install, then revert my stuff
+  # out of hg
+
+  if Dir.exists?('.oh-my-zsh/.git')
+    puts "oh-my-zsh already installed"
+  else
+    puts "Installing oh-my-zsh..."
+
+    do_cmds \
+      'git clone git://github.com/robbyrussell/oh-my-zsh.git .oh-my-zsh',
+      'hg stat -dn0 -I .oh-my-zsh/ | xargs -0 hg revert'
+
+  end
+
+# }}}
+
+
+# plenv {{{
+
+  if Dir.exists?('.plenv')
+    puts "plenv already installed"
+  else
+    puts "Installing plenv..."
+
+    do_cmds \
+      'git clone git://github.com/tokuhirom/plenv.git .plenv',
+      'git clone git://github.com/tokuhirom/Perl-Build.git .plenv/plugins/perl-build/'
+
+  end
+
+# }}}
+
+
+# rbenv {{{
+  if Dir.exists?('.rbenv')
+    puts "rbenv already installed"
+  else
+    puts "Installing rbenv..."
+
+    do_cmds \
+      'git clone https://github.com/sstephenson/rbenv.git .rbenv',
+      'git clone https://github.com/sstephenson/ruby-build.git .rbenv/plugins/ruby-build/'
+    
+  end
+# }}}
+
+
+
diff --git a/.oh-my-zsh/custom/themes/mhoward.zsh-theme b/.oh-my-zsh.cust/themes/mhoward.zsh-theme
rename from .oh-my-zsh/custom/themes/mhoward.zsh-theme
rename to .oh-my-zsh.cust/themes/mhoward.zsh-theme
diff --git a/.zshrc b/.zshrc
new file mode 100644
--- /dev/null
+++ b/.zshrc
@@ -0,0 +1,54 @@
+# Path to your oh-my-zsh installation.
+export ZSH=$HOME/.oh-my-zsh
+
+ZSH_THEME="mhoward"
+ZSH_CUSTOM=~/.oh-my-zsh.cust
+
+plugins=( common-aliases mercurial git mosh )
+
+if [ -f ~/.zshrc.local-pre ]; then
+  source ~/.zshrc.local-pre
+fi
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+
+
+source $ZSH/oh-my-zsh.sh
+
+# User configuration
+
+export PATH="$HOME/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games"
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# export LANG=en_US.UTF-8
+
+export EDITOR='vim'
+export PERL_CPANM_OPT='-n --prompt --reinstall'
+
+typeset -U path
+
+if [ -d ~/.plenv ]; then
+  path=( ~/.plenv/bin "$path[@]" )
+  eval "$(plenv init - zsh)"
+fi
+
+if [ -d ~/.rbenv ]; then
+  path=( ~/.rbenv/bin "$path[@]" )
+  eval "$(rbenv init - zsh)"
+fi
+
+
+if [ -f ~/.zshrc.local ]; then
+  source ~/.zshrc.local
+fi
+