settings: simplify server / exec-path-from-shell

1 files changed, 7 insertions, 7 deletions

diff --git a/emacs/custom/my-settings.el b/emacs/custom/my-settings.el
index a733004..534e564 100644
--- a/emacs/custom/my-settings.el
+++ b/emacs/custom/my-settings.el
@@ -51,15 +51,15 @@
   :config
   (midnight-mode t))
 
-(use-package server
-  :hook (after-init . server-start))
+(unless (and (fboundp 'server-running-p)
+             (server-running-p))
+  (server-start))
 
 (use-package exec-path-from-shell
-  :ensure t
-  :config
-  (progn
-    (when (memq window-system '(mac ns))
-      (exec-path-from-shell-initialize))))
+  :if (memq window-system '(mac ns))
+  :hook (emacs-startup . (lambda ()
+                           (setq exec-path-from-shell-arguments '("-l")) ; removed the -i for faster startup
+                           (exec-path-from-shell-initialize))))
 
 (provide 'my-settings)
 ;;; my-settings.el ends here