diff options
| author | Alan Pearce | 2024-05-25 05:39:51 +0200 |
|---|---|---|
| committer | Alan Pearce | 2024-05-25 05:39:51 +0200 |
| commit | daa739e6f5f1754d9861924018569131beb3bf88 (patch) | |
| tree | 1c7088802ed2c7d53065276be941e8eb6c589020 /user | |
| parent | b09a6d6d7894650331ec1e26de9daacac74cb3d4 (diff) | |
| download | nixfiles-daa739e6f5f1754d9861924018569131beb3bf88.tar.lz nixfiles-daa739e6f5f1754d9861924018569131beb3bf88.tar.zst nixfiles-daa739e6f5f1754d9861924018569131beb3bf88.zip | |
Emacs: set eln cache directory properly
1. It needs to be set in early-init.el 2. It should not be the last value of `native-comp-eln-load-path`, as that is expected to be a system directory
Diffstat (limited to 'user')
| -rw-r--r-- | user/emacs/early-init.el | 5 | ||||
| -rw-r--r-- | user/settings/emacs.nix | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/user/emacs/early-init.el b/user/emacs/early-init.el index 8617e3f2..d24c661d 100644 --- a/user/emacs/early-init.el +++ b/user/emacs/early-init.el @@ -4,6 +4,11 @@ frame-inhibit-implied-resize t byte-compile-warnings '(not free-vars unresolved noruntime lexical make-local cl-functions)) +(require 'xdg) +(startup-redirect-eln-cache + (expand-file-name "emacs/native-compile" + (xdg-cache-home))) + ;; Disable all the bars, unless on macOS, in which case, keep the menu bar. (unless (eq window-system 'ns) (menu-bar-mode -1)) diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix index 5ed9eb4f..7f681bd1 100644 --- a/user/settings/emacs.nix +++ b/user/settings/emacs.nix @@ -6,8 +6,6 @@ let inherit (pkgs) stdenv; - nativeCompileDirectory = "${config.xdg.cacheHome}/emacs/native-compile/"; - editorScript = pkgs.writeScriptBin "edit" '' #!${pkgs.runtimeShell} if [ -z "$1" ]; then @@ -199,9 +197,6 @@ in extraConfig = '' (with-eval-after-load 'editorconfig (defvar editorconfig-exec-path "${pkgs.editorconfig-core-c}/bin/editorconfig")) - (when (featurep 'native-compile) - (defvar native-compile-target-directory "${nativeCompileDirectory}") - (add-to-list 'native-comp-eln-load-path "${nativeCompileDirectory}" :append)) '' + lib.optionalString stdenv.isDarwin '' (with-eval-after-load 'files (defvar insert-directory-program "${pkgs.coreutils-prefixed}/bin/gls")) |