chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix package loading in emacs pgtk

Browse source
This commit is contained in:
Charlotte Van Petegem 2022-08-10 10:39:03 +02:00
parent b4b0024076
commit a778658c5d
No known key found for this signature in database
GPG key ID: 019E764B7184435A
2 changed files with 1 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/base/emacs/default.nix
View file

@ -16,7 +16,7 @@
readOnly = true; readOnly = true;
default = pkgs.emacsWithPackagesFromUsePackage { default = pkgs.emacsWithPackagesFromUsePackage {
config = config.chvp.base.emacs.fullConfig; config = config.chvp.base.emacs.fullConfig;
package = pkgs.emacsNativeComp; package = pkgs.emacsPgtkNativeComp;
alwaysEnsure = true; alwaysEnsure = true;
# mu4e is included in the mu package and should be used from there # mu4e is included in the mu package and should be used from there
extraEmacsPackages = epkgs: lib.optional config.chvp.graphical.mail.enable pkgs.mu; extraEmacsPackages = epkgs: lib.optional config.chvp.graphical.mail.enable pkgs.mu;

11
modules/base/emacs/early-init.el
View file

@ -22,17 +22,6 @@
(add-hook 'emacs-startup-hook #'hm/restore-gc) (add-hook 'emacs-startup-hook #'hm/restore-gc)
(add-hook 'minibuffer-exit-hook #'hm/restore-gc) (add-hook 'minibuffer-exit-hook #'hm/restore-gc)
;; Avoid unnecessary regexp matching while loading .el files.
(defvar hm/file-name-handler-alist file-name-handler-alist)
(setq file-name-handler-alist nil)
(defun hm/restore-file-name-handler-alist ()
"Restore the 'file-name-handler-alist' variable."
(setq file-name-handler-alist hm/file-name-handler-alist)
(makunbound 'hm/file-name-handler-alist))
(add-hook 'emacs-startup-hook #'hm/restore-file-name-handler-alist)
;; Nix manages our packages ;; Nix manages our packages
(setq package-enable-at-startup nil) (setq package-enable-at-startup nil)