3 files changed, 36 insertions, 0 deletions
diff --git a/users/glittershark/emacs.d/config.el b/users/glittershark/emacs.d/config.el
index a14e4f0e3ba1..fd6eced21249 100644
--- a/users/glittershark/emacs.d/config.el
+++ b/users/glittershark/emacs.d/config.el
@@ -34,6 +34,7 @@
 (load! "lisp")
 (load! "clojure")
 (load! "rust")
+(load! "terraform")
 
 (require 'tvl)
 
diff --git a/users/glittershark/emacs.d/snippets/terraform-mode/variable b/users/glittershark/emacs.d/snippets/terraform-mode/variable
new file mode 100644
index 000000000000..e64175200f44
--- /dev/null
+++ b/users/glittershark/emacs.d/snippets/terraform-mode/variable
@@ -0,0 +1,11 @@
+# -*- mode: snippet -*-
+# name: variable
+# uuid:
+# key: var
+# condition: t
+# --
+variable "${1:name}" {
+  type = ${2:string}
+  ${3:default = ${4:default}}
+}
+$0
\ No newline at end of file
diff --git a/users/glittershark/emacs.d/terraform.el b/users/glittershark/emacs.d/terraform.el
new file mode 100644
index 000000000000..6a1dc4ba47cc
--- /dev/null
+++ b/users/glittershark/emacs.d/terraform.el
@@ -0,0 +1,24 @@
+;;; ../code/depot/users/glittershark/emacs.d/terraform.el -*- lexical-binding: t; -*-
+
+(add-hook 'terraform-mode-hook #'terraform-format-on-save-mode)
+
+(defun packer-format-buffer ()
+  (interactive)
+  (let ((buf (get-buffer-create "*packer-fmt*")))
+    (if (zerop (call-process "packer" nil buf nil "fmt" (buffer-file-name)))
+        (revert-buffer t t t)
+      (message "packer fmt failed: %s" (with-current-buffer buf (buffer-string))))))
+
+(define-minor-mode packer-format-on-save-mode
+  "Run packer-format-buffer before saving the current buffer"
+  :lighter nil
+  (if packer-format-on-save-mode
+      (add-hook 'before-save-hook #'packer-format-buffer nil t)
+    (remove-hook 'before-save-hook #'packer-format-buffer t)))
+
+(defun maybe-init-packer ()
+  (interactive)
+  (when (s-ends-with-p ".pkr" (file-name-base (buffer-file-name)))
+    (packer-format-on-save-mode)))
+
+(add-hook 'hcl-mode-hook #'maybe-init-packer)