Merge branch 'oops'

link/nix/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
+

link/nix/zshrc

@@ -51,7 +51,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
 
@@ -59,6 +59,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"
 
 # Set personal aliases, overriding those provided by oh-my-zsh libs,

puppet/production/site/profile/manifests/mac.pp

@@ -36,6 +36,7 @@ class profile::mac {
     'tree',
     'unrar',
     'vagrant-completion',
+    'vim',
     'watch',
     'wget',
     'zsh',