diff options
| author | Case Duckworth | 2022-01-05 18:20:40 -0600 |
|---|---|---|
| committer | Case Duckworth | 2022-01-05 18:20:40 -0600 |
| commit | 5ccf1ad613cfa4ddcec8f747a44126cd3f929b47 (patch) | |
| tree | fc432714394b1163ca663202a53345471e03126a | |
| parent | Fix :setup form (diff) | |
| download | emacs-5ccf1ad613cfa4ddcec8f747a44126cd3f929b47.tar.gz emacs-5ccf1ad613cfa4ddcec8f747a44126cd3f929b47.zip | |
Require exec-path-from-shell
| -rw-r--r-- | early-init.el | 4 | ||||
| -rw-r--r-- | init.el | 1 |
2 files changed, 5 insertions, 0 deletions
| diff --git a/early-init.el b/early-init.el index 805bd61..2cfcb84 100644 --- a/early-init.el +++ b/early-init.el | |||
| @@ -151,6 +151,10 @@ See `no-littering' for examples.") | |||
| 151 | ;; Setup `setup' | 151 | ;; Setup `setup' |
| 152 | 152 | ||
| 153 | (add-to-list 'setup-modifier-list 'setup-wrap-to-demote-errors) | 153 | (add-to-list 'setup-modifier-list 'setup-wrap-to-demote-errors) |
| 154 | ;; (advice-add 'setup :before (defun +setup-before (&rest args) | ||
| 155 | ;; (message "Setup: %S" args))) | ||
| 156 | ;; (advice-add 'setup :after (defun +setup-after (&rest args) | ||
| 157 | ;; (message "Setup: %S...Done." args))) | ||
| 154 | 158 | ||
| 155 | ;;; Appendix | 159 | ;;; Appendix |
| 156 | 160 | ||
| diff --git a/init.el b/init.el index 526c867..5c3ed35 100644 --- a/init.el +++ b/init.el | |||
| @@ -917,6 +917,7 @@ See also `crux-reopen-as-root-mode'." | |||
| 917 | 917 | ||
| 918 | (setup (:straight-when exec-path-from-shell | 918 | (setup (:straight-when exec-path-from-shell |
| 919 | (eq system-system 'linux)) | 919 | (eq system-system 'linux)) |
| 920 | (require 'exec-path-from-shell) | ||
| 920 | (dolist (var '("SSH_AUTH_SOCK" | 921 | (dolist (var '("SSH_AUTH_SOCK" |
| 921 | "SSH_AGENT_PID" | 922 | "SSH_AGENT_PID" |
| 922 | "GPG_AGENT_INFO" | 923 | "GPG_AGENT_INFO" |