diff --git a/core/core-os.el b/core/core-os.el
index 8ced59f0d..d1f171604 100644
--- a/core/core-os.el
+++ b/core/core-os.el
@@ -36,6 +36,9 @@
               ;; environment, so envvars will be wrong. That includes the PATH
               ;; Emacs picks up. `exec-path-from-shell' fixes this.
               (when (require 'exec-path-from-shell nil t)
+                (def-setting! :env (&rest vars)
+                  "Ensure VARs are grabbed from your shell environment."
+                  `(nconc exec-path-from-shell-variables (list ,@vars)))
                 (setq exec-path-from-shell-check-startup-files nil
                       exec-path-from-shell-arguments (delete "-i" exec-path-from-shell-arguments))
                 (defvaralias 'exec-path-from-shell-debug 'doom-debug-mode)
diff --git a/modules/lang/go/config.el b/modules/lang/go/config.el
index cd655e9ef..d9a0d040f 100644
--- a/modules/lang/go/config.el
+++ b/modules/lang/go/config.el
@@ -1,5 +1,7 @@
 ;;; lang/go/config.el -*- lexical-binding: t; -*-
 
+(set! :env "GOPATH" "GOROOT")
+
 (def-package! go-mode
   :mode "\\.go$"
   :interpreter "go"
diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el
index 334968423..600554ad2 100644
--- a/modules/lang/python/config.el
+++ b/modules/lang/python/config.el
@@ -1,5 +1,7 @@
 ;;; lang/python/config.el -*- lexical-binding: t; -*-
 
+(set! :env "PYTHONPATH" "PYENV_ROOT")
+
 (defvar +python-pyenv-root nil
   "The path to pyenv's root directory. This is automatically set when `python'
 is loaded.")