From 79300c5c95ceef8bf3dce7be772d014f0953b422 Mon Sep 17 00:00:00 2001
From: Madeleine Sydney <lomiskiam@gmail.com>
Date: Tue, 4 Mar 2025 03:10:59 -0700
Subject: [PATCH] =?UTF-8?q?feat(emacs):=20=E2=86=9130.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flake.nix                      |  1 +
 users/crumb/programs/emacs.nix | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index d685333..2e3d2af 100755
--- a/flake.nix
+++ b/flake.nix
@@ -12,6 +12,7 @@
     sops-nix.url = "github:Mic92/sops-nix";
     sydnix-cli.url = "path:///persist/dots/scripts/sydnix-cli";
     copyparty.url = "github:9001/copyparty";
+    emacs-overlay.url = "github:nix-community/emacs-overlay";
     # Used for Firefox extensions/addons.
     nur = {
       url = "github:nix-community/NUR";
diff --git a/users/crumb/programs/emacs.nix b/users/crumb/programs/emacs.nix
index a163faf..19be092 100755
--- a/users/crumb/programs/emacs.nix
+++ b/users/crumb/programs/emacs.nix
@@ -1,15 +1,15 @@
 { config, lib, pkgs, inputs, ... }@args:
 
 let
-  emacsBasePackage = pkgs.emacs30-pgtk;
+  emacsBasePackage = pkgs'.emacs-unstable-pgtk;
   emacsConfigDir = "/persist/dots/users/crumb/programs/emacs";
 
-  emacs-overlay =
-    import (builtins.fetchTarball {
-      url =
-        "https://github.com/nix-community/emacs-overlay/archive/master.tar.gz";
-      sha256 = "sha256:02aln37ch9isz8h7dlm9v6jkl60g923z0dij0rjsxq7xi61fas2j";
-    });
+  # emacs-overlay =
+  #   import (builtins.fetchTarball {
+  #     url =
+  #       "https://github.com/nix-community/emacs-overlay/archive/master.tar.gz";
+  #     sha256 = "sha256:02aln37ch9isz8h7dlm9v6jkl60g923z0dij0rjsxq7xi61fas2j";
+  #   });
 
   # Create a new instance of nixpkgs with emacs-overlay applied. This is a
   # little unorthodox, but we do it
@@ -19,7 +19,7 @@ let
   #      global nixpkgs instance when nothing else is using it!
   pkgs' = import inputs.nixpkgs {
     system = args.system;
-    overlays = [ emacs-overlay ];
+    overlays = [ inputs.emacs-overlay.overlays.emacs ];
   };
 
   emacsDataDir = "${config.xdg.dataHome}/emacs";