2 files changed, 5 insertions, 7 deletions
diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-golang.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-golang.el
index 819ff6ad39b2..47198c8e02a1 100644
--- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-golang.el
+++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-golang.el
@@ -23,11 +23,6 @@
 
 ;; TODO: Support jumping to go source code for fmt.Println, etc.
 
-;; I'm unsure if this belongs in wpc-golang.el because it's a generic setting,
-;; but because go is the first languages I've encountered that enforces tab
-;; usage (I think) I'm configuring it.
-(setq-default tab-width 4)
-
 (use-package go-mode
   :config
   (setq gofmt-command "goimports")
@@ -39,8 +34,8 @@
    "M-." #'godef-jump)
   ;; Support calling M-x `compile'.
   (add-hook 'go-mode-hook (lambda ()
-                            (set (make-local-variable 'compile-command)
-                                 "go build -v")))
+                            (setq-local tab-width 2)
+                            (setq-local compile-command "go build -v")))
   (macros-add-hook-before-save 'go-mode-hook #'gofmt-before-save))
 
 (provide 'wpc-golang)
diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-misc.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-misc.el
index ae976d243f72..1d90e26f701f 100644
--- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-misc.el
+++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-misc.el
@@ -191,6 +191,9 @@
 ;; ensure code wraps at 80 characters by default
 (setq-default fill-column 80)
 
+;; render tabs 2x-chars wide
+(setq tab-width 2)
+
 (put 'narrow-to-region 'disabled nil)
 
 ;; trim whitespace on save