diff options
| author | Alan Pearce | 2023-06-28 18:56:36 +0200 |
|---|---|---|
| committer | Alan Pearce | 2023-06-28 18:57:21 +0200 |
| commit | 200b52fdb263cb2cf77856a70dc5fa9d05a6ad51 (patch) | |
| tree | 42b72c5b4bd14c95f6a2f05d591d4f5379188603 /user | |
| parent | 14c8b4502d5b15def4ae04d12d3ba43a14a23585 (diff) | |
| download | nixfiles-200b52fdb263cb2cf77856a70dc5fa9d05a6ad51.tar.lz nixfiles-200b52fdb263cb2cf77856a70dc5fa9d05a6ad51.tar.zst nixfiles-200b52fdb263cb2cf77856a70dc5fa9d05a6ad51.zip | |
Revert "Emacs: use commercial-emacs (currently without tree-sitter)"
This reverts commit 4d02c68db272b0585ea3db2aa358ded296dbe7e9.
Diffstat (limited to 'user')
| -rw-r--r-- | user/emacs/init.el | 4 | ||||
| -rw-r--r-- | user/packages/commercial-emacs/default.nix | 21 | ||||
| -rw-r--r-- | user/settings/darwin.nix | 2 | ||||
| -rw-r--r-- | user/settings/emacs.nix | 3 |
4 files changed, 7 insertions, 23 deletions
diff --git a/user/emacs/init.el b/user/emacs/init.el index afcbbffd..0a6333d2 100644 --- a/user/emacs/init.el +++ b/user/emacs/init.el @@ -31,6 +31,10 @@ (defun quiet (original-function &rest args) (quietly (apply original-function args))) +(use-package benchmark-init + :config (progn + (add-hook 'after-init-hook #'benchmark-init/deactivate 99))) + ;;; Customize (setq custom-file (expand-file-name "custom.el" user-emacs-directory)) diff --git a/user/packages/commercial-emacs/default.nix b/user/packages/commercial-emacs/default.nix deleted file mode 100644 index 7c0c99b7..00000000 --- a/user/packages/commercial-emacs/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib -, fetchFromGitHub - -, emacs - -, withTreeSitter ? true -}: -(emacs.override { - inherit withTreeSitter; - nativeComp = false; -}).overrideAttrs - (old: rec { - pname = "commercial-emacs"; - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "50771bb6107e32048187ab93f224cd307c733a33"; - sha256 = "03r4aqiljqg5g07jlbjp5sld0vg122gpb5ah4mpq2hl239qgxc3b"; - }; - patches = [ ]; - }) diff --git a/user/settings/darwin.nix b/user/settings/darwin.nix index 64c989e8..699caa40 100644 --- a/user/settings/darwin.nix +++ b/user/settings/darwin.nix @@ -43,7 +43,7 @@ darwin.trash ]; - programs.emacs.package = pkgs.commercial-emacs; + programs.emacs.package = pkgs.emacs; home.file.".hushlogin".text = ""; diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix index 08a9ceba..fd9ecadb 100644 --- a/user/settings/emacs.nix +++ b/user/settings/emacs.nix @@ -47,7 +47,7 @@ in programs.emacs = { enable = true; - package = lib.mkDefault (pkgs.commercial-emacs); + package = lib.mkDefault (pkgs.emacs.override { withGTK3 = true; }); overrides = self: super: ( { consult-ghq = super.consult-ghq.overrideAttrs @@ -97,6 +97,7 @@ in ace-link apheleia avy + benchmark-init capf-autosuggest clojure-mode company |