From bed0d1acdc205994c0be0ce2df7c80a4bf456db0 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Tue, 2 Jan 2024 22:48:11 +0800 Subject: [PATCH] fix: remove emacs-rime - failed to build in both nixos & darwin --- home/base/desktop/editors/emacs/default.nix | 4 +--- home/base/desktop/editors/emacs/doom/init.el | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/home/base/desktop/editors/emacs/default.nix b/home/base/desktop/editors/emacs/default.nix index a2fc3815..98cba801 100644 --- a/home/base/desktop/editors/emacs/default.nix +++ b/home/base/desktop/editors/emacs/default.nix @@ -37,10 +37,8 @@ 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) ])) + librime emacs-all-the-icons-fonts ## Doom dependencies diff --git a/home/base/desktop/editors/emacs/doom/init.el b/home/base/desktop/editors/emacs/doom/init.el index 9e743e45..ebc3164d 100644 --- a/home/base/desktop/editors/emacs/doom/init.el +++ b/home/base/desktop/editors/emacs/doom/init.el @@ -16,8 +16,7 @@ (doom! :input ;;bidi ; (tfel ot) thgir etirw uoy gnipleh - ;; failed to build emacs-rime on macOS - (:if IS-LINUX (chinese +rime) chinese) + chinese ; TODO: use (chinese +rime) ;;japanese ;;layout ; auie,ctsrnm is the superior home row