From 49e3b91e7e2920c5dc7f630d94d263b5695d5b19 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 7 Jan 2024 22:56:12 +0800
Subject: [PATCH] fix: emacs - failed to start in daemon mode

---
 home/base/desktop/editors/emacs/default.nix  | 7 +++++--
 home/base/desktop/editors/emacs/doom/init.el | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/home/base/desktop/editors/emacs/default.nix b/home/base/desktop/editors/emacs/default.nix
index ac5c7315..2d2f6783 100644
--- a/home/base/desktop/editors/emacs/default.nix
+++ b/home/base/desktop/editors/emacs/default.nix
@@ -24,6 +24,9 @@ with lib; let
   };
   librime-dir = "${config.xdg.dataHome}/emacs/librime";
   parinfer-rust-lib-dir = "${config.xdg.dataHome}/emacs/parinfer-rust";
+  myEmacsPackagesFor = emacs: ((pkgs.emacsPackagesFor emacs).emacsWithPackages (epkgs: [
+    epkgs.vterm
+  ]));
 in {
   options.modules.editors.emacs = {
     enable = mkEnableOption "Emacs Editor";
@@ -92,7 +95,7 @@ in {
         # Do not use emacs-nox here, which makes the mouse wheel work abnormally in terminal mode.
         # pgtk (pure gtk) build add native support for wayland.
         # https://www.gnu.org/savannah-checkouts/gnu/emacs/emacs.html#Releases
-        emacsPkg = (pkgs.emacsPackagesFor pkgs.emacs29-pgtk).emacsWithPackages (epkgs: [epkgs.vterm]);
+        emacsPkg = myEmacsPackagesFor pkgs.emacs29-pgtk;
       in {
         home.packages = [emacsPkg];
         services.emacs = {
@@ -111,7 +114,7 @@ in {
       let
         # macport adds some native features based on GNU Emacs 29
         # https://bitbucket.org/mituharu/emacs-mac/src/master/README-mac
-        emacsPkg = (pkgs.emacsPackagesFor pkgs.emacs29-macport).emacsWithPackages (epkgs: [epkgs.vterm]);
+        emacsPkg = myEmacsPackagesFor pkgs.emacs29-macport;
       in {
         home.packages = [emacsPkg];
         launchd.enable = true;
diff --git a/home/base/desktop/editors/emacs/doom/init.el b/home/base/desktop/editors/emacs/doom/init.el
index a4fa2b6a..4bd47a37 100644
--- a/home/base/desktop/editors/emacs/doom/init.el
+++ b/home/base/desktop/editors/emacs/doom/init.el
@@ -34,7 +34,7 @@
        doom                             ; what makes DOOM look the way it does
        doom-dashboard                   ; a nifty splash screen for Emacs
        ;;doom-quit         ; DOOM quit-message prompts when you quit Emacs
-       (emoji +unicode)
+       ;; (emoji +unicode) ; Emacs 29 provides native support for inserting Unicode emojis.
                                         ; 🙂
        hl-todo            ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
        indent-guides      ; highlighted indent columns