From 9ecad315b596abb9fbaf35ecfc608a5ad6415565 Mon Sep 17 00:00:00 2001
From: trogloxene <gaozhuolang123654@qq.com>
Date: Thu, 2 Apr 2026 06:35:00 +0800
Subject: [PATCH] Config: delay theme loading until frame creation for daemon
 mode

---
 early-init.el    |  2 ++
 lisp/init-org.el |  1 +
 lisp/init-ui.el  | 10 ++++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/early-init.el b/early-init.el
index 898b728..6039657 100644
--- a/early-init.el
+++ b/early-init.el
@@ -21,4 +21,6 @@
 ;; 之后新建的窗口也默认最大化
 (add-to-list 'default-frame-alist '(fullscreen . maximized))
 
+(setq frame-background-mode 'dark)
+
 ;;; early-init.el ends here
diff --git a/lisp/init-org.el b/lisp/init-org.el
index 8c27a87..aac8854 100644
--- a/lisp/init-org.el
+++ b/lisp/init-org.el
@@ -156,6 +156,7 @@
 (when *is-windows*
   (with-eval-after-load 'org
     (setq org-agenda-files '("d:/emacs/hugo/this-is-my-blog/all-blog.org"
+			     "d:/emacs/my-org-daily/"
 			     "d:/emacs/my-org-daily/"))))
 (when *is-mac*
   (with-eval-after-load 'org
diff --git a/lisp/init-ui.el b/lisp/init-ui.el
index b7e9582..9ea05d7 100644
--- a/lisp/init-ui.el
+++ b/lisp/init-ui.el
@@ -44,13 +44,19 @@
 
 ;; 安装solarized dark
 (use-package solarized-theme)
-(load-theme 'my-base16-dark t)
+
+;; 把主题加载延迟到frame创建之后，防止daemon模式下宏不能正常展开
+(if (daemonp)
+    (add-hook 'after-make-frame-functions
+              (lambda (frame)
+                (with-selected-frame frame
+                  (load-theme 'my-base16-dark t))))
+  (load-theme 'my-base16-dark t))
 
 ;; 很多主题
 (use-package doom-themes)
 (use-package color-theme-modern)
 (use-package naysayer-theme)
-(use-package base16-theme)
 
 ;; 安装smart-mode-line
 (use-package smart-mode-line