From 333e41f9261bae2948f567ca9ee606ac33c45aaf Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Thu, 14 Nov 2024 13:50:55 +0000
Subject: [PATCH] Build custom version of Emacs to include both PGTK and
 Imagemagick support

Install Emacs by default instead just for desktop environment
---
 system/default.nix            |  1 +
 system/desktop.nix            |  5 ++---
 system/home/emacs/default.nix | 15 +++++++--------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/system/default.nix b/system/default.nix
index 20772e62..1f9de817 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -136,6 +136,7 @@
         ./home/shell/default.nix
         ./home/scripts/default.nix
         ./home/password-store/default.nix
+        ./home/emacs/default.nix
       ];
       home = {
         inherit username;
diff --git a/system/desktop.nix b/system/desktop.nix
index 62ca2f4a..eefea184 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -120,11 +120,10 @@
     {
       imports = [
         ./home/hyprland.nix
+        ./home/terminal/default.nix
+        ./home/browser/default.nix
         ./home/email/default.nix
         ./home/calendar/default.nix
-        ./home/terminal/default.nix
-        ./home/emacs/default.nix
-        ./home/browser/default.nix
       ];
       home.file.${config.gtk.gtk2.configLocation}.force = true;
       services = {
diff --git a/system/home/emacs/default.nix b/system/home/emacs/default.nix
index 0e93087c..3f8c0a01 100644
--- a/system/home/emacs/default.nix
+++ b/system/home/emacs/default.nix
@@ -17,7 +17,10 @@
   programs.emacs = {
     # Clone emacs config from https://git.xenia.me.uk/pixelifytica/emacs.git
     enable = true;
-    package = pkgs.emacs29-pgtk;
+    package = pkgs.emacs29.override {
+      withImageMagick = true;
+      withPgtk = true;
+    };
     extraConfig =
       let
         fixed-font-family = "${config.stylix.fonts.monospace.name}";
@@ -62,19 +65,15 @@
       ];
   };
   home.packages = with pkgs; [
-    # Emacs requirements
-    imagemagick
-    languagetool
-    wordnet
-
     # Plugin requirements
     gcc
     sqlite
+    languagetool
+    wordnet
     pandoc
     ghostscript
     poppler_utils
-    graphviz
-    mp3info
+    graphviz-nox
 
     # Customised LaTeX install
     (texlive.combine {