all repos — nixfiles @ 4d02c68db272b0585ea3db2aa358ded296dbe7e9

System and user configuration, managed by nix and home-manager

Emacs: use commercial-emacs (currently without tree-sitter)

Alan Pearce
commit

4d02c68db272b0585ea3db2aa358ded296dbe7e9

parent

b20f4ef30f9f0affd761f92e5759e673c69fba6a

1 file changed, 4 insertions(+), 4 deletions(-)

changed files
M user/settings/emacs.nix → user/settings/emacs.nix
@@ -47,7 +47,7 @@ ];
 
   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 @@ [
         ace-link
         apheleia
         avy
-        benchmark-init
         capf-autosuggest
         clojure-mode
         company

@@ -182,8 +181,9 @@ ]);
     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"))