use emacs-29 branch, remove company-quickhelp and disable company-files

flake-parts/overlays.nix

@@ -6,6 +6,13 @@
 }: {
   flake.overlays = {
     default = import ../packages;
+    emacs29 = final: prev: {
+      emacs29 = prev.emacsGit.overrideAttrs (old: {
+        name = "emacs29";
+        version = "29.0-${inputs.emacs-src.shortRev}";
+        src = inputs.emacs-src;
+      });
+    };
     emacs-overlay = inputs.emacs-overlay.overlays.default;
     fenix = inputs.fenix.overlays.default;
     rycee-firefox-addons = final: prev: {rycee-firefox-addons = inputs.rycee-firefox-addons.outputs.packages.${prev.system};};

flake.lock

@@ -41,6 +41,23 @@
         "type": "github"
       }
     },
+    "emacs-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1680780971,
+        "narHash": "sha256-c5aLVyuT8bK3bJfQSi+HNQGSJyWSvp7X+tr0bX3syZ4=",
+        "ref": "emacs-29",
+        "rev": "305246d9726bbe05a65ad3836880138db5c01dfa",
+        "revCount": 164964,
+        "type": "git",
+        "url": "https://git.savannah.gnu.org/git/emacs.git"
+      },
+      "original": {
+        "ref": "emacs-29",
+        "type": "git",
+        "url": "https://git.savannah.gnu.org/git/emacs.git"
+      }
+    },
     "fenix": {
       "inputs": {
         "nixpkgs": "nixpkgs",
@@ -312,6 +329,7 @@
       "inputs": {
         "darwin": "darwin",
         "emacs-overlay": "emacs-overlay",
+        "emacs-src": "emacs-src",
         "fenix": "fenix",
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",

flake.nix

@@ -7,6 +7,8 @@
     darwin.inputs.nixpkgs.follows = "nixpkgs";
     emacs-overlay.url = "github:nix-community/emacs-overlay";
     emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
+    emacs-src.url = "git+https://git.savannah.gnu.org/git/emacs.git?ref=emacs-29";
+    emacs-src.flake = false;
     fenix.url = "github:nix-community/fenix";
     flake-parts.url = "github:hercules-ci/flake-parts";
     home-manager.url = "github:nix-community/home-manager";

home-manager/modules/profiles/user/willem/programs/emacs/default.nix

@@ -3,13 +3,8 @@
   pkgs,
   ...
 }: let
-  emacsConfig = pkgs.emacsWithPackagesFromUsePackage {
+  emacsPackage =
-    config = ./init.el;
+    (pkgs.emacsPackagesFor pkgs.emacs29).emacsWithPackages
-
-    defaultInitFile = true;
-
-    package =
-      (pkgs.emacsPackagesFor pkgs.emacsGit).emacsWithPackages
     (epkgs:
       (with epkgs; let
         org-auctex = epkgs.trivialBuild {
@@ -70,7 +65,6 @@
         cdlatex
         citeproc
         company
-          company-quickhelp
         counsel
         editorconfig
         edit-indirect
@@ -104,6 +98,12 @@
         plantuml
         sqlite
       ]));
+  emacsConfig = pkgs.emacsWithPackagesFromUsePackage {
+    config = ./init.el;
+
+    defaultInitFile = true;
+
+    package = emacsPackage;
   };
 in {
   home.file.".emacs.d/early-init.el".source = ./early-init.el;

home-manager/modules/profiles/user/willem/programs/emacs/init.el

@@ -65,7 +65,6 @@
 (require 'cdlatex)
 (require 'citeproc)
 (require 'company)
-(require 'company-quickhelp)
 (require 'counsel)
 (require 'edit-indirect)
 (require 'editorconfig)
@@ -135,8 +134,6 @@
 (setq company-tooltip-offset-display 'lines)
 ;; Display text icon of type in company popup
 
-(company-quickhelp-mode)
-
 (global-set-key "\C-s" 'swiper)
 (global-set-key (kbd "C-c C-r") 'ivy-resume)
 (global-set-key (kbd "<f6>") 'ivy-resume)
@@ -157,8 +154,6 @@
 
 (editorconfig-mode 1)
 
-(add-hook 'eglot-connect-hook 'company-mode)
-
 (global-set-key (kbd "C-c C-y") 'format-all-buffer)
 (setq-default format-all-formatters format-all-default-formatters)