feat: use emacs29-pgtk on NixOS, and emacs29-macport for macOS

This commit is contained in:
Ryan Yin
2024-01-06 17:58:18 +08:00
parent 292809783d
commit daa883caf8
2 changed files with 18 additions and 14 deletions
+11 -10
View File
@@ -155,11 +155,11 @@ fmt:
# format the nix files in this repo # format the nix files in this repo
nix fmt nix fmt
test-nvim: nvim-test:
rm -rf $"($env.HOME)/.config/astronvim/lua/user" rm -rf $"($env.HOME)/.config/astronvim/lua/user"
rsync -avz --copy-links --chmod=D2755,F744 home/base/desktop/editors/neovim/astronvim_user/ $"($env.HOME)/.config/astronvim/lua/user" rsync -avz --copy-links --chmod=D2755,F744 home/base/desktop/editors/neovim/astronvim_user/ $"($env.HOME)/.config/astronvim/lua/user"
test-nvim-clean: nvim-clean:
rm -rf $"($env.HOME)/.config/astronvim/lua/user" rm -rf $"($env.HOME)/.config/astronvim/lua/user"
# ================================================= # =================================================
@@ -180,18 +180,19 @@ reload-emacs-cmd := if os() == "macos" {
+ "systemctl --user status emacs.service" + "systemctl --user status emacs.service"
} }
test-emacs: emacs-test:
rm -rf $"($env.HOME)/.config/doom" rm -rf $"($env.HOME)/.config/doom"
rsync -avz --copy-links --chmod=D2755,F744 home/base/desktop/editors/emacs/doom/ $"($env.HOME)/.config/doom" rsync -avz --copy-links --chmod=D2755,F744 home/base/desktop/editors/emacs/doom/ $"($env.HOME)/.config/doom"
doom sync doom sync
doom clean
emacs-clean:
rm -rf $"($env.HOME)/.config/doom/"
emacs-purge:
doom purge doom purge
doom clean doom clean
doom sync doom sync
emacs-reload:
{{reload-emacs-cmd}} {{reload-emacs-cmd}}
reload-emacs:
{{reload-emacs-cmd}}
test-emacs-clean:
rm -rf $"($env.HOME)/.config/doom/"
+7 -4
View File
@@ -78,9 +78,11 @@ in {
} }
(mkIf pkgs.stdenv.isLinux ( (mkIf pkgs.stdenv.isLinux (
# Do not use emacs-nox here, which makes the mouse wheel work abnormally in terminal mode.
let let
emacsPkg = pkgs.emacs29; # 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.emacs29-pgtk;
in { in {
home.packages = [emacsPkg]; home.packages = [emacsPkg];
services.emacs = { services.emacs = {
@@ -92,9 +94,10 @@ in {
)) ))
(mkIf pkgs.stdenv.isDarwin ( (mkIf pkgs.stdenv.isDarwin (
# Do not use emacs-nox here, which makes the mouse wheel work abnormally in terminal mode.
let let
emacsPkg = pkgs.emacs29; # macport adds some native features based on GNU Emacs 29
# https://bitbucket.org/mituharu/emacs-mac/src/master/README-mac
emacsPkg = pkgs.emacs29-macport;
in { in {
home.packages = [emacsPkg]; home.packages = [emacsPkg];
launchd.enable = true; launchd.enable = true;