summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--init.org24
1 files changed, 13 insertions, 11 deletions
diff --git a/init.org b/init.org
index c440a9a..928d4b4 100644
--- a/init.org
+++ b/init.org
@@ -1282,10 +1282,23 @@ Enable eglot and tree-sitter when working with python.
     (setq mac-allow-anti-aliasing t)))
 #+end_src
 
+** path setup
+This needs to be done before we configure =magit=. If done later, on MacOS, and I'm running =nix=, for some reasons emacs try to pick =git= from =/usr/bin/git= instead of =/Users/fcuny/.nix-profile/bin/git=.
+
+#+begin_src emacs-lisp
+(use-package exec-path-from-shell
+  :ensure t
+  :demand t
+  :if (memq window-system '(mac ns))
+  :config
+  (exec-path-from-shell-initialize))
+#+end_src
+
 ** magit
 
 #+begin_src emacs-lisp
   (use-package magit
+    :defer t
     :ensure t
     :bind (("C-x g" . magit-status)
            ("C-x G" . magit-status-with-prefix))
@@ -1800,17 +1813,6 @@ This is to make =org-mode= document looks a bit nicer.
     (shell-command-on-region start end "pandoc -f markdown -t org" t t)))
 #+end_src
 
-** path setup
-
-#+begin_src emacs-lisp
-(use-package exec-path-from-shell
-  :ensure t
-  :demand t
-  :if (memq window-system '(mac ns))
-  :config
-  (exec-path-from-shell-initialize))
-#+end_src
-
 ** project
 #+begin_src emacs-lisp
   (use-package project