12 files changed, 41 insertions, 77 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 87e9a38dce8a..c5b873db17ce 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -40,8 +40,6 @@
 (require 'wpc-shell)
 (require 'wpc-lisp)
 (require 'wpc-haskell)
-(require 'wpc-reasonml)
-;; (require 'wpc-ocaml)
 (require 'wpc-elixir)
 (require 'wpc-nix)
 (require 'wpc-rust)
diff --git a/emacs/.emacs.d/wpc/wpc-misc.el b/emacs/.emacs.d/wpc/wpc-misc.el
index dfa86c2ae139..f3abc2162b0c 100644
--- a/emacs/.emacs.d/wpc/wpc-misc.el
+++ b/emacs/.emacs.d/wpc/wpc-misc.el
@@ -1,5 +1,9 @@
-;;; misc.el --- Hosting miscellaneous configuration -*- lexical-binding: t -*-
+;;; wpc-misc.el --- Hosting miscellaneous configuration -*- lexical-binding: t -*-
+
 ;; Author: William Carroll <wpcarro@gmail.com>
+;; Version: 0.0.1
+;; Package-Requires: ((emacs "25.1"))
+;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase
 
 ;;; Commentary:
 ;; This is the home of any configuration that couldn't find a better home.
@@ -196,11 +200,11 @@
 (setq vc-follow-symlinks t)
 
 ;; fullscreen settings
-(defvar ns-use-native-fullscreen nil)
+(setq ns-use-native-fullscreen nil)
 
 (use-package yasnippet
   :config
-  (setq yas-snippet-dirs '("~/.emacs.d/snippets/"))
+  (setq yas-snippet-dirs (list (f-join user-emacs-directory "snippets")))
   (yas-global-mode 1))
 
 (use-package projectile
diff --git a/emacs/.emacs.d/wpc/wpc-nix.el b/emacs/.emacs.d/wpc/wpc-nix.el
index 9269f0293c31..70df05b7141e 100644
--- a/emacs/.emacs.d/wpc/wpc-nix.el
+++ b/emacs/.emacs.d/wpc/wpc-nix.el
@@ -1,5 +1,9 @@
 ;;; wpc-nix.el --- Nix support -*- lexical-binding: t -*-
+
 ;; Author: William Carroll <wpcarro@gmail.com>
+;; Version: 0.0.1
+;; Package-Requires: ((emacs "25.1"))
+;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase
 
 ;;; Commentary:
 ;; Configuration to support working with Nix.
diff --git a/emacs/.emacs.d/wpc/wpc-ocaml.el b/emacs/.emacs.d/wpc/wpc-ocaml.el
deleted file mode 100644
index 6866652a50ed..000000000000
--- a/emacs/.emacs.d/wpc/wpc-ocaml.el
+++ /dev/null
@@ -1,41 +0,0 @@
-;;; wpc-ocaml.el --- My OCaml preferences -*- lexical-binding: t -*-
-;; Author: William Carroll <wpcarro@gmail.com>
-
-;;; Commentary:
-;; Tooling support for OCaml development.
-;;
-;; Dependencies:
-;; - `opam install tuareg`
-;; - `opam install merlin`
-;; - `opam install user-setup && opam user-setup install`
-;; - `opam install ocamlformat`
-
-;;; Code:
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Dependencies
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(require 'prelude)
-(require 'f)
-
-(defconst opam-user-setup
-  (f-join user-emacs-directory "opam-user-setup.el")
-  "File for the OPAM Emacs integration.")
-
-(prelude/assert (f-file? opam-user-setup))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Configuration
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(use-package tuareg
-  :config
-  (add-hook-before-save 'tuareg-mode-hook #'ocamlformat-before-save))
-
-;; ocamlformat
-(require 'opam-user-setup opam-user-setup)
-(require 'ocamlformat)
-
-(provide 'wpc-ocaml)
-;;; wpc-ocaml.el ends here
diff --git a/emacs/.emacs.d/wpc/wpc-org.el b/emacs/.emacs.d/wpc/wpc-org.el
index eac02d9716e1..e2fd9f9ee2d7 100644
--- a/emacs/.emacs.d/wpc/wpc-org.el
+++ b/emacs/.emacs.d/wpc/wpc-org.el
@@ -1,5 +1,9 @@
-;;; org.el --- My org preferences -*- lexical-binding: t -*-
+;;; wpc-org.el --- My org preferences -*- lexical-binding: t -*-
+
 ;; Author: William Carroll <wpcarro@gmail.com>
+;; Version: 0.0.1
+;; Package-Requires: ((emacs "24.1"))
+;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase
 
 ;;; Commentary:
 ;; Hosts my org mode preferences
diff --git a/emacs/.emacs.d/wpc/wpc-package.el b/emacs/.emacs.d/wpc/wpc-package.el
index 5fd7a89982fb..b6da5505f938 100644
--- a/emacs/.emacs.d/wpc/wpc-package.el
+++ b/emacs/.emacs.d/wpc/wpc-package.el
@@ -1,5 +1,9 @@
-;;; package.el --- My package configuration -*- lexical-binding: t -*-
+;;; wpc-package.el --- My package configuration -*- lexical-binding: t -*-
+
 ;; Author: William Carroll <wpcarro@gmail.com>
+;; Version: 0.0.1
+;; Package-Requires: ((emacs "24.1"))
+;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase
 
 ;;; Commentary:
 ;; This module hosts all of the settings required to work with ELPA,
diff --git a/emacs/.emacs.d/wpc/wpc-prolog.el b/emacs/.emacs.d/wpc/wpc-prolog.el
index 94e705b1b114..be3c0895e61d 100644
--- a/emacs/.emacs.d/wpc/wpc-prolog.el
+++ b/emacs/.emacs.d/wpc/wpc-prolog.el
@@ -1,5 +1,9 @@
 ;;; wpc-prolog.el --- For Prologging things -*- lexical-binding: t -*-
+
 ;; Author: William Carroll <wpcarro@gmail.com>
+;; Version: 0.0.1
+;; Package-Requires: ((emacs "24"))
+;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase
 
 ;;; Commentary:
 ;; Code configuring my Prolog work.
diff --git a/emacs/.emacs.d/wpc/wpc-python.el b/emacs/.emacs.d/wpc/wpc-python.el
index 25f1a4816a67..cd30f3ea3739 100644
--- a/emacs/.emacs.d/wpc/wpc-python.el
+++ b/emacs/.emacs.d/wpc/wpc-python.el
@@ -1,5 +1,9 @@
 ;;; wpc-python.el --- Python configuration -*- lexical-binding: t -*-
+
 ;; Author: William Carroll <wpcarro@gmail.com>
+;; Version: 0.0.1
+;; Package-Requires: ((emacs "24"))
+;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase
 
 ;;; Commentary:
 ;; My Python configuration settings
diff --git a/emacs/.emacs.d/wpc/wpc-reasonml.el b/emacs/.emacs.d/wpc/wpc-reasonml.el
deleted file mode 100644
index 909c33d121f7..000000000000
--- a/emacs/.emacs.d/wpc/wpc-reasonml.el
+++ /dev/null
@@ -1,29 +0,0 @@
-;;; wpc-reasonml.el --- My ReasonML preferences -*- lexical-binding: t -*-
-;; Author: William Carroll <wpcarro@gmail.com>
-
-;;; Commentary:
-;; Tooling support for ReasonML development.
-;;
-;; Dependencies:
-;; - `opam install tuareg`
-;; - `opam install merlin`
-;; - `opam install user-setup`
-;; - `opam install ocamlformat`
-
-;;; Code:
-
-;; ReasonML configuration
-(use-package reason-mode
-  :config
-  (add-hook-before-save 'reason-mode-hook #'refmt-before-save))
-
-;; ReasonML LSP configuration
-(lsp-register-client
- (make-lsp-client :new-connection (lsp-stdio-connection (f-full "~/programming/dependencies/reason-language-server"))
-                  :major-modes '(reason-mode)
-                  :notification-handlers (ht ("client/registerCapability" 'ignore))
-                  :priority 1
-                  :server-id 'reason-ls))
-
-(provide 'wpc-reasonml)
-;;; wpc-reasonml.el ends here
diff --git a/emacs/.emacs.d/wpc/wpc-rust.el b/emacs/.emacs.d/wpc/wpc-rust.el
index fafa27d18c77..f15c3d3c6b5b 100644
--- a/emacs/.emacs.d/wpc/wpc-rust.el
+++ b/emacs/.emacs.d/wpc/wpc-rust.el
@@ -1,5 +1,9 @@
 ;;; wpc-rust.el --- Support Rust language -*- lexical-binding: t -*-
+
 ;; Author: William Carroll <wpcarro@gmail.com>
+;; Version: 0.0.1
+;; Package-Requires: ((emacs "24"))
+;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase
 
 ;;; Commentary:
 ;; Supports my Rust work.
diff --git a/emacs/.emacs.d/wpc/wpc-shell.el b/emacs/.emacs.d/wpc/wpc-shell.el
index c132abd681fc..0cd376607190 100644
--- a/emacs/.emacs.d/wpc/wpc-shell.el
+++ b/emacs/.emacs.d/wpc/wpc-shell.el
@@ -1,5 +1,9 @@
 ;;; wpc-shell.el --- POSIX Shell scripting support -*- lexical-binding: t -*-
+
 ;; Author: William Carroll <wpcarro@gmail.com>
+;; Version: 0.0.1
+;; Package-Requires: ((emacs "24"))
+;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase
 
 ;;; Commentary:
 ;; Helpers for my shell scripting. Includes bash, zsh, etc.
diff --git a/emacs/.emacs.d/wpc/wpc-ui.el b/emacs/.emacs.d/wpc/wpc-ui.el
index 059bd17ce610..1dad4a0c32ba 100644
--- a/emacs/.emacs.d/wpc/wpc-ui.el
+++ b/emacs/.emacs.d/wpc/wpc-ui.el
@@ -1,5 +1,9 @@
 ;;; wpc-ui.el --- Any related to the UI/UX goes here -*- lexical-binding: t -*-
+
 ;; Author: William Carroll <wpcarro@gmail.com>
+;; Version: 0.0.1
+;; Package-Requires: ((emacs "24"))
+;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase
 
 ;;; Commentary:
 ;; Hosts font settings, scrolling, color schemes.