enabling history cp autojump, etc in plugins and adding tmux et…

…c for http://www.drbunsen.org/the-text-triumvirate/ support

.zshrc

@@ -22,7 +22,7 @@ export CASE_SENSITIVE="true"
 
 # Which plugins would you like to load? (plugins can be found in ~/.dotfiles/oh-my-zsh/plugins/*)
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(brew colorize compleat dirpersist git npm ssh-agent)
+plugins=(colorize compleat dirpersist ssh-agent autojump git gulp history cp)
 
 source $ZSH/oh-my-zsh.sh
 

README.md

@@ -31,7 +31,7 @@ cd ~/.dotfiles;
 
 > Note: running install.sh is idempotent. You can run it again and again as you add new features or software to the scripts! I'll regularly add new configurations so keep an eye on this repo as it grows and optimizes.
 
-# Restoring Dotfiles
+## Restoring Dotfiles
 
 If you have existing dotfiles for configuring git, zsh, vim, etc, these will be backed-up into ~/.dotfiles_backup and replaced with the files from this project. You can restore your original dotfiles by using `./restore.sh`
 
@@ -41,12 +41,16 @@ The creator of this repo is not responsible if your machine ends up in a state y
 
 # Additional
 
-There are a few additional features in this repo:
+# Additional Changes
 
+There are a few additional features in this repo:
 - .crontab: you can `cron ~/.crontab` if you want to add my nightly cron software updates.
 
 > \\[0_0]/ - Note that this may wake you in the morning to compatibility issues so use only if you like being on the edge
 
+- I highly recommend remapping your Caps Lock key to Control per [Dr. Bunsen](http://www.drbunsen.org/remapping-caps-lock/):
+![Remap Caps Lock](https://raw.githubusercontent.com/atomantic/dotfiles/master/img/remap_capslock.png)
+
 # Settings
 This project changes a number of settings and configures software on OSX.
 Here is the current list:

osx.sh

@@ -106,9 +106,6 @@ require_brew ack
 # note, instead, use https://github.com/atomantic/generator-dockerize for dev tooling
 # require_brew boot2docker
 
-require_brew consul
-require_brew consul-template
-
 # dos2unix converts windows newlines to unix newlines
 require_brew dos2unix
 # fortune command--I source this as a better motd :)
@@ -141,6 +138,7 @@ require_brew openconnect
 require_brew ruby
 # better/more recent version of screen
 require_brew homebrew/dupes/screen
+require_brew tmux
 require_brew tree
 require_brew ttyrec
 # better, more recent vim
@@ -149,6 +147,9 @@ require_brew watch
 # Install wget with IRI support
 require_brew wget --enable-iri
 
+require_brew zsh
+chsh -s /usr/local/bin/zsh
+
 # nvm
 require_nvm stable