From fddc912f81ce546fc3d105c99a6748b1e00ce23a Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Thu, 20 Jun 2024 17:37:14 -0400
Subject: [PATCH] fix(tabs): defer centaur-tabs-mode in daemon sessions

Fix: #6647
Fix: #7477
Close: #7276
---
 modules/ui/tabs/config.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/ui/tabs/config.el b/modules/ui/tabs/config.el
index baa8e3219..8ff2dc590 100644
--- a/modules/ui/tabs/config.el
+++ b/modules/ui/tabs/config.el
@@ -10,7 +10,7 @@
 ;;; Packages
 
 (use-package! centaur-tabs
-  :hook (doom-first-file . centaur-tabs-mode)
+  :defer t
   :init
   (setq centaur-tabs-set-icons t
         centaur-tabs-gray-out-icons 'buffer
@@ -24,6 +24,10 @@
         ;; prevents that.
         centaur-tabs-cycle-scope 'tabs)
 
+  (if (daemonp)
+      (add-hook 'server-after-make-frame-hook #'centaur-tabs-mode)
+    (add-hook 'doom-first-file-hook #'centaur-tabs-mode))
+
   :config
   (add-hook! '(+doom-dashboard-mode-hook +popup-buffer-mode-hook)
     (defun +tabs-disable-centaur-tabs-mode-maybe-h ()