mirror of
https://github.com/ryan4yin/nix-config.git
synced 2026-07-12 15:42:39 +02:00
fix: emacs - failed to start in daemon mode
This commit is contained in:
@@ -24,6 +24,9 @@ with lib; let
|
|||||||
};
|
};
|
||||||
librime-dir = "${config.xdg.dataHome}/emacs/librime";
|
librime-dir = "${config.xdg.dataHome}/emacs/librime";
|
||||||
parinfer-rust-lib-dir = "${config.xdg.dataHome}/emacs/parinfer-rust";
|
parinfer-rust-lib-dir = "${config.xdg.dataHome}/emacs/parinfer-rust";
|
||||||
|
myEmacsPackagesFor = emacs: ((pkgs.emacsPackagesFor emacs).emacsWithPackages (epkgs: [
|
||||||
|
epkgs.vterm
|
||||||
|
]));
|
||||||
in {
|
in {
|
||||||
options.modules.editors.emacs = {
|
options.modules.editors.emacs = {
|
||||||
enable = mkEnableOption "Emacs Editor";
|
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.
|
# 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.
|
# pgtk (pure gtk) build add native support for wayland.
|
||||||
# https://www.gnu.org/savannah-checkouts/gnu/emacs/emacs.html#Releases
|
# 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 {
|
in {
|
||||||
home.packages = [emacsPkg];
|
home.packages = [emacsPkg];
|
||||||
services.emacs = {
|
services.emacs = {
|
||||||
@@ -111,7 +114,7 @@ in {
|
|||||||
let
|
let
|
||||||
# macport adds some native features based on GNU Emacs 29
|
# macport adds some native features based on GNU Emacs 29
|
||||||
# https://bitbucket.org/mituharu/emacs-mac/src/master/README-mac
|
# 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 {
|
in {
|
||||||
home.packages = [emacsPkg];
|
home.packages = [emacsPkg];
|
||||||
launchd.enable = true;
|
launchd.enable = true;
|
||||||
|
|||||||
@@ -34,7 +34,7 @@
|
|||||||
doom ; what makes DOOM look the way it does
|
doom ; what makes DOOM look the way it does
|
||||||
doom-dashboard ; a nifty splash screen for Emacs
|
doom-dashboard ; a nifty splash screen for Emacs
|
||||||
;;doom-quit ; DOOM quit-message prompts when you quit 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
|
hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
|
||||||
indent-guides ; highlighted indent columns
|
indent-guides ; highlighted indent columns
|
||||||
|
|||||||
Reference in New Issue
Block a user