Update a ton of files that have sat on my computer forever.

8 files changed, 129 insertions, 77 deletions

diff --git a/dotfiles/.bash_profile b/dotfiles/.bash_profile
index 4d681e6..cfbd21e 100644
--- a/dotfiles/.bash_profile
+++ b/dotfiles/.bash_profile
@@ -15,37 +15,21 @@ export -f vhl
 # Honor per-interactive-shell startup file
 if [ -f ~/.bashrc ]; then . ~/.bashrc; fi
 
-# Only configure the SSH agent if we're not in an SSH session with a
-# forwarded agent.
-if ! [ -n "$SSH_CLIENT" -a -n "$SSH_AUTH_SOCK" ]
-then
-    export SSH_AUTH_SOCK="$HOME/.gnupg/S.gpg-agent.ssh"
-fi
-
 export EDITOR=emacsclient
 
-export GUIX_PROFILE="$HOME/.guix-profile"
-
 if [ -f $HOME/.guix-profile/etc/profile ]
 then
     source $HOME/.guix-profile/etc/profile
 fi
 
-# Guix
-#export GUIX_PACKAGE_PATH="$HOME/Code/guix-custom"
-
-# Extra configuration needed on non-GuixSD systems.
-if ! guixsd
-then
-    export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale"
-fi
-
 # Extra configuration needed for work machine.
 if vhl
 then
-    export PATH="$HOME/.chefdk/gem/ruby/2.1.0/bin:/opt/chefdk/bin:$HOME/.rbenv/bin:$PATH"
+    source /etc/profile.d/rvm.sh
     export GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt
-    eval "$(rbenv init -)"
 fi
 
 export PATH="$HOME/.config/guix/current/bin${PATH:+:}$PATH"
+export AWS_REGION="us-east-1"
+export CFN_ROLE_ARN="arn:aws:iam::097392476160:role/iam-production-CloudformationServiceRole-1OZCORE3R6EZ9"
+export SLACK_TOKEN="xoxp-4376114194-5187822990-220986355462-5cf39430c2189530252249bf9746d480"
diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc
index 2412bed..06f8579 100644
--- a/dotfiles/.bashrc
+++ b/dotfiles/.bashrc
@@ -41,6 +41,14 @@ else
     export PS1='\u@\h \w\$ '
 fi
 
+# Add special decoration when we are in an Okta AWS sub-shell.
+if [ -n "$OKTA_AWS_ROLE" ]
+then
+    export PS1="\u@\h \w [$OKTA_AWS_ROLE]\$ "
+else
+    export PS1='\u@\h \w\$ '
+fi
+
 alias ls='ls -p --color'
 alias ll='ls -l'
 
@@ -49,7 +57,10 @@ alias sly-dev-env="cd ~/Code/sly; guix environment -l package.scm"
 
 if vhl
 then
-    alias rackknife="knife rackspace -c .chef/rack_knife.rb"
     alias chef-env="cd ~/Code/chef-repo; eval $(~/bin/gem-env chef-repo)"
     alias api-env="cd ~/Code/api; eval $(~/bin/gem-env api)"
+    alias knife="bundle exec knife"
+    alias berks="bundle exec berks"
+    alias kitchen="bundle exec kitchen"
+    alias cfer="bundle exec cfer"
 fi
diff --git a/dotfiles/.config/shepherd/init.scm b/dotfiles/.config/shepherd/init.scm
index 5ee7b5f..697ad6d 100644
--- a/dotfiles/.config/shepherd/init.scm
+++ b/dotfiles/.config/shepherd/init.scm
@@ -55,7 +55,9 @@
 that use a specific VERSION of Ruby, whose dependencies are stored in
 GEMSET."
   (let ((gem-home (string-append %home "/.gems/" gemset)))
-    (list (string-append "GEM_PATH=" gem-home)
+    (list "RAILS_ENV=development"
+          "HOME=/home/dthompson"
+          (string-append "GEM_PATH=" gem-home)
           (string-append "GEM_HOME=" gem-home)
           (string-append "PATH=" gem-home "/bin:"
                          (rbenv-bin version) ":"
@@ -80,6 +82,19 @@ Ruby version, and listens on PORT."
              #:environment-variables (ruby-environment ruby-version name))
     #:stop (make-kill-destructor)))
 
+(define (gpg-agent-service name pinentry-program)
+  (make <service>
+    #:provides (list name 'gpg-agent)
+    #:requires '()
+    #:start (make-system-constructor
+             (list "gpg-agent" "--daemon" "--enable-ssh-support"
+                   "--default-cache-ttl=10800" ; cache for 3 hours
+                   "--pinentry-program"
+                   (string-append %home "/.guix-profile/bin/"
+                                  pinentry-program)))
+    #:stop (make-system-destructor
+            '("gpg-connect-agent" "killagent" "/bye"))))
+
 ;; (define-service vhl-tunnel
 ;;   (make <service>
 ;;     #:provides '(vhl-tunnel)
@@ -168,16 +183,8 @@ Ruby version, and listens on PORT."
             (list "xmodmap" (string-append %home "/.xmodmap"))))
 
  ;; GPG/SSH Agent
- (make <service>
-   #:provides '(gpg-agent)
-   #:requires '()
-   #:start (make-system-constructor
-            (list "gpg-agent" "--daemon" "--enable-ssh-support"
-                  "--default-cache-ttl=10800" ; cache for 3 hours
-                  "--pinentry-program"
-                  (string-append %home "/.guix-profile/bin/pinentry-gtk-2")))
-   #:stop (make-system-destructor
-           '("gpg-connect-agent" "killagent" "/bye")))
+ (gpg-agent-service 'gpg-agent-gtk "pinentry-gtk-2")
+ (gpg-agent-service 'gpg-agent-tty "pinentry-tty")
 
  ;; Mail
  (simple-service "davmail") ; for dealing with Exchange at work.
diff --git a/dotfiles/.emacs.d/erc.el b/dotfiles/.emacs.d/erc.el
index 85b4670..5461f15 100644
--- a/dotfiles/.emacs.d/erc.el
+++ b/dotfiles/.emacs.d/erc.el
@@ -1,7 +1,7 @@
 (require 'erc)
 (require 'erc-log)
 (require 'erc-notify)
-(require 'erc-spelling)
+;;(require 'erc-spelling)
 (require 'erc-autoaway)
 (require 'erc-services)
 (require 'notifications)
@@ -64,7 +64,7 @@
 (erc-truncate-mode 1)
 
 ;; enable spell checking
-(erc-spelling-mode 0)
+;;(erc-spelling-mod 0)
 
 ;; utf-8 always and forever
 (setq erc-server-coding-system '(utf-8 . utf-8))
@@ -72,8 +72,7 @@
 ;; Auto-join channels
 (erc-autojoin-mode t)
 (setq erc-autojoin-channels-alist
-      '(("freenode.net" "#guile" "#guix" "#emacs" "#scheme"
-         "#lispgames" "#fsf" "#gnu" "#sly")
+      '(("freenode.net" "#guile" "#guix" "#lispgames" "#librelounge")
         ("slack.com" "#general" "#random" "#ops" "#techeng"
          "#church-of-emacs")))
 
diff --git a/dotfiles/.emacs.d/init.el b/dotfiles/.emacs.d/init.el
index 50222da..6311ecd 100644
--- a/dotfiles/.emacs.d/init.el
+++ b/dotfiles/.emacs.d/init.el
@@ -1,4 +1,11 @@
 ;; Turn off mouse interface early in startup to avoid momentary display
+
+;; Added by Package.el.  This must come before configurations of
+;; installed packages.  Don't delete this line.  If you don't want it,
+;; just comment it out by adding a semicolon to the start of the line.
+;; You may delete these explanatory comments.
+(package-initialize)
+
 (if (fboundp 'tool-bar-mode) (tool-bar-mode -1))
 (if (fboundp 'menu-bar-mode) (menu-bar-mode -1))
 (if (fboundp 'scroll-bar-mode) (scroll-bar-mode -1))
@@ -29,7 +36,7 @@
 (add-to-list 'load-path
              (home-file "/.guix-profile/share/emacs/site-lisp"))
 
-(when-require 'guix-init
+(when-require 'guix-autoloads
   (setf guix-dot-program (concat (getenv "HOME") "/.guix-profile/bin/dot")))
 
 ;;;
@@ -310,36 +317,12 @@ indentation."
   (interactive)
   (geiser-connect 'guile "localhost" "37147"))
 
-(defun connect-to-dmd ()
-  "Connect to dmd's REPL server."
-  (interactive)
-  (geiser-connect 'guile "localhost" "37148"))
-
 (put 'and-let* 'scheme-indent-function 1)
 (put 'syntax-parameterize 'scheme-indent-function 1)
 (put 'with-mutex 'scheme-indent-function 1)
 (put 'test-group 'scheme-indent-function 1)
-(put 'mock 'scheme-indent-function 1)
 (put 'sxml-match 'scheme-indent-function 1)
 
-;; TODO: Move to relevant project's .dir-locals.el
-(put 'colambda 'scheme-indent-function 1)
-(put 'codefine 'scheme-indent-function 1)
-(put 'with-agenda 'scheme-indent-function 1)
-(put 'with-mesh 'scheme-indent-function 1)
-(put 'with-texture 'scheme-indent-function 1)
-(put 'with-shader-program 'scheme-indent-function 1)
-(put 'with-window 'scheme-indent-function 1)
-(put 'bind-key-commands 'scheme-indent-function 2)
-(put 'signal-let 'scheme-indent-function 1)
-(put 'signal-let* 'scheme-indent-function 1)
-(put 'with-framebuffer 'scheme-indent-function 1)
-(put 'with-render-context 'scheme-indent-function 1)
-(put 'with-push-context 'scheme-indent-function 1)
-(put 'with-temp-transform 'scheme-indent-function 2)
-(put 'chain 'scheme-indent-function 1)
-(put 'call-with-input-bytevector 'scheme-indent-function 1)
-
 ;;;
 ;;; Ruby
 ;;;
@@ -482,11 +465,11 @@ the 'inbox' tag."
       smtpmail-stream-type 'starttls)
 
 ;; Work email
-(when (equalp system-name "7VWJD42")
-  (setf send-mail-function 'smtpmail-send-it
-        smtpmail-smtp-server "EXCHANGE02.vhl.dom"
-        smtpmail-smtp-service 587
-        smtpmail-stream-type 'starttls))
+;; (when (equalp system-name "7VWJD42")
+;;   (setf send-mail-function 'smtpmail-send-it
+;;         smtpmail-smtp-server "EXCHANGE02.vhl.dom"
+;;         smtpmail-smtp-service 587
+;;         smtpmail-stream-type 'starttls))
 
 ;;;
 ;;; Calendar
@@ -521,6 +504,13 @@ the 'inbox' tag."
   (global-set-key (kbd "C-c e b") 'emms-browser))
 
 ;;;
+;;; GPG
+;;;
+
+(setf epg-gpg-program "gpg")
+(setf epa-pinentry-mode 'loopback)
+
+;;;
 ;;; Other
 ;;;
 
diff --git a/dotfiles/.screenrc b/dotfiles/.screenrc
index fd40886..2edf6f7 100644
--- a/dotfiles/.screenrc
+++ b/dotfiles/.screenrc
@@ -1,3 +1,5 @@
+defshell -bash
+
 # Large scrollback buffer
 defscrollback 8192
 
diff --git a/dotfiles/.ssh/config b/dotfiles/.ssh/config
index 5e21539..cfd9282 100644
--- a/dotfiles/.ssh/config
+++ b/dotfiles/.ssh/config
@@ -1,10 +1,10 @@
-Host cygnus
-  HostName 54.84.181.152
-  User dthompson
-  Port 667
+# Host cygnus
+#   HostName 54.84.181.152
+#   User dthompson
+#   Port 667
 
-Host 172.*
-  ProxyCommand ssh cygnus -W %h:667
+# Host 172.*
+#   ProxyCommand ssh cygnus -W %h:667
 
 Host dthompson
      HostName           dthompson.us
@@ -25,12 +25,71 @@ Host vhltunnel
      ForwardAgent       yes
 
 Host chef
-     HostName           192.168.1.172
-     User               root
-     ForwardAgent       yes
+     HostName           10.0.249.202
+     User               ubuntu
 
 Host gitlab.vhlcentral.com
-  ProxyCommand ssh hydra -W 38.88.209.21:22
+     ProxyCommand ssh hydra -W 38.88.209.21:22
 
 Host 10.0.*
     ServerAliveInterval 60
+
+Host calypso
+     HostName           10.30.250.42
+     ProxyCommand ssh aws-prod -W %h:22
+
+Host berkshelf
+     HostName 10.0.250.212
+     User     ubuntu
+
+Host aws-prod
+     HostName virginia-bastion.maestro.vhlcentral.com
+     ForwardAgent yes
+
+Host aws-staging
+     HostName bastion.ms.vhlcentral.com
+     ForwardAgent yes
+
+Host aws-dev
+     HostName bastion.dev.vhlcentral.com
+     ForwardAgent yes
+
+Host aws-mumbai-dev
+     HostName mumbai-bastion.dev.vhlcentral.com
+     ForwardAgent yes
+
+Host aws-dev
+     HostName bastion.dev.vhlcentral.com
+     ForwardAgent yes
+
+Host *.dev.vhlcentral.internal
+     ProxyCommand ssh aws-dev -W %h:22
+     ForwardAgent yes
+
+Host *.production.vhlcentral.internal
+  ProxyCommand ssh aws-prod -W %h:22
+  ForwardAgent yes
+
+Host 10.50.*
+     ProxyCommand ssh aws-staging -W %h:22
+
+Host 10.30.*
+  ProxyCommand ssh aws-prod -W %h:22
+
+Host 10.60.*
+  ProxyCommand ssh aws-dev -W %h:22
+  ForwardAgent yes
+
+Host 10.61.*
+  ProxyCommand ssh aws-mumbai-dev -W %h:22
+  ForwardAgent yes
+
+Host ldap-production
+     HostName 10.30.14.1
+     ProxyCommand ssh bastion16.maestro.vhlcentral.com -W %h:22
+
+Host bastion-recovery
+     HostName 10.30.51.105
+     User ubuntu
+     ProxyCommand ssh aws-prod -W %h:22
+     IdentityFile /home/dthompson/.ssh/aws
diff --git a/dotfiles/Mail/.notmuch/hooks/post-new b/dotfiles/Mail/.notmuch/hooks/post-new
index b0f5fbd..72a073b 100755
--- a/dotfiles/Mail/.notmuch/hooks/post-new
+++ b/dotfiles/Mail/.notmuch/hooks/post-new
@@ -44,7 +44,7 @@ notmuch tag -new -unread +vividcortex -- from:notifications@vividcortex.com
 notmuch tag -new -unread +aws -- from:no-reply@sns.amazonaws.com
 notmuch tag -new -unread +papertrail -- from:support@papertrailapp.com
 notmuch tag -new -unread +codeclimate -- from:hello@codeclimate.com
-notmuch tag -new -unread +basecamp -- from:notifications@basecamp.comn
+notmuch tag -new -unread +basecamp -- from:notifications@basecamp.com
 notmuch tag -new -unread +rollbar -- from:notifier@mail.rollbar.com
 
 # Remaining new mail goes to the inbox