From bab2cfdc7bd3923e160b00604925c5fb57ceafbf Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 24 Feb 2025 22:09:23 -0500
Subject: [PATCH] Update to emacs 30.

---
 nix/configuration/flake.lock                         | 12 ++++++------
 nix/configuration/roles/emacs/default.nix            |  3 ++-
 .../roles/emacs/files/emacs/elisp/base-extensions.el |  1 +
 .../roles/emacs/files/emacs/elisp/base.el            |  3 +++
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/nix/configuration/flake.lock b/nix/configuration/flake.lock
index 387aed8..95522c4 100644
--- a/nix/configuration/flake.lock
+++ b/nix/configuration/flake.lock
@@ -135,11 +135,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739992710,
-        "narHash": "sha256-9kEscmGnXHjSgcqyJR4TzzHhska4yz1inSQs6HuO9qU=",
+        "lastModified": 1740432748,
+        "narHash": "sha256-BCeFtoJ/+LrZc03viRJWHfzAqqG8gPu/ikZeurv05xs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1c189f011447810af939a886ba7bee33532bb1f9",
+        "rev": "c12dcc9b61429b2ad437a7d4974399ad8f910319",
         "type": "github"
       },
       "original": {
@@ -191,11 +191,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739866667,
-        "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
+        "lastModified": 1740367490,
+        "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
+        "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
         "type": "github"
       },
       "original": {
diff --git a/nix/configuration/roles/emacs/default.nix b/nix/configuration/roles/emacs/default.nix
index 8b03825..73439ec 100644
--- a/nix/configuration/roles/emacs/default.nix
+++ b/nix/configuration/roles/emacs/default.nix
@@ -89,7 +89,7 @@ in
       (lib.mkIf (config.me.graphical) {
         nixpkgs.overlays = [
           (final: prev: {
-            my_emacs = final.emacs29-pgtk;
+            my_emacs = final.emacs30-pgtk;
           })
         ];
       })
@@ -121,6 +121,7 @@ in
                       dicts: with dicts; [
                         en
                         en-computers
+                        # en-science # TODO: Why is en-science non-free?
                       ]
                     ))
                     final.nixd # nix language server
diff --git a/nix/configuration/roles/emacs/files/emacs/elisp/base-extensions.el b/nix/configuration/roles/emacs/files/emacs/elisp/base-extensions.el
index 3d8927b..831bbfc 100644
--- a/nix/configuration/roles/emacs/files/emacs/elisp/base-extensions.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/base-extensions.el
@@ -56,6 +56,7 @@
   (savehist-mode))
 
 (use-package which-key
+  :pin gnu
   :diminish
   :config
   (which-key-mode))
diff --git a/nix/configuration/roles/emacs/files/emacs/elisp/base.el b/nix/configuration/roles/emacs/files/emacs/elisp/base.el
index 45a0dac..00b3c85 100644
--- a/nix/configuration/roles/emacs/files/emacs/elisp/base.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/base.el
@@ -63,6 +63,9 @@
  show-trailing-whitespace t
  ;; Remove the line when killing it with ctrl-k
  kill-whole-line t
+
+ ;; Show the current project in the mode line
+ project-mode-line t
  )
 
 ;; (setq-default fringes-outside-margins t)