diff --git a/link/mac/tmux.conf b/link/mac/tmux.conf
index a6488ac..28031b4 100644
--- a/link/mac/tmux.conf
+++ b/link/mac/tmux.conf
@@ -1 +1,8 @@
 source "/usr/local/lib/python2.7/site-packages/powerline/bindings/tmux/powerline.conf"
+
+# Make mouse useful in copy mode
+set -g mouse on
+
+# Scroll History
+set -g history-limit 30000
+
diff --git a/link/nix/zshrc b/link/nix/zshrc
index b855c76..a18d638 100644
--- a/link/nix/zshrc
+++ b/link/nix/zshrc
@@ -54,7 +54,7 @@ COMPLETION_WAITING_DOTS="false"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(brew bundler gem git git-flow gpg-agent history osx python vagrant)
+plugins=(brew bundler gem git git-flow history osx pip python terraform vagrant)
 
 source $ZSH/oh-my-zsh.sh
 
@@ -62,6 +62,11 @@ source $ZSH/oh-my-zsh.sh
 
 [ -f ~/.private-env ] && source ~/.private-env || echo '~/.private-env is missing'
 
+# Start GPG agent
+export GPG_TTY=$(tty)
+gpg-connect-agent /bye
+export SSH_AUTH_SOCK=~/.gnupg/S.gpg-agent.ssh
+
 # export MANPATH="/usr/local/man:$MANPATH"
 
 # Start GPG agent
@@ -89,6 +94,7 @@ export POWERLINE_CONFIG_COMMAND='/usr/local/bin/powerline-config'
 export PATH=$PATH:~/.nexustools
 
 if [[ `uname` == 'Darwin' ]]; then
+  export PATH=$PATH:/usr/local/sbin
   export PATH=$PATH:/Applications/Araxis\ Merge.app/Contents/Utilities
   export PATH="/usr/local/opt/python/libexec/bin:$PATH"
   export PATH=$PATH:/usr/local/opt/node@6/bin
diff --git a/puppet/production/site/profile/manifests/mac.pp b/puppet/production/site/profile/manifests/mac.pp
index 539cb11..3af1297 100644
--- a/puppet/production/site/profile/manifests/mac.pp
+++ b/puppet/production/site/profile/manifests/mac.pp
@@ -36,6 +36,7 @@ class profile::mac {
     'tree',
     'unrar',
     'vagrant-completion',
+    'vim',
     'watch',
     'wget',
     'zsh',