From 7da34f3a2b3cb6c808437b9db0e59ca075e679e0 Mon Sep 17 00:00:00 2001
From: Nathan McCarty <nathan@mccarty.io>
Date: Tue, 26 Sep 2023 22:36:55 -0400
Subject: [PATCH] Little adventure to get emacs working again

---
 home-manager/common/programs/emacs.nix | 4 +++-
 home-manager/linux/default.nix         | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/home-manager/common/programs/emacs.nix b/home-manager/common/programs/emacs.nix
index 700b89d..ad09989 100644
--- a/home-manager/common/programs/emacs.nix
+++ b/home-manager/common/programs/emacs.nix
@@ -27,6 +27,8 @@
         # For email
         inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.mu
 	meson
+	pkg-config
+	glib
         # Desktop file for org-protocol
         (makeDesktopItem {
           name = "org-protocol";
@@ -43,7 +45,7 @@
         enable = true;
         package = config.nathan.programs.emacs.package;
         extraPackages = epkgs: [
-          inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.mu
+	  inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.emacsPackages.mu4e
           epkgs.vterm
           epkgs.pdf-tools
           epkgs.emacsql
diff --git a/home-manager/linux/default.nix b/home-manager/linux/default.nix
index 1e9048e..ee65a33 100644
--- a/home-manager/linux/default.nix
+++ b/home-manager/linux/default.nix
@@ -123,7 +123,8 @@ with nLib; {
       package = pkgs.firefox-beta-bin;
     };
     nathan.programs.emacs.package =
-      lib.mkDefault inputs.emacs.packages."${pkgs.system}".emacsUnstablePgtk;
+      #lib.mkDefault inputs.emacs.packages."${pkgs.system}".emacsUnstablePgtk;
+      lib.mkDefault inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".emacs29-pgtk;
     # We should be managing xdg stuff
     xdg = {
       enable = true;