From 3afbd263c449ac9af0cd89b65399cb936dd9b393 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@horus.nu>
Date: Fri, 12 May 2023 15:06:44 +0200
Subject: [PATCH] Use emacsUnstable from emacs-overlay

It has been updated to Emacs 29
---
 home-manager/modules/emacs/config.org | 23 +++++++++++++++++------
 users/erwin/home.nix                  | 17 +++--------------
 users/erwin/work.nix                  |  4 +++-
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/home-manager/modules/emacs/config.org b/home-manager/modules/emacs/config.org
index 7763f43..60fd30e 100644
--- a/home-manager/modules/emacs/config.org
+++ b/home-manager/modules/emacs/config.org
@@ -101,10 +101,9 @@ LSP responses can be rather large, in the 800KiB - 3MiB range. 2MiB is a decent
 
 ** Package sources
 
-Add repositories where packages are installed from. Setting =package-enable-at-startup= to =nil= prevents a second package load and improves startup time
+Add repositories where packages are installed from. 
 
 #+begin_src emacs-lisp
-    (setq package-enable-at-startup nil)
     (setq package-archives '(("gnu" . "https://elpa.gnu.org/packages/")
                              ("nongnu" . "https://elpa.nongnu.org/nongnu/")
                              ("melpa" . "https://melpa.org/packages/")
@@ -497,14 +496,15 @@ Add a dashboard on startup
 [[https://github.com/tarsius/minions][minions]] adds a menu for minor modes to the modeline
 
 #+begin_src emacs-lisp
-      (use-package minions
-        :hook
-        (doom-modeline-mode . minions-mode))
+  (use-package minions
+    :config
+    (minions-mode 1))
 #+end_src
 
 Use [[https://github.com/seagle0128/doom-modeline][doom-modeline]] for a nice and fancy modeline
+*2023-05-12* Disabled because it causes emacs to hang
 
-#+begin_src emacs-lisp
+#+begin_src emacs-lisp :tangle no
   (use-package doom-modeline
     :init
     (doom-modeline-mode 1)
@@ -524,6 +524,17 @@ Use [[https://github.com/seagle0128/doom-modeline][doom-modeline]] for a nice an
     (mode-line-inactive ((t (:height 0.85)))))
 #+end_src
 
+[[https://github.com/tarsius/moody][moody]] cleans up the modeline a bit so it is nicer to look at
+
+#+begin_src emacs-lisp
+  (use-package moody
+    :config
+    (setq x-underline-at-descent-line t)
+    (moody-replace-mode-line-buffer-identification)
+    (moody-replace-vc-mode)
+    (moody-replace-eldoc-minibuffer-message-function))
+#+end_src
+
 ** Command completion
 
 *** Ivy / Counsel
diff --git a/users/erwin/home.nix b/users/erwin/home.nix
index 720ecc5..77a7baf 100644
--- a/users/erwin/home.nix
+++ b/users/erwin/home.nix
@@ -43,20 +43,9 @@ in
             emacs = {
               enable = true;
               # package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages (epkgs: [ epkgs.emacsql epkgs.emacsql-sqlite ]));
-              package =
-                let
-                  emacs29 = pkgs.emacsPgtk.overrideAttrs (_: {
-                    version = "29.0.90+git93005cd9dc2b";
-                    src = pkgs.fetchFromSavannah {
-                      repo = "emacs";
-                      rev = "93005cd9dc2bab882e66ac7b81f593cd6c021e43";
-                      sha256 = "uIndq8ra9Zv2FVzk/FpVnz0NYKR3kfT8wnjssRpmZLQ=";
-                    };
-                  });
-                in
-                emacs29.override {
-                  treeSitterPlugins = builtins.attrValues (filterAttrs (_: isDerivation) pkgs.tree-sitter-grammars);
-                };
+              package = pkgs.emacsUnstablePgtk.override {
+                treeSitterPlugins = builtins.attrValues (filterAttrs (_: isDerivation) pkgs.tree-sitter-grammars);
+              };
 
               daemon = true;
             };
diff --git a/users/erwin/work.nix b/users/erwin/work.nix
index e89cc16..455109a 100644
--- a/users/erwin/work.nix
+++ b/users/erwin/work.nix
@@ -38,7 +38,9 @@ in
           emacs = {
             enable = true;
             # package = with pkgs; ((emacsPackagesFor emacsUnstable).emacsWithPackages (epkgs: [ epkgs.emacsql epkgs.emacsql-sqlite ]));
-            package = pkgs.emacs;
+            package = pkgs.emacsUnstable.override {
+              treeSitterPlugins = builtins.attrValues (filterAttrs (_: isDerivation) pkgs.tree-sitter-grammars);
+            };
             daemon = true;
           };
           firefox = {