From 4d02c68db272b0585ea3db2aa358ded296dbe7e9 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 28 Jun 2023 09:14:19 +0200
Subject: Emacs: use commercial-emacs (currently without tree-sitter)

---
 user/settings/darwin.nix | 2 +-
 user/settings/emacs.nix  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'user/settings')

diff --git a/user/settings/darwin.nix b/user/settings/darwin.nix
index 699caa40..64c989e8 100644
--- a/user/settings/darwin.nix
+++ b/user/settings/darwin.nix
@@ -43,7 +43,7 @@
     darwin.trash
   ];
 
-  programs.emacs.package = pkgs.emacs;
+  programs.emacs.package = pkgs.commercial-emacs;
 
   home.file.".hushlogin".text = "";
 
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index b44409ec..ea042814 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -47,7 +47,7 @@ in
 
   programs.emacs = {
     enable = true;
-    package = lib.mkDefault (pkgs.emacs.override { withGTK3 = true; });
+    package = lib.mkDefault (pkgs.commercial-emacs);
     overrides = self: super: (
       {
         consult-ghq = super.consult-ghq.overrideAttrs
@@ -97,7 +97,6 @@ in
         ace-link
         apheleia
         avy
-        benchmark-init
         capf-autosuggest
         clojure-mode
         company
@@ -182,8 +181,9 @@ in
     extraConfig = ''
       (with-eval-after-load 'editorconfig
         (setq editorconfig-exec-path "${pkgs.editorconfig-core-c}/bin/editorconfig"))
-      (setq native-compile-target-directory "${nativeCompileDirectory}")
-      (add-to-list 'native-comp-eln-load-path "${nativeCompileDirectory}" :append)
+      (when (featurep 'native-compile)
+        (setq native-compile-target-directory "${nativeCompileDirectory}")
+        (add-to-list 'native-comp-eln-load-path "${nativeCompileDirectory}" :append))
     '' + lib.optionalString stdenv.isDarwin ''
       (with-eval-after-load 'files
         (setq insert-directory-program "${pkgs.coreutils-prefixed}/bin/gls"))
-- 
cgit 1.4.1