Skip to content

Commit

Permalink
Revert "emacs: remove exec-path-from-shell"
Browse files Browse the repository at this point in the history
This reverts commit fc814f4.
  • Loading branch information
willbush committed Jul 28, 2024
1 parent 99160c3 commit c998482
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 0 deletions.
4 changes: 4 additions & 0 deletions configs/emacs/default/modules/init-misc-tools.el
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,10 @@
vterm-buffer-name-string "vterm %s"))


(use-package exec-path-from-shell
:commands exec-path-from-shell-copy-env)


(use-package gptel
:config
(require 'gptel-curl)
Expand Down
5 changes: 5 additions & 0 deletions configs/emacs/default/modules/init-prog-tools.el
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ _r_: Restart _x_: Eval Expression _s_: Select Stack
(evil-set-initial-state 'magit-stash-mode 'normal)
(evil-set-initial-state 'magit-process-mode 'normal)
:config
;; when using ssh for git authentication and this environmental variable is
;; not set, magit complains about being unable to read or have access rights
;; while git works fine in the terminal.
(exec-path-from-shell-copy-env "SSH_AUTH_SOCK")

;; I bind my own magit dispatch commands here.
(transient-define-prefix my/magit-dispatch ()
"Invoke a Magit command from a list of available commands."
Expand Down
1 change: 1 addition & 0 deletions profiles/home/emacs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@
evil-surround
evil-traces
evil-visualstar
exec-path-from-shell
expand-region
format-all
gcmh
Expand Down

0 comments on commit c998482

Please sign in to comment.