diff --git a/home/base/desktop/editors/emacs/README.md b/home/base/desktop/editors/emacs/README.md index d9ef7acf..b4350c3e 100644 --- a/home/base/desktop/editors/emacs/README.md +++ b/home/base/desktop/editors/emacs/README.md @@ -1,6 +1,7 @@ # Emacs Editor - Framework: + - key bindings: - Chinese(rime) support: - modal editing: - : evil mode, enabled by default in doom-emacs. diff --git a/home/base/desktop/editors/emacs/default.nix b/home/base/desktop/editors/emacs/default.nix index 963b6483..a2fc3815 100644 --- a/home/base/desktop/editors/emacs/default.nix +++ b/home/base/desktop/editors/emacs/default.nix @@ -16,7 +16,7 @@ with lib; let cfg = config.modules.editors.emacs; envExtra = '' - export PATH="${config.xdg.cacheHome}/emacs/bin:$PATH" + export PATH="${config.xdg.configHome}/emacs/bin:$PATH" ''; shellAliases = { e = "emacs"; @@ -37,6 +37,9 @@ in { ((emacsPackagesFor emacs-unstable-nox).emacsWithPackages (epkgs: [ epkgs.vterm + # https://github.com/NixOS/nixpkgs/blob/nixos-23.11/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix#L488-L498 + # failed to build on macOS Apple Silicon + (if pkgs.stdenv.isLinux then epkgs.rime else nil) ])) emacs-all-the-icons-fonts diff --git a/home/base/desktop/editors/emacs/doom/init.el b/home/base/desktop/editors/emacs/doom/init.el index 0a16e482..cd15c61e 100644 --- a/home/base/desktop/editors/emacs/doom/init.el +++ b/home/base/desktop/editors/emacs/doom/init.el @@ -16,7 +16,8 @@ (doom! :input ;;bidi ; (tfel ot) thgir etirw uoy gnipleh - (chinese +rime) + ;; failed to build emacs-rime on macOS + (:if IS-LINUX (chinese +rime) chinese) ;;japanese ;;layout ; auie,ctsrnm is the superior home row