darwin/emacs: Tweak when the server is started

Only start the server if it is not running already and the current
display is a graphical display.

2 files changed, 10 insertions, 9 deletions

diff --git a/dotfiles-darwin/emacs/init.el b/dotfiles-darwin/emacs/init.el
index dc78758..b0ef91a 100644
--- a/dotfiles-darwin/emacs/init.el
+++ b/dotfiles-darwin/emacs/init.el
@@ -15,6 +15,16 @@
   :custom (org-roam-directory "~/Documents/ZK/"))
 
 
+;; Server
+
+(use-package server
+  :config
+  (defun my/server-start ()
+    (when (and (display-graphic-p) (not (server-running-p)))
+      (server-start)))
+  :hook (after-init . my/server-start))
+
+
 ;; Theme Management
 
 (when (or window-system (daemonp))
diff --git a/emacs/init.el b/emacs/init.el
index d1652ea..fe0cbff 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -48,15 +48,6 @@
 
 (use-package marginalia :config (marginalia-mode 1) :ensure t)
 
-(advice-add #'server-start :around
-            #'(lambda (orig &rest args)
-                (let ((socket (expand-file-name server-name server-socket-dir)))
-                  (unless (and (boundp 'server-process)
-                               (file-readable-p socket))
-                    (apply orig args)))))
-
-(add-hook 'after-init-hook #'server-start)
-
 
 ;; Buffer Management