summary refs log tree commit diff
diff options
context:
space:
mode:
authorFranck Cuny <franck.cuny@gmail.com>2016-10-14 14:23:25 -0700
committerFranck Cuny <franck.cuny@gmail.com>2016-10-14 14:23:25 -0700
commitbdfc592a37dd3103578f381b0acd7b888b893f1d (patch)
tree81c23ab411845b362702191596fced59bc8c600b
parent[bash] Remove a couple of aliases. (diff)
downloademacs.d-bdfc592a37dd3103578f381b0acd7b888b893f1d.tar.gz
[emacs] Copy more environment variables.
For the linter in puppet to work correctly, we need to copy the
environment variables for GEM and so on.
Diffstat (limited to '')
-rw-r--r--emacs.d/init.el8
1 files changed, 6 insertions, 2 deletions
diff --git a/emacs.d/init.el b/emacs.d/init.el
index 7661aa0..fdddbc1 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -42,11 +42,15 @@
   :config
   (setq dired-listing-switches "-laGhv"))
 
+;; environment fixup for macOS.
 (use-package exec-path-from-shell
   :ensure t
+  :if (and (eq system-type 'darwin) (display-graphic-p))
   :config
-  (when (memq window-system '(mac ns))
-    (exec-path-from-shell-initialize)))
+  (progn
+    (setq exec-path-from-shell-arguments '("-l"))
+    (exec-path-from-shell-initialize)
+    (exec-path-from-shell-copy-envs '("PATH" "GOROOT" "GOPATH" "GEM_HOME" "GEM_PATH" "MY_RUBY_HOME"))))
 
 (use-package flycheck
   :ensure t