190 files changed, 41 insertions, 302 deletions
diff --git a/configs/shared/.emacs.d/tramp b/configs/shared/.emacs.d/tramp
deleted file mode 100644
index d924501ed19b..000000000000
--- a/configs/shared/.emacs.d/tramp
+++ /dev/null
@@ -1,27 +0,0 @@
-;; -*- emacs-lisp -*- <19/12/10 12:42:49 /home/wpcarro/.emacs.d/tramp>
-;; Tramp connection history.  Don't change this file.
-;; You can delete it, forcing Tramp to reapply the checks.
-
-(((tramp-file-name "ssh" "wpcarro" nil "desktop" nil nil nil)
-  ("uname" "Linux 5.2.17-1rodete3-amd64")
-  ("locale" "LC_ALL=en_US.utf8")
-  ("test" "test")
-  ("remote-path"
-   ("/bin" "/usr/bin" "/sbin" "/usr/sbin" "/usr/local/bin" "/usr/local/sbin"))
-  ("remote-shell" "/bin/sh")
-  ("file-exists" "test -e")
-  ("case-insensitive" nil)
-  ("ls" "/bin/ls --color=never")
-  ("ls-quoting-style" t)
-  ("ls-dired" t)
-  ("stat" "env QUOTING_STYLE=locale \\stat")
-  ("id" "/bin/id")
-  ("gid-integer" 89939)
-  ("readlink" "\\readlink")
-  ("gid-string" "primarygroup")
-  ("perl-file-spec" t)
-  ("perl-cwd-realpath" t)
-  ("perl" "\\perl")
-  ("bzr" nil)
-  ("git" "\\git")
-  ("hg" "\\hg")))
diff --git a/configs/shared/.emacs.d/wpc/google-stuff.el b/configs/shared/.emacs.d/wpc/google-stuff.el
deleted file mode 100644
index 96c80565965a..000000000000
--- a/configs/shared/.emacs.d/wpc/google-stuff.el
+++ /dev/null
@@ -1,215 +0,0 @@
-;;; google-stuff.el --- Working with Google infrastructure from Emacs -*- lexical-binding: t -*-
-;; Author: William Carroll <wpcarro@gmail.com>
-
-;;; Commentary:
-
-;; First, I must opine.  Feel free to skip this section.  In general, it seems
-;; that the typical programmer's workflow suffer from what economists call
-;; "inelastic demand".  This means that any increase in the price of something
-;; plummets the demand.  Another way of saying this is that programmers are
-;; "price sensitive" when it comes to adopting new workflows.
-;;
-;; For us, any deviation from our "established" workflow feels costly.  This
-;; makes sense to me because programming is already mentally taxing, so any
-;; additional taxation can sometimes feel unbearable.  Until programming changes
-;; dramatically and we relieve our dependence on files and text for modeling
-;; complex applications, this price sensitivity will most likely remain the
-;; status quo.  Therefore, it's critical to reduce the price of experimenting
-;; with new tools such that new, superior workflows may emerge.  In this vain,
-;; this module attempts to surface "luxury tools" (i.e. dependency pruners, code
-;; linters, code formatters) via Emacs to reduce the price of experimenting with
-;; them.
-
-;;; Code:
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Dependencies
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(require 'f)
-(require 'ivy-helpers)
-(require 'maybe)
-(require 'device)
-(require 'macros)
-(require 'general)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Library
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; TODO: Ensure a consistent and deliberate usage of `defvar', `defconst', and
-;; `defcustom' across all Elisp modules.
-(defcustom google-stuff/install-kbds? t
-  "When t, install the keybindings defined herein.")
-
-;; Definitions as explained by the highly knowledgeable Matthew (i.e. mjo@)
-(defconst google-stuff/definitions
-  '(
-    ;; command-line tools
-    ("gcert"  . "Requests a CorpSSH certificate.")
-    ("glogin" . "SSO (i.e. Single Sign-On) cookie.")
-    ("googlenetworkaccess" . "Device certificate that gives users a certificate
-to access to the Google corp network.")
-    ("prodaccess" . "Sets up a LOAS session on Goobuntu.")
-    ;; general wtfs
-    ("LOAS" . "Distributed authentication service used by jobs in production and
-corp to authenticate each other. It's more efficient than SSL and works with
-Stubby.")
-    ))
-
-(defconst google-stuff/tools
-  '(("Depana" . "depana")
-    ("Build cleaner" . "build_cleaner")
-    ("Java formatter" . "google-java-format")
-    ("Proto formatter" . "clang-format"))
-  "Mapping of names of tools to the names of the executables that run them.")
-
-(use-package protobuf-mode
-  :config
-  (macros/support-file-extension "pb" protobuf-mode))
-
-;; TODO: Straighten out fig, citc, google3 and have modules for each.
-
-;; TODO: Move this to a google3.el module.
-(defconst google-stuff/root
-  "/google/src/cloud/wpcarro"
-  "The root directory to access google3.")
-
-;; TODO: Find a fast way to generate this.
-(defconst google-stuff/citc-clients
-  '("auto-consult"
-    "ac-skeleton")
-  "A list of my active CitC clients.")
-
-
-;; TODO: Can this be sourced from ~/.g4d?
-(defconst google-stuff/citc-aliases
-  '(("google3" . "/google3")
-    ("escalations" . "/google3/corp/gtech/pto/tda/beacons_extension")
-    ("spewall_fe" . "/google3/alkali/apps/speakeasydashboard")
-    ("spewall_be" . "/google3/java/com/google/alkali/applications/speakeasydashboard")
-    ("spewall_protos" . "/google3/google/internal/alkali/applications/speakeasydashboard")
-    ("spewall_tests" . "/google3/javatests/com/google/alkali/applications/speakeasydashboard")
-    ("gti" . "/google3/experimental/engedu/gti/projects/week20190422/mtv/Team10")
-    ("authwf" . "/google3/customer_support/automation/workflow")
-    ("redwood" . "/google3/customer_support/kms/redwood/ui")
-    ("wf-fe" . "/google3/customer_support/kms/redwood/ui/client/components/item/workflow_editor")
-    ("ac (alkali)" . "/google3/google/internal/alkali/applications/casesconsultservice")
-    ("ac-server" . "/google3/java/com/google/alkali/applications/casesconsultservice/server/")
-    ("ac-server (tests)" . "/google3/javatests/com/google/alkali/applications/casesconsultservice/server/"))
-  "Mapping of a label to commonly visited locations in Google3.")
-
-
-(defvar google-stuff/active-citc-client nil
-  "Currently active CitC client.")
-
-(defun google-stuff/depot-prefix ()
-  "Return the current prefix for //depot/google3."
-  (string/format "/google/src/cloud/wpcarro/%s/google3/"
-                 google-stuff/active-citc-client))
-
-(defun google-stuff/cs-url ()
-  "Return the code-search URL for the current buffer and line number."
-  (string/format "cs.corp.google.com/piper///depot/google3/%s?l=%s"
-                 (s-chop-prefix
-                  (google-stuff/depot-prefix)
-                  (buffer-file-name))
-                 (line-number-at-pos)))
-
-(defun google-stuff/copy-cs-url ()
-  "Copy the current file and line-position to the system clipboard."
-  (interactive)
-  (clipboard/copy (google-stuff/cs-url)))
-
-(defun google-stuff/open-buffer-in-cs ()
-  "Open the current file in Google's CodeSearch."
-  (interactive)
-  (shell-command
-   (string/format "google-chrome '%s'"
-                  (google-stuff/cs-url)
-                  (line-number-at-pos))))
-
-;; TODO: As a naming convention, should I prefer ivy or select? Or counsel?
-(defun google-stuff/select-citc-client ()
-  "Set `google-stuff/active-citc-client' with counsel."
-  (interactive)
-  (setq google-stuff/active-citc-client
-        (ivy-read "CitC Client: " google-stuff/citc-clients)))
-
-(defun google-stuff/remote-buffer? ()
-  "Return t if buffer is one accessed via Tramp."
-  (with-current-buffer (current-buffer)
-    (if (file-remote-p default-directory)
-        t
-      nil)))
-
-(defun google-stuff/jump-to-citc-alias ()
-  "Use `find-file' to open an alias registered in `google-stuff/citc-aliases'.
-When on a corporate laptop, remote connections are made using Tramp."
-  (interactive)
-  (when (maybe/nil? google-stuff/active-citc-client)
-    (call-interactively #'google-stuff/select-citc-client))
-  (ivy-helpers/kv
-   "Jump to CitC Alias: "
-   google-stuff/citc-aliases
-   (lambda (k v)
-     (->> v
-          ;; If I don't remove the leading slash, `f-join' won't return a valid
-          ;; path.
-          (s-chop-prefix "/")
-          (f-join google-stuff/root
-                  google-stuff/active-citc-client)
-          (s-prepend (if (device/work-laptop?) "/ssh:wpcarro@desktop:" ""))
-          find-file))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Stuff I learned reading go/emacs
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; Fig
-;; TODO: Make sure there are Evil-compatible KBDs for `fig-status'.
-;; (require 'google-fig)
-
-;; This allows `find-file' handle "//depot/google3/devtools/editors/".
-(require 'p4-files)
-(p4-enable-file-name-handler)
-
-;; Blaze Support
-;; - `google3-compile-current-file' is an excellent command!
-
-;; google3-eglot (uses CiderLSP)
-;; TODO: Make sure the functionality is supported as advertised:
-;; - auto-completion
-;; - eglot-help-at-point for documentation.
-;; - goto-definition
-;; - `eglot-code-actions' fixits
-;; - `eglot-rename' refactoring
-(require 'google3-eglot)
-(google3-eglot-setup)
-
-;; CodeSearch
-;; TODO: Debug why this depends on google-piper and why I don't have that on my
-;; desktop.
-;; (require 'ivy-cs)
-
-;; Auto completion
-;; TODO: Is the part of or separate from google3-eglot?  Because google3-eglot
-;; advertises auto-completion support.
-(require 'google3-build-capf)
-(google3-build-capf-enable-completions)
-(add-to-list 'company-backends #'company-capf)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Keybindings
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(when google-stuff/install-kbds?
-  (general-define-key
-   :prefix "<SPC>"
-   :states '(normal)
-   "Gs" #'fig-status
-   "Cs" #'google-stuff/open-buffer-in-cs
-   "jc" #'google-stuff/jump-to-citc-alias))
-
-(provide 'google-stuff)
-;;; google-stuff.el ends here
diff --git a/configs/shared/.emacs.d/wpc/sre.el b/configs/shared/.emacs.d/wpc/sre.el
deleted file mode 100644
index 1c8f6ddd9a44..000000000000
--- a/configs/shared/.emacs.d/wpc/sre.el
+++ /dev/null
@@ -1,26 +0,0 @@
-;;; sre.el --- Site Reliability Engineering stuffs -*- lexical-binding: t -*-
-;; Author: William Carroll <wpcarro@gmail.com>
-
-;;; Commentary:
-;; Storing some data that might be helpful in my ladder switch attempt.
-
-;;; Code:
-
-(defvar sre/introduction-email
-  "Hello!
-
-My name is William Carroll. I'm currently attempting a ladder switch. I have my
-manager's approval to look for a new role because we believe I have been hired
-for the wrong position.
-
-I'm eager to move ahead if there are any SRE openings in LON that fit my
-profile. I'm happy to share more information with you about my background and
-what I'm looking for. I've been attending the SRE Ops Review meetings in 6PS
-weekly for awhile now, so we should be in the same office every Tuesday if
-meeting in person is easier for you.
-
-Let me know!"
-  "Boilerplate email for reaching out to SRE hiring managers.")
-
-(provide 'sre)
-;;; sre.el ends here
diff --git a/configs/shared/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 68401d48db06..0351eceddeec 100644
--- a/configs/shared/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -1,4 +1,4 @@
-(require 'wpc-package "~/.emacs.d/wpc/packages/wpc-package.el")
+(require 'wpc-package)
 
 ;; load order is intentional
 (require 'constants)
@@ -28,8 +28,10 @@
 ;; TODO: Consider renaming entr.el.
 (require 'entr)
 (require 'scrot)
+
 ;; TODO: Remove path once published to MELPA.
-(require 'egg-timer "~/programming/egg-timer.el/egg-timer.el")
+;; TODO: How can I package this using Nix?
+;; (require 'egg-timer "~/programming/egg-timer.el/egg-timer.el")
 
 ;; TODO: Reconcile kbd.el, keybindings.el, wpc-keybindings.el, keyboard.el.
 (require 'keybindings)
diff --git a/configs/shared/.emacs.d/opam-user-setup.el b/emacs/.emacs.d/opam-user-setup.el
index a23addefafe4..a23addefafe4 100644
--- a/configs/shared/.emacs.d/opam-user-setup.el
+++ b/emacs/.emacs.d/opam-user-setup.el
diff --git a/configs/shared/.emacs.d/snippets/c-mode/.yas-parents b/emacs/.emacs.d/snippets/c-mode/.yas-parents
index d58dacb7a0b1..d58dacb7a0b1 100644
--- a/configs/shared/.emacs.d/snippets/c-mode/.yas-parents
+++ b/emacs/.emacs.d/snippets/c-mode/.yas-parents
diff --git a/configs/shared/.emacs.d/snippets/c-mode/stdio b/emacs/.emacs.d/snippets/c-mode/stdio
index 52bc717e470e..52bc717e470e 100644
--- a/configs/shared/.emacs.d/snippets/c-mode/stdio
+++ b/emacs/.emacs.d/snippets/c-mode/stdio
diff --git a/configs/shared/.emacs.d/snippets/c-mode/stdlib b/emacs/.emacs.d/snippets/c-mode/stdlib
index 5d44e8ed7989..5d44e8ed7989 100644
--- a/configs/shared/.emacs.d/snippets/c-mode/stdlib
+++ b/emacs/.emacs.d/snippets/c-mode/stdlib
diff --git a/configs/shared/.emacs.d/snippets/c-mode/struct b/emacs/.emacs.d/snippets/c-mode/struct
index 6e9282f83c79..6e9282f83c79 100644
--- a/configs/shared/.emacs.d/snippets/c-mode/struct
+++ b/emacs/.emacs.d/snippets/c-mode/struct
diff --git a/configs/shared/.emacs.d/snippets/emacs-lisp-mode/.yas-parents b/emacs/.emacs.d/snippets/emacs-lisp-mode/.yas-parents
index d58dacb7a0b1..d58dacb7a0b1 100644
--- a/configs/shared/.emacs.d/snippets/emacs-lisp-mode/.yas-parents
+++ b/emacs/.emacs.d/snippets/emacs-lisp-mode/.yas-parents
diff --git a/configs/shared/.emacs.d/snippets/emacs-lisp-mode/elisp-module-docs b/emacs/.emacs.d/snippets/emacs-lisp-mode/elisp-module-docs
index 8ea7b8f07724..8ea7b8f07724 100644
--- a/configs/shared/.emacs.d/snippets/emacs-lisp-mode/elisp-module-docs
+++ b/emacs/.emacs.d/snippets/emacs-lisp-mode/elisp-module-docs
diff --git a/configs/shared/.emacs.d/snippets/emacs-lisp-mode/function b/emacs/.emacs.d/snippets/emacs-lisp-mode/function
index bfa888d5265d..bfa888d5265d 100644
--- a/configs/shared/.emacs.d/snippets/emacs-lisp-mode/function
+++ b/emacs/.emacs.d/snippets/emacs-lisp-mode/function
diff --git a/configs/shared/.emacs.d/snippets/emacs-lisp-mode/generic-header b/emacs/.emacs.d/snippets/emacs-lisp-mode/generic-header
index bf6e525f8c65..bf6e525f8c65 100644
--- a/configs/shared/.emacs.d/snippets/emacs-lisp-mode/generic-header
+++ b/emacs/.emacs.d/snippets/emacs-lisp-mode/generic-header
diff --git a/configs/shared/.emacs.d/snippets/emacs-lisp-mode/library-header b/emacs/.emacs.d/snippets/emacs-lisp-mode/library-header
index 0f0ad5c4fc4e..0f0ad5c4fc4e 100644
--- a/configs/shared/.emacs.d/snippets/emacs-lisp-mode/library-header
+++ b/emacs/.emacs.d/snippets/emacs-lisp-mode/library-header
diff --git a/configs/shared/.emacs.d/snippets/emacs-lisp-mode/provide-footer b/emacs/.emacs.d/snippets/emacs-lisp-mode/provide-footer
index 2a0bcc33f7bb..2a0bcc33f7bb 100644
--- a/configs/shared/.emacs.d/snippets/emacs-lisp-mode/provide-footer
+++ b/emacs/.emacs.d/snippets/emacs-lisp-mode/provide-footer
diff --git a/configs/shared/.emacs.d/snippets/haskell-mode/.yas-parents b/emacs/.emacs.d/snippets/haskell-mode/.yas-parents
index d58dacb7a0b1..d58dacb7a0b1 100644
--- a/configs/shared/.emacs.d/snippets/haskell-mode/.yas-parents
+++ b/emacs/.emacs.d/snippets/haskell-mode/.yas-parents
diff --git a/configs/shared/.emacs.d/snippets/haskell-mode/derive-safe-copy b/emacs/.emacs.d/snippets/haskell-mode/derive-safe-copy
index 95f7d9deecd0..95f7d9deecd0 100644
--- a/configs/shared/.emacs.d/snippets/haskell-mode/derive-safe-copy
+++ b/emacs/.emacs.d/snippets/haskell-mode/derive-safe-copy
diff --git a/configs/shared/.emacs.d/snippets/haskell-mode/import-qualified b/emacs/.emacs.d/snippets/haskell-mode/import-qualified
index 4c4db62a8a47..4c4db62a8a47 100644
--- a/configs/shared/.emacs.d/snippets/haskell-mode/import-qualified
+++ b/emacs/.emacs.d/snippets/haskell-mode/import-qualified
diff --git a/configs/shared/.emacs.d/snippets/haskell-mode/instance-defn b/emacs/.emacs.d/snippets/haskell-mode/instance-defn
index 10d194ce41f0..10d194ce41f0 100644
--- a/configs/shared/.emacs.d/snippets/haskell-mode/instance-defn
+++ b/emacs/.emacs.d/snippets/haskell-mode/instance-defn
diff --git a/configs/shared/.emacs.d/snippets/haskell-mode/language-extension b/emacs/.emacs.d/snippets/haskell-mode/language-extension
index 9d6084acb40d..9d6084acb40d 100644
--- a/configs/shared/.emacs.d/snippets/haskell-mode/language-extension
+++ b/emacs/.emacs.d/snippets/haskell-mode/language-extension
diff --git a/configs/shared/.emacs.d/snippets/haskell-mode/separator b/emacs/.emacs.d/snippets/haskell-mode/separator
index 1ab0d762b611..1ab0d762b611 100644
--- a/configs/shared/.emacs.d/snippets/haskell-mode/separator
+++ b/emacs/.emacs.d/snippets/haskell-mode/separator
diff --git a/configs/shared/.emacs.d/snippets/haskell-mode/undefined b/emacs/.emacs.d/snippets/haskell-mode/undefined
index 7609f801f278..7609f801f278 100644
--- a/configs/shared/.emacs.d/snippets/haskell-mode/undefined
+++ b/emacs/.emacs.d/snippets/haskell-mode/undefined
diff --git a/configs/shared/.emacs.d/snippets/html-mode/.yas-parents b/emacs/.emacs.d/snippets/html-mode/.yas-parents
index d58dacb7a0b1..d58dacb7a0b1 100644
--- a/configs/shared/.emacs.d/snippets/html-mode/.yas-parents
+++ b/emacs/.emacs.d/snippets/html-mode/.yas-parents
diff --git a/configs/shared/.emacs.d/snippets/html-mode/index-boilerplate b/emacs/.emacs.d/snippets/html-mode/index-boilerplate
index 3cea6ce003ba..3cea6ce003ba 100644
--- a/configs/shared/.emacs.d/snippets/html-mode/index-boilerplate
+++ b/emacs/.emacs.d/snippets/html-mode/index-boilerplate
diff --git a/configs/shared/.emacs.d/snippets/java-mode/.yas-parents b/emacs/.emacs.d/snippets/java-mode/.yas-parents
index d58dacb7a0b1..d58dacb7a0b1 100644
--- a/configs/shared/.emacs.d/snippets/java-mode/.yas-parents
+++ b/emacs/.emacs.d/snippets/java-mode/.yas-parents
diff --git a/configs/shared/.emacs.d/snippets/java-mode/public-static-void-main b/emacs/.emacs.d/snippets/java-mode/public-static-void-main
index 1839a27eb5c0..1839a27eb5c0 100644
--- a/configs/shared/.emacs.d/snippets/java-mode/public-static-void-main
+++ b/emacs/.emacs.d/snippets/java-mode/public-static-void-main
diff --git a/configs/shared/.emacs.d/snippets/lisp-mode/.yas-parents b/emacs/.emacs.d/snippets/lisp-mode/.yas-parents
index d58dacb7a0b1..d58dacb7a0b1 100644
--- a/configs/shared/.emacs.d/snippets/lisp-mode/.yas-parents
+++ b/emacs/.emacs.d/snippets/lisp-mode/.yas-parents
diff --git a/configs/shared/.emacs.d/snippets/lisp-mode/defpackage b/emacs/.emacs.d/snippets/lisp-mode/defpackage
index 7f110a9718e4..7f110a9718e4 100644
--- a/configs/shared/.emacs.d/snippets/lisp-mode/defpackage
+++ b/emacs/.emacs.d/snippets/lisp-mode/defpackage
diff --git a/configs/shared/.emacs.d/snippets/lisp-mode/function b/emacs/.emacs.d/snippets/lisp-mode/function
index b1769cd3d102..b1769cd3d102 100644
--- a/configs/shared/.emacs.d/snippets/lisp-mode/function
+++ b/emacs/.emacs.d/snippets/lisp-mode/function
diff --git a/configs/shared/.emacs.d/snippets/lisp-mode/typed-function b/emacs/.emacs.d/snippets/lisp-mode/typed-function
index a3c236821e06..a3c236821e06 100644
--- a/configs/shared/.emacs.d/snippets/lisp-mode/typed-function
+++ b/emacs/.emacs.d/snippets/lisp-mode/typed-function
diff --git a/configs/shared/.emacs.d/snippets/nix-mode/.yas-parents b/emacs/.emacs.d/snippets/nix-mode/.yas-parents
index d58dacb7a0b1..d58dacb7a0b1 100644
--- a/configs/shared/.emacs.d/snippets/nix-mode/.yas-parents
+++ b/emacs/.emacs.d/snippets/nix-mode/.yas-parents
diff --git a/configs/shared/.emacs.d/snippets/nix-mode/shell-nix b/emacs/.emacs.d/snippets/nix-mode/shell-nix
index 4c308bb51b3a..4c308bb51b3a 100644
--- a/configs/shared/.emacs.d/snippets/nix-mode/shell-nix
+++ b/emacs/.emacs.d/snippets/nix-mode/shell-nix
diff --git a/configs/shared/.emacs.d/snippets/org-mode/.yas-parents b/emacs/.emacs.d/snippets/org-mode/.yas-parents
index d58dacb7a0b1..d58dacb7a0b1 100644
--- a/configs/shared/.emacs.d/snippets/org-mode/.yas-parents
+++ b/emacs/.emacs.d/snippets/org-mode/.yas-parents
diff --git a/configs/shared/.emacs.d/snippets/org-mode/code-snippet b/emacs/.emacs.d/snippets/org-mode/code-snippet
index 4215b15992b6..4215b15992b6 100644
--- a/configs/shared/.emacs.d/snippets/org-mode/code-snippet
+++ b/emacs/.emacs.d/snippets/org-mode/code-snippet
diff --git a/configs/shared/.emacs.d/snippets/org-mode/href b/emacs/.emacs.d/snippets/org-mode/href
index ac65ea2e49be..ac65ea2e49be 100644
--- a/configs/shared/.emacs.d/snippets/org-mode/href
+++ b/emacs/.emacs.d/snippets/org-mode/href
diff --git a/configs/shared/.emacs.d/snippets/python-mode/.yas-parents b/emacs/.emacs.d/snippets/python-mode/.yas-parents
index d58dacb7a0b1..d58dacb7a0b1 100644
--- a/configs/shared/.emacs.d/snippets/python-mode/.yas-parents
+++ b/emacs/.emacs.d/snippets/python-mode/.yas-parents
diff --git a/configs/shared/.emacs.d/snippets/python-mode/dunder-main b/emacs/.emacs.d/snippets/python-mode/dunder-main
index 4dd22dc0b2da..4dd22dc0b2da 100644
--- a/configs/shared/.emacs.d/snippets/python-mode/dunder-main
+++ b/emacs/.emacs.d/snippets/python-mode/dunder-main
diff --git a/configs/shared/.emacs.d/snippets/python-mode/function b/emacs/.emacs.d/snippets/python-mode/function
index 379ceda1a3a6..379ceda1a3a6 100644
--- a/configs/shared/.emacs.d/snippets/python-mode/function
+++ b/emacs/.emacs.d/snippets/python-mode/function
diff --git a/configs/shared/.emacs.d/snippets/python-mode/header b/emacs/.emacs.d/snippets/python-mode/header
index db48adfec737..db48adfec737 100644
--- a/configs/shared/.emacs.d/snippets/python-mode/header
+++ b/emacs/.emacs.d/snippets/python-mode/header
diff --git a/configs/shared/.emacs.d/snippets/python-mode/init b/emacs/.emacs.d/snippets/python-mode/init
index 5c407495f53a..5c407495f53a 100644
--- a/configs/shared/.emacs.d/snippets/python-mode/init
+++ b/emacs/.emacs.d/snippets/python-mode/init
diff --git a/configs/shared/.emacs.d/snippets/python-mode/shebang b/emacs/.emacs.d/snippets/python-mode/shebang
index 0f45ae782d32..0f45ae782d32 100644
--- a/configs/shared/.emacs.d/snippets/python-mode/shebang
+++ b/emacs/.emacs.d/snippets/python-mode/shebang
diff --git a/configs/shared/.emacs.d/snippets/python-mode/utf-8 b/emacs/.emacs.d/snippets/python-mode/utf-8
index 3babc730305a..3babc730305a 100644
--- a/configs/shared/.emacs.d/snippets/python-mode/utf-8
+++ b/emacs/.emacs.d/snippets/python-mode/utf-8
diff --git a/configs/shared/.emacs.d/snippets/racket-mode/.yas-parents b/emacs/.emacs.d/snippets/racket-mode/.yas-parents
index d58dacb7a0b1..d58dacb7a0b1 100644
--- a/configs/shared/.emacs.d/snippets/racket-mode/.yas-parents
+++ b/emacs/.emacs.d/snippets/racket-mode/.yas-parents
diff --git a/configs/shared/.emacs.d/snippets/racket-mode/function b/emacs/.emacs.d/snippets/racket-mode/function
index 882c48ded39d..882c48ded39d 100644
--- a/configs/shared/.emacs.d/snippets/racket-mode/function
+++ b/emacs/.emacs.d/snippets/racket-mode/function
diff --git a/configs/shared/.emacs.d/snippets/racket-mode/lambda b/emacs/.emacs.d/snippets/racket-mode/lambda
index b9a684588bc4..b9a684588bc4 100644
--- a/configs/shared/.emacs.d/snippets/racket-mode/lambda
+++ b/emacs/.emacs.d/snippets/racket-mode/lambda
diff --git a/configs/shared/.emacs.d/snippets/racket-mode/lambda-symbol b/emacs/.emacs.d/snippets/racket-mode/lambda-symbol
index 254b9fd96b18..254b9fd96b18 100644
--- a/configs/shared/.emacs.d/snippets/racket-mode/lambda-symbol
+++ b/emacs/.emacs.d/snippets/racket-mode/lambda-symbol
diff --git a/configs/shared/.emacs.d/snippets/reason-mode/.yas-parents b/emacs/.emacs.d/snippets/reason-mode/.yas-parents
index d58dacb7a0b1..d58dacb7a0b1 100644
--- a/configs/shared/.emacs.d/snippets/reason-mode/.yas-parents
+++ b/emacs/.emacs.d/snippets/reason-mode/.yas-parents
diff --git a/configs/shared/.emacs.d/snippets/reason-mode/function b/emacs/.emacs.d/snippets/reason-mode/function
index 6b4b6a5db2a7..6b4b6a5db2a7 100644
--- a/configs/shared/.emacs.d/snippets/reason-mode/function
+++ b/emacs/.emacs.d/snippets/reason-mode/function
diff --git a/configs/shared/.emacs.d/snippets/reason-mode/switch b/emacs/.emacs.d/snippets/reason-mode/switch
index 40f34ff8d1f1..40f34ff8d1f1 100644
--- a/configs/shared/.emacs.d/snippets/reason-mode/switch
+++ b/emacs/.emacs.d/snippets/reason-mode/switch
diff --git a/configs/shared/.emacs.d/snippets/rjsx-mode/.yas-parents b/emacs/.emacs.d/snippets/rjsx-mode/.yas-parents
index d58dacb7a0b1..d58dacb7a0b1 100644
--- a/configs/shared/.emacs.d/snippets/rjsx-mode/.yas-parents
+++ b/emacs/.emacs.d/snippets/rjsx-mode/.yas-parents
diff --git a/configs/shared/.emacs.d/snippets/rjsx-mode/action-extractor b/emacs/.emacs.d/snippets/rjsx-mode/action-extractor
index 62834a29ab04..62834a29ab04 100644
--- a/configs/shared/.emacs.d/snippets/rjsx-mode/action-extractor
+++ b/emacs/.emacs.d/snippets/rjsx-mode/action-extractor
diff --git a/configs/shared/.emacs.d/snippets/rjsx-mode/console-log b/emacs/.emacs.d/snippets/rjsx-mode/console-log
index 82ec3fd8e379..82ec3fd8e379 100644
--- a/configs/shared/.emacs.d/snippets/rjsx-mode/console-log
+++ b/emacs/.emacs.d/snippets/rjsx-mode/console-log
diff --git a/configs/shared/.emacs.d/snippets/rjsx-mode/const-defn b/emacs/.emacs.d/snippets/rjsx-mode/const-defn
index 8e35e61fc2c4..8e35e61fc2c4 100644
--- a/configs/shared/.emacs.d/snippets/rjsx-mode/const-defn
+++ b/emacs/.emacs.d/snippets/rjsx-mode/const-defn
diff --git a/configs/shared/.emacs.d/snippets/rjsx-mode/const-function b/emacs/.emacs.d/snippets/rjsx-mode/const-function
index 13f2018f2269..13f2018f2269 100644
--- a/configs/shared/.emacs.d/snippets/rjsx-mode/const-function
+++ b/emacs/.emacs.d/snippets/rjsx-mode/const-function
diff --git a/configs/shared/.emacs.d/snippets/rjsx-mode/destructure-const b/emacs/.emacs.d/snippets/rjsx-mode/destructure-const
index 2a52c57c75cd..2a52c57c75cd 100644
--- a/configs/shared/.emacs.d/snippets/rjsx-mode/destructure-const
+++ b/emacs/.emacs.d/snippets/rjsx-mode/destructure-const
diff --git a/configs/shared/.emacs.d/snippets/rjsx-mode/fat-arrow b/emacs/.emacs.d/snippets/rjsx-mode/fat-arrow
index 187a2efc5a7c..187a2efc5a7c 100644
--- a/configs/shared/.emacs.d/snippets/rjsx-mode/fat-arrow
+++ b/emacs/.emacs.d/snippets/rjsx-mode/fat-arrow
diff --git a/configs/shared/.emacs.d/snippets/rjsx-mode/fat-arrow-function b/emacs/.emacs.d/snippets/rjsx-mode/fat-arrow-function
index 694914a83c95..694914a83c95 100644
--- a/configs/shared/.emacs.d/snippets/rjsx-mode/fat-arrow-function
+++ b/emacs/.emacs.d/snippets/rjsx-mode/fat-arrow-function
diff --git a/configs/shared/.emacs.d/snippets/rjsx-mode/import-destructured b/emacs/.emacs.d/snippets/rjsx-mode/import-destructured
index ded3ce163a93..ded3ce163a93 100644
--- a/configs/shared/.emacs.d/snippets/rjsx-mode/import-destructured
+++ b/emacs/.emacs.d/snippets/rjsx-mode/import-destructured
diff --git a/configs/shared/.emacs.d/snippets/rjsx-mode/import-react b/emacs/.emacs.d/snippets/rjsx-mode/import-react
index 0463f5cd5593..0463f5cd5593 100644
--- a/configs/shared/.emacs.d/snippets/rjsx-mode/import-react
+++ b/emacs/.emacs.d/snippets/rjsx-mode/import-react
diff --git a/configs/shared/.emacs.d/snippets/rjsx-mode/import-type b/emacs/.emacs.d/snippets/rjsx-mode/import-type
index fcd51f687b61..fcd51f687b61 100644
--- a/configs/shared/.emacs.d/snippets/rjsx-mode/import-type
+++ b/emacs/.emacs.d/snippets/rjsx-mode/import-type
diff --git a/configs/shared/.emacs.d/snippets/rjsx-mode/import-x-from-y b/emacs/.emacs.d/snippets/rjsx-mode/import-x-from-y
index 09fa6df50506..09fa6df50506 100644
--- a/configs/shared/.emacs.d/snippets/rjsx-mode/import-x-from-y
+++ b/emacs/.emacs.d/snippets/rjsx-mode/import-x-from-y
diff --git a/configs/shared/.emacs.d/snippets/rjsx-mode/import-y b/emacs/.emacs.d/snippets/rjsx-mode/import-y
index 9f550e300d12..9f550e300d12 100644
--- a/configs/shared/.emacs.d/snippets/rjsx-mode/import-y
+++ b/emacs/.emacs.d/snippets/rjsx-mode/import-y
diff --git a/configs/shared/.emacs.d/snippets/rjsx-mode/jest-describe-test b/emacs/.emacs.d/snippets/rjsx-mode/jest-describe-test
index ed382d4f74c4..ed382d4f74c4 100644
--- a/configs/shared/.emacs.d/snippets/rjsx-mode/jest-describe-test
+++ b/emacs/.emacs.d/snippets/rjsx-mode/jest-describe-test
diff --git a/configs/shared/.emacs.d/snippets/rjsx-mode/jest-test b/emacs/.emacs.d/snippets/rjsx-mode/jest-test
index 12ca2e786ded..12ca2e786ded 100644
--- a/configs/shared/.emacs.d/snippets/rjsx-mode/jest-test
+++ b/emacs/.emacs.d/snippets/rjsx-mode/jest-test
diff --git a/configs/shared/.emacs.d/snippets/rjsx-mode/react-class-component b/emacs/.emacs.d/snippets/rjsx-mode/react-class-component
index f2a93a31d96d..f2a93a31d96d 100644
--- a/configs/shared/.emacs.d/snippets/rjsx-mode/react-class-component
+++ b/emacs/.emacs.d/snippets/rjsx-mode/react-class-component
diff --git a/configs/shared/.emacs.d/snippets/rjsx-mode/redux-action b/emacs/.emacs.d/snippets/rjsx-mode/redux-action
index 7d24ffee4165..7d24ffee4165 100644
--- a/configs/shared/.emacs.d/snippets/rjsx-mode/redux-action
+++ b/emacs/.emacs.d/snippets/rjsx-mode/redux-action
diff --git a/configs/shared/.emacs.d/snippets/rjsx-mode/typed-redux-action b/emacs/.emacs.d/snippets/rjsx-mode/typed-redux-action
index c50e1f9d2e95..c50e1f9d2e95 100644
--- a/configs/shared/.emacs.d/snippets/rjsx-mode/typed-redux-action
+++ b/emacs/.emacs.d/snippets/rjsx-mode/typed-redux-action
diff --git a/configs/shared/.emacs.d/snippets/rust-mode/.yas-parents b/emacs/.emacs.d/snippets/rust-mode/.yas-parents
index d58dacb7a0b1..d58dacb7a0b1 100644
--- a/configs/shared/.emacs.d/snippets/rust-mode/.yas-parents
+++ b/emacs/.emacs.d/snippets/rust-mode/.yas-parents
diff --git a/configs/shared/.emacs.d/snippets/rust-mode/for-loop b/emacs/.emacs.d/snippets/rust-mode/for-loop
index 4d8e0e3bbd24..4d8e0e3bbd24 100644
--- a/configs/shared/.emacs.d/snippets/rust-mode/for-loop
+++ b/emacs/.emacs.d/snippets/rust-mode/for-loop
diff --git a/configs/shared/.emacs.d/snippets/rust-mode/match b/emacs/.emacs.d/snippets/rust-mode/match
index bf0e876e2b98..bf0e876e2b98 100644
--- a/configs/shared/.emacs.d/snippets/rust-mode/match
+++ b/emacs/.emacs.d/snippets/rust-mode/match
diff --git a/configs/shared/.emacs.d/snippets/sh-mode/.yas-parents b/emacs/.emacs.d/snippets/sh-mode/.yas-parents
index d58dacb7a0b1..d58dacb7a0b1 100644
--- a/configs/shared/.emacs.d/snippets/sh-mode/.yas-parents
+++ b/emacs/.emacs.d/snippets/sh-mode/.yas-parents
diff --git a/configs/shared/.emacs.d/snippets/sh-mode/function b/emacs/.emacs.d/snippets/sh-mode/function
index efa946bb272f..efa946bb272f 100644
--- a/configs/shared/.emacs.d/snippets/sh-mode/function
+++ b/emacs/.emacs.d/snippets/sh-mode/function
diff --git a/configs/shared/.emacs.d/snippets/text-mode/.yas-parents b/emacs/.emacs.d/snippets/text-mode/.yas-parents
index d58dacb7a0b1..d58dacb7a0b1 100644
--- a/configs/shared/.emacs.d/snippets/text-mode/.yas-parents
+++ b/emacs/.emacs.d/snippets/text-mode/.yas-parents
diff --git a/configs/shared/.emacs.d/snippets/text-mode/check-mark b/emacs/.emacs.d/snippets/text-mode/check-mark
index 797781968881..797781968881 100644
--- a/configs/shared/.emacs.d/snippets/text-mode/check-mark
+++ b/emacs/.emacs.d/snippets/text-mode/check-mark
diff --git a/configs/shared/.emacs.d/snippets/text-mode/x-mark b/emacs/.emacs.d/snippets/text-mode/x-mark
index bc3c356a6157..bc3c356a6157 100644
--- a/configs/shared/.emacs.d/snippets/text-mode/x-mark
+++ b/emacs/.emacs.d/snippets/text-mode/x-mark
diff --git a/configs/shared/.emacs.d/snippets/web-mode/.yas-parents b/emacs/.emacs.d/snippets/web-mode/.yas-parents
index d58dacb7a0b1..d58dacb7a0b1 100644
--- a/configs/shared/.emacs.d/snippets/web-mode/.yas-parents
+++ b/emacs/.emacs.d/snippets/web-mode/.yas-parents
diff --git a/configs/shared/.emacs.d/snippets/web-mode/header b/emacs/.emacs.d/snippets/web-mode/header
index ae59c7a50f9c..ae59c7a50f9c 100644
--- a/configs/shared/.emacs.d/snippets/web-mode/header
+++ b/emacs/.emacs.d/snippets/web-mode/header
diff --git a/configs/shared/.emacs.d/snippets/web-mode/index-boilerplate b/emacs/.emacs.d/snippets/web-mode/index-boilerplate
index b791cdf86fe5..b791cdf86fe5 100644
--- a/configs/shared/.emacs.d/snippets/web-mode/index-boilerplate
+++ b/emacs/.emacs.d/snippets/web-mode/index-boilerplate
diff --git a/configs/shared/.emacs.d/vendor/dired+.el b/emacs/.emacs.d/vendor/dired+.el
index 2403b0af9c02..2403b0af9c02 100644
--- a/configs/shared/.emacs.d/vendor/dired+.el
+++ b/emacs/.emacs.d/vendor/dired+.el
diff --git a/configs/shared/.emacs.d/vendor/org-clubhouse.el b/emacs/.emacs.d/vendor/org-clubhouse.el
index ba1f004a2410..ba1f004a2410 100644
--- a/configs/shared/.emacs.d/vendor/org-clubhouse.el
+++ b/emacs/.emacs.d/vendor/org-clubhouse.el
diff --git a/configs/shared/.emacs.d/vendor/reason-indent.el b/emacs/.emacs.d/vendor/reason-indent.el
index 8fd3c9425866..8fd3c9425866 100644
--- a/configs/shared/.emacs.d/vendor/reason-indent.el
+++ b/emacs/.emacs.d/vendor/reason-indent.el
diff --git a/configs/shared/.emacs.d/vendor/reason-interaction.el b/emacs/.emacs.d/vendor/reason-interaction.el
index 6ceaed1e9340..6ceaed1e9340 100644
--- a/configs/shared/.emacs.d/vendor/reason-interaction.el
+++ b/emacs/.emacs.d/vendor/reason-interaction.el
diff --git a/configs/shared/.emacs.d/vendor/reason-mode.el b/emacs/.emacs.d/vendor/reason-mode.el
index 789735955db2..789735955db2 100644
--- a/configs/shared/.emacs.d/vendor/reason-mode.el
+++ b/emacs/.emacs.d/vendor/reason-mode.el
diff --git a/configs/shared/.emacs.d/vendor/refmt.el b/emacs/.emacs.d/vendor/refmt.el
index b9ea2b43f0ce..b9ea2b43f0ce 100644
--- a/configs/shared/.emacs.d/vendor/refmt.el
+++ b/emacs/.emacs.d/vendor/refmt.el
diff --git a/configs/shared/.emacs.d/vendor/slack-snippets.el b/emacs/.emacs.d/vendor/slack-snippets.el
index 6bf933cfb86d..6bf933cfb86d 100644
--- a/configs/shared/.emacs.d/vendor/slack-snippets.el
+++ b/emacs/.emacs.d/vendor/slack-snippets.el
diff --git a/configs/shared/.emacs.d/vendor/wpgtk-theme.el b/emacs/.emacs.d/vendor/wpgtk-theme.el
index 702048baf84a..702048baf84a 100644
--- a/configs/shared/.emacs.d/vendor/wpgtk-theme.el
+++ b/emacs/.emacs.d/vendor/wpgtk-theme.el
diff --git a/configs/shared/.emacs.d/wpc/alist.el b/emacs/.emacs.d/wpc/alist.el
index f23109ce6a38..f23109ce6a38 100644
--- a/configs/shared/.emacs.d/wpc/alist.el
+++ b/emacs/.emacs.d/wpc/alist.el
diff --git a/configs/shared/.emacs.d/wpc/bag.el b/emacs/.emacs.d/wpc/bag.el
index c9511b18e737..c9511b18e737 100644
--- a/configs/shared/.emacs.d/wpc/bag.el
+++ b/emacs/.emacs.d/wpc/bag.el
diff --git a/configs/shared/.emacs.d/wpc/bills.el b/emacs/.emacs.d/wpc/bills.el
index fbdeb9d0f820..fbdeb9d0f820 100644
--- a/configs/shared/.emacs.d/wpc/bills.el
+++ b/emacs/.emacs.d/wpc/bills.el
diff --git a/configs/shared/.emacs.d/wpc/bookmark.el b/emacs/.emacs.d/wpc/bookmark.el
index 734ddaa13a27..734ddaa13a27 100644
--- a/configs/shared/.emacs.d/wpc/bookmark.el
+++ b/emacs/.emacs.d/wpc/bookmark.el
diff --git a/configs/shared/.emacs.d/wpc/buffer.el b/emacs/.emacs.d/wpc/buffer.el
index d388818e58a4..d388818e58a4 100644
--- a/configs/shared/.emacs.d/wpc/buffer.el
+++ b/emacs/.emacs.d/wpc/buffer.el
diff --git a/configs/shared/.emacs.d/wpc/bytes.el b/emacs/.emacs.d/wpc/bytes.el
index d8bd2e288614..d8bd2e288614 100644
--- a/configs/shared/.emacs.d/wpc/bytes.el
+++ b/emacs/.emacs.d/wpc/bytes.el
diff --git a/configs/shared/.emacs.d/wpc/cache.el b/emacs/.emacs.d/wpc/cache.el
index 7b7e1aa2a37f..7b7e1aa2a37f 100644
--- a/configs/shared/.emacs.d/wpc/cache.el
+++ b/emacs/.emacs.d/wpc/cache.el
diff --git a/configs/shared/.emacs.d/wpc/chrome.el b/emacs/.emacs.d/wpc/chrome.el
index 133c7af355fa..133c7af355fa 100644
--- a/configs/shared/.emacs.d/wpc/chrome.el
+++ b/emacs/.emacs.d/wpc/chrome.el
diff --git a/configs/shared/.emacs.d/wpc/clipboard.el b/emacs/.emacs.d/wpc/clipboard.el
index 0688c9d87fe0..0688c9d87fe0 100644
--- a/configs/shared/.emacs.d/wpc/clipboard.el
+++ b/emacs/.emacs.d/wpc/clipboard.el
diff --git a/configs/shared/.emacs.d/wpc/colorscheme.el b/emacs/.emacs.d/wpc/colorscheme.el
index 830fc5ac3e28..830fc5ac3e28 100644
--- a/configs/shared/.emacs.d/wpc/colorscheme.el
+++ b/emacs/.emacs.d/wpc/colorscheme.el
diff --git a/configs/shared/.emacs.d/wpc/constants.el b/emacs/.emacs.d/wpc/constants.el
index 5bfedf5553c6..5bfedf5553c6 100644
--- a/configs/shared/.emacs.d/wpc/constants.el
+++ b/emacs/.emacs.d/wpc/constants.el
diff --git a/configs/shared/.emacs.d/wpc/cycle.el b/emacs/.emacs.d/wpc/cycle.el
index 9475ddd99659..9475ddd99659 100644
--- a/configs/shared/.emacs.d/wpc/cycle.el
+++ b/emacs/.emacs.d/wpc/cycle.el
diff --git a/configs/shared/.emacs.d/wpc/device.el b/emacs/.emacs.d/wpc/device.el
index 03eb55beb7f4..03eb55beb7f4 100644
--- a/configs/shared/.emacs.d/wpc/device.el
+++ b/emacs/.emacs.d/wpc/device.el
diff --git a/configs/shared/.emacs.d/wpc/display.el b/emacs/.emacs.d/wpc/display.el
index 8e5b89030325..8e5b89030325 100644
--- a/configs/shared/.emacs.d/wpc/display.el
+++ b/emacs/.emacs.d/wpc/display.el
diff --git a/configs/shared/.emacs.d/wpc/do.el b/emacs/.emacs.d/wpc/do.el
index 7dc2b260fdcd..7dc2b260fdcd 100644
--- a/configs/shared/.emacs.d/wpc/do.el
+++ b/emacs/.emacs.d/wpc/do.el
diff --git a/configs/shared/.emacs.d/wpc/dotfiles.el b/emacs/.emacs.d/wpc/dotfiles.el
index 2e78cf213733..2e78cf213733 100644
--- a/configs/shared/.emacs.d/wpc/dotfiles.el
+++ b/emacs/.emacs.d/wpc/dotfiles.el
diff --git a/configs/shared/.emacs.d/wpc/dotted.el b/emacs/.emacs.d/wpc/dotted.el
index 90ef39f92e7e..90ef39f92e7e 100644
--- a/configs/shared/.emacs.d/wpc/dotted.el
+++ b/emacs/.emacs.d/wpc/dotted.el
diff --git a/configs/shared/.emacs.d/wpc/email.el b/emacs/.emacs.d/wpc/email.el
index 6a266a717cd2..6a266a717cd2 100644
--- a/configs/shared/.emacs.d/wpc/email.el
+++ b/emacs/.emacs.d/wpc/email.el
diff --git a/configs/shared/.emacs.d/wpc/entr.el b/emacs/.emacs.d/wpc/entr.el
index ac2a5812c328..ac2a5812c328 100644
--- a/configs/shared/.emacs.d/wpc/entr.el
+++ b/emacs/.emacs.d/wpc/entr.el
diff --git a/configs/shared/.emacs.d/wpc/enum.el b/emacs/.emacs.d/wpc/enum.el
index 078e7972099c..078e7972099c 100644
--- a/configs/shared/.emacs.d/wpc/enum.el
+++ b/emacs/.emacs.d/wpc/enum.el
diff --git a/configs/shared/.emacs.d/wpc/finance.el b/emacs/.emacs.d/wpc/finance.el
index b124061ccba3..b124061ccba3 100644
--- a/configs/shared/.emacs.d/wpc/finance.el
+++ b/emacs/.emacs.d/wpc/finance.el
diff --git a/configs/shared/.emacs.d/wpc/fonts.el b/emacs/.emacs.d/wpc/fonts.el
index 3c6fe6bfebfb..3c6fe6bfebfb 100644
--- a/configs/shared/.emacs.d/wpc/fonts.el
+++ b/emacs/.emacs.d/wpc/fonts.el
diff --git a/configs/shared/.emacs.d/wpc/fs.el b/emacs/.emacs.d/wpc/fs.el
index b1a79e280a57..b1a79e280a57 100644
--- a/configs/shared/.emacs.d/wpc/fs.el
+++ b/emacs/.emacs.d/wpc/fs.el
diff --git a/configs/shared/.emacs.d/wpc/functions.el b/emacs/.emacs.d/wpc/functions.el
index 2ef82d54bbe1..2ef82d54bbe1 100644
--- a/configs/shared/.emacs.d/wpc/functions.el
+++ b/emacs/.emacs.d/wpc/functions.el
diff --git a/configs/shared/.emacs.d/wpc/graph.el b/emacs/.emacs.d/wpc/graph.el
index c68c308590f4..c68c308590f4 100644
--- a/configs/shared/.emacs.d/wpc/graph.el
+++ b/emacs/.emacs.d/wpc/graph.el
diff --git a/configs/shared/.emacs.d/wpc/imdb.el b/emacs/.emacs.d/wpc/imdb.el
index 2969da140935..2969da140935 100644
--- a/configs/shared/.emacs.d/wpc/imdb.el
+++ b/emacs/.emacs.d/wpc/imdb.el
diff --git a/configs/shared/.emacs.d/wpc/irc.el b/emacs/.emacs.d/wpc/irc.el
index b9a1e3131769..b9a1e3131769 100644
--- a/configs/shared/.emacs.d/wpc/irc.el
+++ b/emacs/.emacs.d/wpc/irc.el
diff --git a/configs/shared/.emacs.d/wpc/iso.el b/emacs/.emacs.d/wpc/iso.el
index c9ce4a48fc71..c9ce4a48fc71 100644
--- a/configs/shared/.emacs.d/wpc/iso.el
+++ b/emacs/.emacs.d/wpc/iso.el
diff --git a/configs/shared/.emacs.d/wpc/ivy-clipmenu.el b/emacs/.emacs.d/wpc/ivy-clipmenu.el
index f3896137bd9f..f3896137bd9f 100644
--- a/configs/shared/.emacs.d/wpc/ivy-clipmenu.el
+++ b/emacs/.emacs.d/wpc/ivy-clipmenu.el
diff --git a/configs/shared/.emacs.d/wpc/ivy-helpers.el b/emacs/.emacs.d/wpc/ivy-helpers.el
index c71a907a20c1..c71a907a20c1 100644
--- a/configs/shared/.emacs.d/wpc/ivy-helpers.el
+++ b/emacs/.emacs.d/wpc/ivy-helpers.el
diff --git a/configs/shared/.emacs.d/wpc/kaomoji.el b/emacs/.emacs.d/wpc/kaomoji.el
index d6d509c14667..d6d509c14667 100644
--- a/configs/shared/.emacs.d/wpc/kaomoji.el
+++ b/emacs/.emacs.d/wpc/kaomoji.el
diff --git a/configs/shared/.emacs.d/wpc/kbd.el b/emacs/.emacs.d/wpc/kbd.el
index 49b346bc6ea8..49b346bc6ea8 100644
--- a/configs/shared/.emacs.d/wpc/kbd.el
+++ b/emacs/.emacs.d/wpc/kbd.el
diff --git a/configs/shared/.emacs.d/wpc/keybindings.el b/emacs/.emacs.d/wpc/keybindings.el
index 755311483dd1..755311483dd1 100644
--- a/configs/shared/.emacs.d/wpc/keybindings.el
+++ b/emacs/.emacs.d/wpc/keybindings.el
diff --git a/configs/shared/.emacs.d/wpc/keyboard.el b/emacs/.emacs.d/wpc/keyboard.el
index ec50cabd2719..ec50cabd2719 100644
--- a/configs/shared/.emacs.d/wpc/keyboard.el
+++ b/emacs/.emacs.d/wpc/keyboard.el
diff --git a/configs/shared/.emacs.d/wpc/keymap.el b/emacs/.emacs.d/wpc/keymap.el
index 87d340fcdbf1..87d340fcdbf1 100644
--- a/configs/shared/.emacs.d/wpc/keymap.el
+++ b/emacs/.emacs.d/wpc/keymap.el
diff --git a/configs/shared/.emacs.d/wpc/laptop-battery.el b/emacs/.emacs.d/wpc/laptop-battery.el
index 3ec03553d2ca..3ec03553d2ca 100644
--- a/configs/shared/.emacs.d/wpc/laptop-battery.el
+++ b/emacs/.emacs.d/wpc/laptop-battery.el
diff --git a/configs/shared/.emacs.d/wpc/list.el b/emacs/.emacs.d/wpc/list.el
index 5a63c8bd94e0..5a63c8bd94e0 100644
--- a/configs/shared/.emacs.d/wpc/list.el
+++ b/emacs/.emacs.d/wpc/list.el
diff --git a/configs/shared/.emacs.d/wpc/list.nix b/emacs/.emacs.d/wpc/list.nix
index e664ba6fd4a1..e664ba6fd4a1 100644
--- a/configs/shared/.emacs.d/wpc/list.nix
+++ b/emacs/.emacs.d/wpc/list.nix
diff --git a/configs/shared/.emacs.d/wpc/macros.el b/emacs/.emacs.d/wpc/macros.el
index 5f7c93902e3e..5f7c93902e3e 100644
--- a/configs/shared/.emacs.d/wpc/macros.el
+++ b/emacs/.emacs.d/wpc/macros.el
diff --git a/configs/shared/.emacs.d/wpc/math.el b/emacs/.emacs.d/wpc/math.el
index 3176d906b466..3176d906b466 100644
--- a/configs/shared/.emacs.d/wpc/math.el
+++ b/emacs/.emacs.d/wpc/math.el
diff --git a/configs/shared/.emacs.d/wpc/maybe.el b/emacs/.emacs.d/wpc/maybe.el
index 0973b1ed65f7..0973b1ed65f7 100644
--- a/configs/shared/.emacs.d/wpc/maybe.el
+++ b/emacs/.emacs.d/wpc/maybe.el
diff --git a/configs/shared/.emacs.d/wpc/me-seconds.el b/emacs/.emacs.d/wpc/me-seconds.el
index f03e5d07d790..f03e5d07d790 100644
--- a/configs/shared/.emacs.d/wpc/me-seconds.el
+++ b/emacs/.emacs.d/wpc/me-seconds.el
diff --git a/configs/shared/.emacs.d/wpc/monoid.el b/emacs/.emacs.d/wpc/monoid.el
index 401d63c41728..401d63c41728 100644
--- a/configs/shared/.emacs.d/wpc/monoid.el
+++ b/emacs/.emacs.d/wpc/monoid.el
diff --git a/configs/shared/.emacs.d/wpc/number.el b/emacs/.emacs.d/wpc/number.el
index f496349050d9..f496349050d9 100644
--- a/configs/shared/.emacs.d/wpc/number.el
+++ b/emacs/.emacs.d/wpc/number.el
diff --git a/configs/shared/.emacs.d/wpc/org-helpers.el b/emacs/.emacs.d/wpc/org-helpers.el
index ef99b18ee053..ef99b18ee053 100644
--- a/configs/shared/.emacs.d/wpc/org-helpers.el
+++ b/emacs/.emacs.d/wpc/org-helpers.el
diff --git a/configs/shared/.emacs.d/wpc/playback.el b/emacs/.emacs.d/wpc/playback.el
index e7ad4b2481a4..e7ad4b2481a4 100644
--- a/configs/shared/.emacs.d/wpc/playback.el
+++ b/emacs/.emacs.d/wpc/playback.el
diff --git a/configs/shared/.emacs.d/wpc/polymorphism.el b/emacs/.emacs.d/wpc/polymorphism.el
index 09045f7fb258..09045f7fb258 100644
--- a/configs/shared/.emacs.d/wpc/polymorphism.el
+++ b/emacs/.emacs.d/wpc/polymorphism.el
diff --git a/configs/shared/.emacs.d/wpc/prelude.el b/emacs/.emacs.d/wpc/prelude.el
index 6ef9e3ba7afb..6ef9e3ba7afb 100644
--- a/configs/shared/.emacs.d/wpc/prelude.el
+++ b/emacs/.emacs.d/wpc/prelude.el
diff --git a/configs/shared/.emacs.d/wpc/prelude.nix b/emacs/.emacs.d/wpc/prelude.nix
index 626d4526a25d..626d4526a25d 100644
--- a/configs/shared/.emacs.d/wpc/prelude.nix
+++ b/emacs/.emacs.d/wpc/prelude.nix
diff --git a/configs/shared/.emacs.d/wpc/pulse-audio.el b/emacs/.emacs.d/wpc/pulse-audio.el
index dba4151a9e3d..dba4151a9e3d 100644
--- a/configs/shared/.emacs.d/wpc/pulse-audio.el
+++ b/emacs/.emacs.d/wpc/pulse-audio.el
diff --git a/configs/shared/.emacs.d/wpc/pushover.el b/emacs/.emacs.d/wpc/pushover.el
index fb06656cf467..fb06656cf467 100644
--- a/configs/shared/.emacs.d/wpc/pushover.el
+++ b/emacs/.emacs.d/wpc/pushover.el
diff --git a/configs/shared/.emacs.d/wpc/random.el b/emacs/.emacs.d/wpc/random.el
index 148506c04d4e..148506c04d4e 100644
--- a/configs/shared/.emacs.d/wpc/random.el
+++ b/emacs/.emacs.d/wpc/random.el
diff --git a/configs/shared/.emacs.d/wpc/region.el b/emacs/.emacs.d/wpc/region.el
index a2119b4c96ce..a2119b4c96ce 100644
--- a/configs/shared/.emacs.d/wpc/region.el
+++ b/emacs/.emacs.d/wpc/region.el
diff --git a/configs/shared/.emacs.d/wpc/scheduler.el b/emacs/.emacs.d/wpc/scheduler.el
index bae953228925..bae953228925 100644
--- a/configs/shared/.emacs.d/wpc/scheduler.el
+++ b/emacs/.emacs.d/wpc/scheduler.el
diff --git a/configs/shared/.emacs.d/wpc/scope.el b/emacs/.emacs.d/wpc/scope.el
index 48aa85ad0e5d..48aa85ad0e5d 100644
--- a/configs/shared/.emacs.d/wpc/scope.el
+++ b/emacs/.emacs.d/wpc/scope.el
diff --git a/configs/shared/.emacs.d/wpc/screen-brightness.el b/emacs/.emacs.d/wpc/screen-brightness.el
index ad51e7578cca..ad51e7578cca 100644
--- a/configs/shared/.emacs.d/wpc/screen-brightness.el
+++ b/emacs/.emacs.d/wpc/screen-brightness.el
diff --git a/configs/shared/.emacs.d/wpc/scrot.el b/emacs/.emacs.d/wpc/scrot.el
index eeb12b3731e9..eeb12b3731e9 100644
--- a/configs/shared/.emacs.d/wpc/scrot.el
+++ b/emacs/.emacs.d/wpc/scrot.el
diff --git a/configs/shared/.emacs.d/wpc/sequence.el b/emacs/.emacs.d/wpc/sequence.el
index a5428ef04448..a5428ef04448 100644
--- a/configs/shared/.emacs.d/wpc/sequence.el
+++ b/emacs/.emacs.d/wpc/sequence.el
diff --git a/configs/shared/.emacs.d/wpc/series.el b/emacs/.emacs.d/wpc/series.el
index 55e97f278984..55e97f278984 100644
--- a/configs/shared/.emacs.d/wpc/series.el
+++ b/emacs/.emacs.d/wpc/series.el
diff --git a/configs/shared/.emacs.d/wpc/set.el b/emacs/.emacs.d/wpc/set.el
index ff2db75d94ab..ff2db75d94ab 100644
--- a/configs/shared/.emacs.d/wpc/set.el
+++ b/emacs/.emacs.d/wpc/set.el
diff --git a/configs/shared/.emacs.d/wpc/ssh.el b/emacs/.emacs.d/wpc/ssh.el
index d7039375731e..d7039375731e 100644
--- a/configs/shared/.emacs.d/wpc/ssh.el
+++ b/emacs/.emacs.d/wpc/ssh.el
diff --git a/configs/shared/.emacs.d/wpc/stack.el b/emacs/.emacs.d/wpc/stack.el
index 052ed881d20f..052ed881d20f 100644
--- a/configs/shared/.emacs.d/wpc/stack.el
+++ b/emacs/.emacs.d/wpc/stack.el
diff --git a/configs/shared/.emacs.d/wpc/string.el b/emacs/.emacs.d/wpc/string.el
index f8694d5f18a1..f8694d5f18a1 100644
--- a/configs/shared/.emacs.d/wpc/string.el
+++ b/emacs/.emacs.d/wpc/string.el
diff --git a/configs/shared/.emacs.d/wpc/string.nix b/emacs/.emacs.d/wpc/string.nix
index 1f815b26bb37..1f815b26bb37 100644
--- a/configs/shared/.emacs.d/wpc/string.nix
+++ b/emacs/.emacs.d/wpc/string.nix
diff --git a/configs/shared/.emacs.d/wpc/struct.el b/emacs/.emacs.d/wpc/struct.el
index 7d237d3259ff..7d237d3259ff 100644
--- a/configs/shared/.emacs.d/wpc/struct.el
+++ b/emacs/.emacs.d/wpc/struct.el
diff --git a/configs/shared/.emacs.d/wpc/symbol.el b/emacs/.emacs.d/wpc/symbol.el
index 9119b29470fd..9119b29470fd 100644
--- a/configs/shared/.emacs.d/wpc/symbol.el
+++ b/emacs/.emacs.d/wpc/symbol.el
diff --git a/configs/shared/.emacs.d/wpc/terminator-themes.json b/emacs/.emacs.d/wpc/terminator-themes.json
index e021ef12932f..e021ef12932f 100644
--- a/configs/shared/.emacs.d/wpc/terminator-themes.json
+++ b/emacs/.emacs.d/wpc/terminator-themes.json
diff --git a/configs/shared/.emacs.d/wpc/terminator.el b/emacs/.emacs.d/wpc/terminator.el
index 4794ce2d90a3..4794ce2d90a3 100644
--- a/configs/shared/.emacs.d/wpc/terminator.el
+++ b/emacs/.emacs.d/wpc/terminator.el
diff --git a/configs/shared/.emacs.d/wpc/themes.el b/emacs/.emacs.d/wpc/themes.el
index ee81d3beed72..ee81d3beed72 100644
--- a/configs/shared/.emacs.d/wpc/themes.el
+++ b/emacs/.emacs.d/wpc/themes.el
diff --git a/configs/shared/.emacs.d/wpc/todo.el b/emacs/.emacs.d/wpc/todo.el
index 236912c086fd..236912c086fd 100644
--- a/configs/shared/.emacs.d/wpc/todo.el
+++ b/emacs/.emacs.d/wpc/todo.el
diff --git a/configs/shared/.emacs.d/wpc/tree.el b/emacs/.emacs.d/wpc/tree.el
index 43df4dc500e7..43df4dc500e7 100644
--- a/configs/shared/.emacs.d/wpc/tree.el
+++ b/emacs/.emacs.d/wpc/tree.el
diff --git a/configs/shared/.emacs.d/wpc/tuple.el b/emacs/.emacs.d/wpc/tuple.el
index ccebf7299abd..ccebf7299abd 100644
--- a/configs/shared/.emacs.d/wpc/tuple.el
+++ b/emacs/.emacs.d/wpc/tuple.el
diff --git a/configs/shared/.emacs.d/wpc/vector.el b/emacs/.emacs.d/wpc/vector.el
index 6d2fe20d1209..6d2fe20d1209 100644
--- a/configs/shared/.emacs.d/wpc/vector.el
+++ b/emacs/.emacs.d/wpc/vector.el
diff --git a/configs/shared/.emacs.d/wpc/wallpaper.el b/emacs/.emacs.d/wpc/wallpaper.el
index 9aa41cd364a4..9aa41cd364a4 100644
--- a/configs/shared/.emacs.d/wpc/wallpaper.el
+++ b/emacs/.emacs.d/wpc/wallpaper.el
diff --git a/configs/shared/.emacs.d/wpc/window-manager.el b/emacs/.emacs.d/wpc/window-manager.el
index cf7f1efeb799..cf7f1efeb799 100644
--- a/configs/shared/.emacs.d/wpc/window-manager.el
+++ b/emacs/.emacs.d/wpc/window-manager.el
diff --git a/configs/shared/.emacs.d/wpc/window.el b/emacs/.emacs.d/wpc/window.el
index 132156bc4465..132156bc4465 100644
--- a/configs/shared/.emacs.d/wpc/window.el
+++ b/emacs/.emacs.d/wpc/window.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-clojure.el b/emacs/.emacs.d/wpc/wpc-clojure.el
index d9262cdda8eb..d9262cdda8eb 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-clojure.el
+++ b/emacs/.emacs.d/wpc/wpc-clojure.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-company.el b/emacs/.emacs.d/wpc/wpc-company.el
index 1152f496c2b7..1152f496c2b7 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-company.el
+++ b/emacs/.emacs.d/wpc/wpc-company.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-dired.el b/emacs/.emacs.d/wpc/wpc-dired.el
index bc3915914bf1..bc3915914bf1 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-dired.el
+++ b/emacs/.emacs.d/wpc/wpc-dired.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-docker.el b/emacs/.emacs.d/wpc/wpc-docker.el
index 270eaec6fe4c..270eaec6fe4c 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-docker.el
+++ b/emacs/.emacs.d/wpc/wpc-docker.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-elixir.el b/emacs/.emacs.d/wpc/wpc-elixir.el
index e64abe70fc36..e64abe70fc36 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-elixir.el
+++ b/emacs/.emacs.d/wpc/wpc-elixir.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-flycheck.el b/emacs/.emacs.d/wpc/wpc-flycheck.el
index d7bb834a6257..d7bb834a6257 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-flycheck.el
+++ b/emacs/.emacs.d/wpc/wpc-flycheck.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-haskell.el b/emacs/.emacs.d/wpc/wpc-haskell.el
index e8ab16e585b7..e8ab16e585b7 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-haskell.el
+++ b/emacs/.emacs.d/wpc/wpc-haskell.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-java.el b/emacs/.emacs.d/wpc/wpc-java.el
index 4f33ba962e5d..4f33ba962e5d 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-java.el
+++ b/emacs/.emacs.d/wpc/wpc-java.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-javascript.el b/emacs/.emacs.d/wpc/wpc-javascript.el
index 3de9fff3aaa5..3de9fff3aaa5 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-javascript.el
+++ b/emacs/.emacs.d/wpc/wpc-javascript.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-keybindings.el b/emacs/.emacs.d/wpc/wpc-keybindings.el
index 2ff4fe375829..2ff4fe375829 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-keybindings.el
+++ b/emacs/.emacs.d/wpc/wpc-keybindings.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-lisp.el b/emacs/.emacs.d/wpc/wpc-lisp.el
index 1eeb8550a205..1eeb8550a205 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-lisp.el
+++ b/emacs/.emacs.d/wpc/wpc-lisp.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-misc.el b/emacs/.emacs.d/wpc/wpc-misc.el
index 167c4b88ab9c..167c4b88ab9c 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-misc.el
+++ b/emacs/.emacs.d/wpc/wpc-misc.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-nix.el b/emacs/.emacs.d/wpc/wpc-nix.el
index 68d542e01176..68d542e01176 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-nix.el
+++ b/emacs/.emacs.d/wpc/wpc-nix.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-ocaml.el b/emacs/.emacs.d/wpc/wpc-ocaml.el
index 26add2d6f957..26add2d6f957 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-ocaml.el
+++ b/emacs/.emacs.d/wpc/wpc-ocaml.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-org.el b/emacs/.emacs.d/wpc/wpc-org.el
index 3263fb50380c..3263fb50380c 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-org.el
+++ b/emacs/.emacs.d/wpc/wpc-org.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-package.el b/emacs/.emacs.d/wpc/wpc-package.el
index 6f43330ecb1a..5fd7a89982fb 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-package.el
+++ b/emacs/.emacs.d/wpc/wpc-package.el
@@ -8,20 +8,20 @@
 ;;; Code:
 
 (require 'package)
+
+;; Even though we're packaging our Emacs with Nix, having MELPA registered is
+;; helpful to ad-hoc test out packages before declaratively adding them to
+;; emacs/default.nix.
 (add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
 (package-initialize)
 
 (unless (package-installed-p 'use-package)
+  ;; TODO: Consider removing this to improve initialization speed.
   (package-refresh-contents)
   (package-install 'use-package))
 (eval-when-compile
   (require 'use-package))
-(setq use-package-always-ensure t)
 (use-package general)
 
-(add-to-list 'load-path "~/.emacs.d/vendor/")
-(add-to-list 'load-path "~/.emacs.d/wpc/")
-(add-to-list 'load-path "~/.emacs.d/wpc/packages")
-
 (provide 'wpc-package)
 ;;; wpc-package.el ends here
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-prolog.el b/emacs/.emacs.d/wpc/wpc-prolog.el
index 94e705b1b114..94e705b1b114 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-prolog.el
+++ b/emacs/.emacs.d/wpc/wpc-prolog.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-python.el b/emacs/.emacs.d/wpc/wpc-python.el
index 25f1a4816a67..25f1a4816a67 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-python.el
+++ b/emacs/.emacs.d/wpc/wpc-python.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-reasonml.el b/emacs/.emacs.d/wpc/wpc-reasonml.el
index 909c33d121f7..909c33d121f7 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-reasonml.el
+++ b/emacs/.emacs.d/wpc/wpc-reasonml.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-rust.el b/emacs/.emacs.d/wpc/wpc-rust.el
index fafa27d18c77..fafa27d18c77 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-rust.el
+++ b/emacs/.emacs.d/wpc/wpc-rust.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-shell.el b/emacs/.emacs.d/wpc/wpc-shell.el
index 803a3232ef5b..803a3232ef5b 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-shell.el
+++ b/emacs/.emacs.d/wpc/wpc-shell.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-terminal.el b/emacs/.emacs.d/wpc/wpc-terminal.el
index c232bb85a7b7..c232bb85a7b7 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-terminal.el
+++ b/emacs/.emacs.d/wpc/wpc-terminal.el
diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-ui.el b/emacs/.emacs.d/wpc/wpc-ui.el
index 6ac587c46567..6ac587c46567 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-ui.el
+++ b/emacs/.emacs.d/wpc/wpc-ui.el
diff --git a/configs/shared/.emacs.d/wpc/wpgtk.el b/emacs/.emacs.d/wpc/wpgtk.el
index 432d82884399..432d82884399 100644
--- a/configs/shared/.emacs.d/wpc/wpgtk.el
+++ b/emacs/.emacs.d/wpc/wpgtk.el
diff --git a/configs/shared/.emacs.d/wpc/ynab.el b/emacs/.emacs.d/wpc/ynab.el
index 7e132e20c244..7e132e20c244 100644
--- a/configs/shared/.emacs.d/wpc/ynab.el
+++ b/emacs/.emacs.d/wpc/ynab.el
diff --git a/configs/shared/.emacs.d/wpc/zle.el b/emacs/.emacs.d/wpc/zle.el
index 1b01da938456..1b01da938456 100644
--- a/configs/shared/.emacs.d/wpc/zle.el
+++ b/emacs/.emacs.d/wpc/zle.el
diff --git a/emacs.nix b/emacs/default.nix
index 895165394daf..9ff5c1f2dfd1 100644
--- a/emacs.nix
+++ b/emacs/default.nix
@@ -1,20 +1,13 @@
-{ pkgs ? import <nixpkgs> {}
-, tazjinsPkgs ? import (builtins.fetchGit "https://git.tazj.in") {
-    rev = "4c0e0d715f21eeb62594d198ba1eeccb1a2cfb13";
-  }
+{
+  pkgs ? import <nixpkgs> {},
+  depot ? import <depot> {},
+  ...
 }:
 
 let
-  # TODO: Move this function definition to a prelude.nix or elsewhere.
-  identity = x: x;
-
-  # Here is a whitelist of all of the binary dependencies that Emacs relies
-  # on. These are separate from Emacs libraries like dash.el.
+  utils = import ~/briefcase/utils;
   emacsBinPath = pkgs.lib.strings.makeBinPath [ pkgs.terminator ];
-
   emacsWithPackages = (pkgs.emacsPackagesNgGen pkgs.emacs26).emacsWithPackages;
-
-  # TODO: Learn more about melpa versus elpa to have a preference.
   wpcarrosEmacs = emacsWithPackages (epkgs:
     (with epkgs.elpaPackages; [
       exwm
@@ -25,7 +18,7 @@ let
       ivy-pass
       clipmon # TODO: Prefer an Emacs client for clipmenud.
       protobuf-mode # TODO: Determine if this is coming from google-emacs.
-      docker
+      # docker
       evil
       evil-collection
       evil-magit
@@ -78,7 +71,7 @@ let
       company-lsp
       suggest
       paradox
-      emr
+      # emr
       flymake-shellcheck
       fish-mode
       tuareg
@@ -97,23 +90,26 @@ let
       magit
     ]) ++
 
-    # tazjin's packages
-    (with tazjinsPkgs.tools.emacs-pkgs; [
+    (with depot.tools.emacs-pkgs; [
       dottime
       term-switcher
     ]));
 
 # TODO: Do I need `pkgs.lib.fix`?
 in pkgs.lib.fix(self: l: f: pkgs.writeShellScriptBin "wpcarros-emacs" ''
+   # TODO: Is this the best way to handle environment variables using Nix?
+   export BRIEFCASE=$HOME/briefcase
+   export DEPOT=$HOME/depot
+
    export PATH="${emacsBinPath}:$PATH"
    exec ${wpcarrosEmacs}/bin/emacs \
      --debug-init \
      --no-site-file \
      --no-site-lisp \
-     --directory ${ ./configs/shared/emacs.d/vendor } \
-     --directory ${ ./configs/shared/emacs.d/wpc } \
-     --directory ${ ./configs/shared/emacs.d/wpc/packages } \
-     --load ${ ./configs/shared/emacs.d/init.el } \
+     --directory ${ ./.emacs.d/vendor } \
+     --directory ${ ./.emacs.d/wpc } \
+     --load ${ ./.emacs.d/wpc/wpc-package.el } \
+     --load ${ ./.emacs.d/init.el } \
      --no-init-file $@
 '' // {
   # TODO: Ascertain whether I need this.
@@ -122,19 +118,23 @@ in pkgs.lib.fix(self: l: f: pkgs.writeShellScriptBin "wpcarros-emacs" ''
   # Call with a local.el file containing local system configuration.
   withLocalConfig = confDir: self confDir f;
 
-  # This accepts the path to a non-Nix built Emacs, so that X and GL linkage
-  # behaves as expected.
+  # This accepts the path to an Emacs binary outside of /nix/store. On gLinux,
+  # this will ensure that X and GL linkage behaves as expected.
   withLocalEmacs = emacsBin: pkgs.writeShellScriptBin "wpcarros-emacs" ''
+    # TODO: Is this the best way to handle environment variables using Nix?
+    export BRIEFCASE=$HOME/briefcase
+    export DEPOT=$HOME/depot
+
     export PATH="${emacsBinPath}:$PATH"
     export EMACSLOADPATH="${wpcarrosEmacs.deps}/share/emacs/site-lisp:"
     exec ${emacsBin} \
       --debug-init \
       --no-site-file \
       --no-site-lisp \
-      --directory ${ ./configs/shared/emacs.d/vendor } \
-      --directory ${ ./configs/shared/emacs.d/wpc } \
-      --directory ${ ./configs/shared/emacs.d/wpc/packages } \
-      --load ${ ./configs/shared/emacs.d/init.el } \
+      --directory ${ ./.emacs.d/vendor } \
+      --directory ${ ./.emacs.d/wpc } \
+     --load ${ ./.emacs.d/wpc/wpc-package.el } \
+     --load ${ ./.emacs.d/init.el } \
       --no-init-file $@
   '';
-}) null identity
+}) null utils.identity
diff --git a/utils.nix b/utils.nix
new file mode 100644
index 000000000000..1e1c5c243521
--- /dev/null
+++ b/utils.nix
@@ -0,0 +1,5 @@
+# Using this as a library to define some common utility functions that I often
+# reach for.
+{
+  identity = x: x;
+}