Big ol' backlog of previously uncommitted changes.

9 files changed, 36 insertions, 133 deletions

diff --git a/Makefile b/Makefile
index 09ad410..c1c929f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,3 +2,5 @@
 
 install:
 	./install
+
+.PHONY: install
diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc
index 06f8579..363f061 100644
--- a/dotfiles/.bashrc
+++ b/dotfiles/.bashrc
@@ -51,16 +51,3 @@ fi
 
 alias ls='ls -p --color'
 alias ll='ls -l'
-
-alias guix-dev-env="cd ~/Code/guix; guix environment -e '(@@ (gnu packages package-management) guix-devel)'"
-alias sly-dev-env="cd ~/Code/sly; guix environment -l package.scm"
-
-if vhl
-then
-    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/mpd/mpd.conf b/dotfiles/.config/mpd/mpd.conf
deleted file mode 100644
index 64c42e5..0000000
--- a/dotfiles/.config/mpd/mpd.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-db_file            "~/.config/mpd/database"
-log_file           "~/.config/mpd/log"
-port               "6600"
-music_directory    "~/Music"
-playlist_directory "~/.config/mpd/playlists"
-pid_file           "~/.config/mpd/pid"
-state_file         "~/.config/mpd/state"
-sticker_file       "~/.config/mpd/sticker.sql"
-# autorefresh        "true"
-
-# Audio
-# audio_output {
-#   type  "pulse"
-#   name  "pulse audio"
-# }
-
-audio_output {
-   type  "alsa"
-   name  "alsa"
-}
diff --git a/dotfiles/.emacs.d/init.el b/dotfiles/.emacs.d/init.el
index 822961c..eba9d62 100644
--- a/dotfiles/.emacs.d/init.el
+++ b/dotfiles/.emacs.d/init.el
@@ -1,9 +1,11 @@
-;; Turn off mouse interface early in startup to avoid momentary display
+(require 'cl)
 
 ;; 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.
+(require 'package)
+(add-to-list 'package-archives (cons "melpa-stable" "https://stable.melpa.org/packages/") t)
 (package-initialize)
 
 (if (fboundp 'tool-bar-mode) (tool-bar-mode -1))
@@ -240,7 +242,8 @@ might be bad."
 (when-require 'paredit
   (use-mode-for-lisp paredit-mode))
 
-(when-require 'geiser-install
+(when-require 'geiser
+  (require 'geiser-guile)
   (setf geiser-active-implementations '(guile))
 
   (global-set-key (kbd "C-c s") 'connect-to-guile))
@@ -317,11 +320,14 @@ indentation."
   (interactive)
   (geiser-connect 'guile "localhost" "37147"))
 
+(put 'run-script 'scheme-indent-function 1)
 (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 'sxml-match 'scheme-indent-function 1)
+(put 'substitute-keyword-arguments 'scheme-indent-function 1)
+(put 'modify-phases 'scheme-indent-function 1)
 
 ;;;
 ;;; Ruby
diff --git a/dotfiles/.signature b/dotfiles/.signature
deleted file mode 100644
index fd39ff4..0000000
--- a/dotfiles/.signature
+++ /dev/null
@@ -1 +0,0 @@
-David Thompson
diff --git a/dotfiles/.ssh/config b/dotfiles/.ssh/config
index 9a16ff1..8a7d9fe 100644
--- a/dotfiles/.ssh/config
+++ b/dotfiles/.ssh/config
@@ -14,6 +14,10 @@ Host aigis
      HostName           192.168.1.222
      User               dave
 
+Host takemi
+     HostName dthompson.us
+     User dave
+
 Host vhl
      User               dthompson
      ProxyCommand       ssh dthompson@hydra.vistahl.com -W 7VWJD42.vhl.dom:22
@@ -47,6 +51,18 @@ Host aws-dev
      HostName bastion.dev.vhlcentral.com
      ForwardAgent yes
 
+Host aws-qa
+     HostName bastion.qa.vhlcentral.com
+     ForwardAgent yes
+
+Host aws-store
+     HostName store-bastion.ci.vistahigherlearning.com
+     ForwardAgent yes
+
+Host aws-susa
+     HostName bastion2.santillanausa.com
+     ForwardAgent yes
+
 Host *.dev.vhlcentral.internal
      ProxyCommand ssh aws-dev -W %h:22
      ForwardAgent yes
@@ -61,6 +77,9 @@ Host 10.50.*
 Host 10.30.*
   ProxyCommand ssh aws-prod -W %h:22
 
+Host 10.31.*
+  ProxyCommand ssh aws-susa -W %h:22
+
 Host 10.60.*
   ProxyCommand ssh aws-dev -W %h:22
   ForwardAgent yes
@@ -68,3 +87,10 @@ Host 10.60.*
 Host 10.61.*
   ProxyCommand ssh aws-mumbai-dev -W %h:22
   ForwardAgent yes
+
+Host 10.63.*
+  ProxyCommand ssh aws-qa -W %h:22
+  ForwardAgent yes
+
+Host 10.41.*
+     ProxyCommand ssh aws-store -W %h:22
diff --git a/dotfiles/.xmodmap b/dotfiles/.xmodmap
deleted file mode 100644
index aaec870..0000000
--- a/dotfiles/.xmodmap
+++ /dev/null
@@ -1,9 +0,0 @@
-!
-! Swap Caps_Lock and Control_L
-!
-remove Lock = Caps_Lock
-remove Control = Control_L
-keysym Control_L = Control_L
-keysym Caps_Lock = Control_L
-add Lock = Caps_Lock
-add Control = Control_L
\ No newline at end of file
diff --git a/dotfiles/Mail/.notmuch/hooks/post-new b/dotfiles/Mail/.notmuch/hooks/post-new
deleted file mode 100755
index 72a073b..0000000
--- a/dotfiles/Mail/.notmuch/hooks/post-new
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# Mail that I sent doesn't need to be put in the inbox
-notmuch tag -new -- from:davet@gnu.org OR \
-        from:davet@fsf.org OR \
-        from:dthompson2@worcester.edu OR \
-        from:dthompson@vistahigherlearning.com
-
-# Commit notifications
-notmuch tag -new -unread +commits -- subject:Office-commits \
-        OR from:account for gitolite OR to:www-commits@gnu.org
-
-# Fencepost updates
-notmuch tag -new -unread +fencepost -- from:diffmon@gnu.org
-
-# GNU webmasters
-notmuch tag -new -unread +webmasters -- from:webmasters@gnu.org \
-        OR from:webmasters-comment@gnu.org
-
-# FSF sysadmins
-notmuch tag -new -unread +fsfsys -- from:sysadmin@gnu.org \
-        OR from:sysadmin-comment@gnu.org
-
-# Linode
-notmuch tag -new -unread +linode -- from:billing@linode.com
-
-# Mark spam
-notmuch tag -new -unread +spam -- folder:FSF/INBOX.Spam OR folder:WSU/[Gmail].Spam
-notmuch tag -new -unread +spam -- from:john.pozzi@comcast.net # Do not feed
-
-# Loomio
-notmuch tag  -new -unread +loomio-- from:notifications@loomio.org
-
-# VHL notifications
-notmuch tag -new -unread +nagios -- from:nagios@sybilmarkley.vhl.dom OR \
-        from:nagios@nagios_rs.localdomain OR nagios@nagios-aws.localdomain
-notmuch tag -new -unread +airbrake -- from:donotreply@alerts.airbrake.io
-notmuch tag -new -unread +semaphore -- \
-        from:semaphore+notifications@renderedtext.com \
-        OR from:semaphore@renderedtext.com
-notmuch tag -new -unread +newrelic -- from:noreply@newrelic.com
-notmuch tag -new -unread +rackspace -- from:support@rackspace.com
-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.com
-notmuch tag -new -unread +rollbar -- from:notifier@mail.rollbar.com
-
-# Remaining new mail goes to the inbox
-notmuch tag -new +inbox -- tag:new AND NOT tag:unread
-notmuch tag -new +inbox +unread -- tag:new
-
-# GNU mailing lists
-notmuch tag -inbox +guix -- to:guix-devel@gnu.org OR to:bug-guix@gnu.org
-notmuch tag -inbox +guile -- to:guile-devel@gnu.org OR to:guile-user@gnu.org
-
-# Mark all archived mail
-notmuch tag +archive -- folder:WSU/Archive
-
-# Remove inbox tag from all mail in archive
-notmuch tag -inbox -- tag:archive AND tag:inbox
diff --git a/dotfiles/Mail/.notmuch/hooks/pre-new b/dotfiles/Mail/.notmuch/hooks/pre-new
deleted file mode 100755
index 151dc85..0000000
--- a/dotfiles/Mail/.notmuch/hooks/pre-new
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Delete mail
-#notmuch search --output=files tag:deleted | xargs -rl rm
-
-# Move marked spam to spam folder
-notmuch search --output=files path:FSF/** AND NOT folder:FSF/INBOX.Spam \
-        AND tag:spam | xargs -I '{}' mv '{}' ~/Mail/FSF/INBOX.Spam/cur
-
-# Delete spam after one week
-notmuch tag +deleted -- tag:spam AND date:..one_week
-
-# Delete commits after one month
-notmuch tag +deleted -- tag:commits AND date:..one_month
-
-# Move mail from archive to inbox
-notmuch search --output=files --duplicate=1 NOT tag:archive AND \
-        folder:WSU/Archive \
-    | xargs -I '{}' mv '{}' ~/Mail/WSU/INBOX/cur
-
-# Move mail from inbox to archive
-notmuch search --output=files --duplicate=1 tag:archive AND \
-        NOT folder:WSU/Archive \
-    | xargs -I '{}' mv '{}' ~/Mail/WSU/Archive/cur
-
-exit 0