From 200b52fdb263cb2cf77856a70dc5fa9d05a6ad51 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 28 Jun 2023 18:56:36 +0200
Subject: Revert "Emacs: use commercial-emacs (currently without tree-sitter)"

This reverts commit 4d02c68db272b0585ea3db2aa358ded296dbe7e9.
---
 flake.lock                                 | 13 ++++++-------
 user/emacs/init.el                         |  4 ++++
 user/packages/commercial-emacs/default.nix | 21 ---------------------
 user/settings/darwin.nix                   |  2 +-
 user/settings/emacs.nix                    |  3 ++-
 5 files changed, 13 insertions(+), 30 deletions(-)
 delete mode 100644 user/packages/commercial-emacs/default.nix

diff --git a/flake.lock b/flake.lock
index 96454d12..6ea4e7df 100644
--- a/flake.lock
+++ b/flake.lock
@@ -30,13 +30,12 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1687957583,
-        "narHash": "sha256-2/8aD9KaEXshIlPKzxlQhNCFxi5PBmQ01O9BRlo/Z/0=",
-        "ref": "refs/heads/commercial-emacs",
-        "rev": "426089576c9fee91c1049307130ea45219db9017",
-        "revCount": 10243,
-        "type": "git",
-        "url": "file:///home/alan/projects/github.com/nix-community/emacs-overlay"
+        "lastModified": 1687688657,
+        "narHash": "sha256-dFSu1p5h2DLOg4Fzjxvqq7ed4213G/Loeh5lAs2AIAA=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "8e81caaf00418200812761c4d0a8c45d9a599180",
+        "type": "github"
       },
       "original": {
         "owner": "nix-community",
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
-- 
cgit 1.4.1