.github/workflows/cachix.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Nix
-        uses: cachix/install-nix-action@v31
+        uses: cachix/install-nix-action@v27
 
       - name: Authenticate with Cachix
         uses: cachix/cachix-action@v15

.github/workflows/update-flake.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Nix
-        uses: cachix/install-nix-action@v31
+        uses: cachix/install-nix-action@v27
 
       - name: Update flake
         run: nix flake update

flake.nix

@@ -34,22 +34,18 @@
             emacs-overlay.overlays.package
           ];
         };
-
-        emacsDarwin = (pkgs.emacs-unstable).overrideAttrs (_: {
+        patched-emacs = (pkgs.emacs-git).overrideAttrs (o: {
           patches = [
-            "${emacs-plus}/patches/emacs-30/round-undecorated-frame.patch"
-            "${emacs-plus}/patches/emacs-30/system-appearance.patch"
+            "${emacs-plus}/patches/emacs-31/round-undecorated-frame.patch"
+            "${emacs-plus}/patches/emacs-31/system-appearance.patch"
           ];
         });
 
-        emacsLinux = pkgs.emacs-unstable-pgtk;
-
-        emacsPkg = if pkgs.stdenv.isDarwin then emacsDarwin else emacsLinux;
       in
       {
         defaultPackage = pkgs.emacsWithPackagesFromUsePackage {
           config = "${emacs-config}/init.org";
-          package = emacsPkg;
+          package = patched-emacs;
           defaultInitFile = true;
           alwaysEnsure = true;
           alwaysTangle = true;