1 files changed, 27 insertions(+), 26 deletions(-)

M init.el

@@ 165,32 165,33 @@
 ;;     (lambda (&rest args) (my/adjust-shift-widths ,variable))))
 
 ;; ENV
-(my-use-package exec-path-from-shell
-  :ensure t
-  :demand t
-  :custom
-  (exec-path-from-shell-shell-name (getenv "SHELL"))
-  ; (exec-path-from-shell-arguments "-l -i") ; Set by default for bash, zsh etc.
-  (exec-path-from-shell-variables
-   '("PATH"
-     "MANPATH"
-     "INFOPATH"
-     "CXX"
-     "CC"
-     "XDG_CONFIG_HOME"
-     "XDG_CACHE_HOME"
-     "XDG_DATA_HOME"
-     "NIX_PATH"
-     "GUILE_LOAD_PATH"
-     "GUILE_LOAD_COMPILED_PATH"))
-  :config
-  (setenv "SHLVL" "0")
-  (unless (memq system-type '(windows-nt android))
-    (exec-path-from-shell-initialize))
-  ;; This is for Matlab + my WM without reparenting.
-  ;; This cannot be sourced from the env, as the script that adds
-  ;; this environment, is not part of shell initialization
-  (setenv "_JAVA_AWT_WM_NONREPARENTING" "1"))
+(unless (getenv "EMACS_NO_SHELL_ENV")
+  (my-use-package exec-path-from-shell
+    :ensure t
+    :demand t
+    :custom
+    (exec-path-from-shell-shell-name (getenv "SHELL"))
+                                        ; (exec-path-from-shell-arguments "-l -i") ; Set by default for bash, zsh etc.
+    (exec-path-from-shell-variables
+     '("PATH"
+       "MANPATH"
+       "INFOPATH"
+       "CXX"
+       "CC"
+       "XDG_CONFIG_HOME"
+       "XDG_CACHE_HOME"
+       "XDG_DATA_HOME"
+       "NIX_PATH"
+       "GUILE_LOAD_PATH"
+       "GUILE_LOAD_COMPILED_PATH"))
+    :config
+    (setenv "SHLVL" "0")
+    (unless (memq system-type '(windows-nt android))
+      (exec-path-from-shell-initialize))
+    ;; This is for Matlab + my WM without reparenting.
+    ;; This cannot be sourced from the env, as the script that adds
+    ;; this environment, is not part of shell initialization
+    (setenv "_JAVA_AWT_WM_NONREPARENTING" "1")))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;