summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.gitmodules3
-rw-r--r--init.org19
m---------lib/exec-path-from-shell0
3 files changed, 12 insertions, 10 deletions
diff --git a/.gitmodules b/.gitmodules
index 6a5b74d..2ce5dbb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,6 +28,9 @@
[submodule "epkg"]
path = lib/epkg
url = git@github.com:emacscollective/epkg.git
+[submodule "exec-path-from-shell"]
+ path = lib/exec-path-from-shell
+ url = git@github.com:purcell/exec-path-from-shell.git
[submodule "ghub"]
path = lib/ghub
url = git@github.com:magit/ghub.git
diff --git a/init.org b/init.org
index 88f5e24..55e8269 100644
--- a/init.org
+++ b/init.org
@@ -264,7 +264,6 @@ contain the mess.
`((".*" ,(no-littering-expand-var-file-name "auto-save/") t))))
#+end_src
-
** Custom file (=custom.el=)
I'm not planning on using the custom file much, but even so, I
@@ -287,15 +286,15 @@ Let's use [[https://github.com/purcell/exec-path-from-shell][exec-path-from-shel
in my shell.
#+begin_src emacs-lisp
-;; (use-package exec-path-from-shell
-;; :defer 1
-;; :init
-;; (setq exec-path-from-shell-check-startup-files nil)
-;; :config
-;; (exec-path-from-shell-initialize)
-;; ;; while we're at it, let's fix access to our running ssh-agent
-;; (exec-path-from-shell-copy-env "SSH_AGENT_PID")
-;; (exec-path-from-shell-copy-env "SSH_AUTH_SOCK"))
+(use-package exec-path-from-shell
+ :defer 1
+ :init
+ (setq exec-path-from-shell-check-startup-files nil)
+ :config
+ (exec-path-from-shell-initialize)
+ ;; while we're at it, let's fix access to our running ssh-agent
+ (exec-path-from-shell-copy-env "SSH_AGENT_PID")
+ (exec-path-from-shell-copy-env "SSH_AUTH_SOCK"))
#+end_src
** Server
diff --git a/lib/exec-path-from-shell b/lib/exec-path-from-shell
new file mode 160000
+Subproject 54ea2f9c3c81d18b96e4d33c4c547e02eee420d