.github/workflows/cachix.yml

@@ -26,6 +26,6 @@ jobs:
 
       - name: Build and Push with Cachix
         run: |
-          set -e
           nix develop
+          set -e
           nix build --json | jq -r '.[].outputs | to_entries[].value' | cachix push larstvei

flake.nix

@@ -16,33 +16,23 @@
   };
 
   outputs =
-    {
+    { self, nixpkgs, flake-utils, emacs-overlay, emacs-plus, emacs-config }:
-      self,
+    flake-utils.lib.eachDefaultSystem (system:
-      nixpkgs,
-      flake-utils,
-      emacs-overlay,
-      emacs-plus,
-      emacs-config,
-    }:
-    flake-utils.lib.eachDefaultSystem (
-      system:
       let
         pkgs = import nixpkgs {
           inherit system;
-          overlays = [
+          overlays =
-            emacs-overlay.overlays.emacs
+            [ emacs-overlay.overlays.emacs emacs-overlay.overlays.package ];
-            emacs-overlay.overlays.package
-          ];
         };
         patched-emacs = (pkgs.emacs-git).overrideAttrs (o: {
           patches = [
+            "${emacs-plus}/patches/emacs-31/fix-window-role.patch"
             "${emacs-plus}/patches/emacs-31/round-undecorated-frame.patch"
             "${emacs-plus}/patches/emacs-31/system-appearance.patch"
           ];
         });
 
-      in
+      in {
-      {
         defaultPackage = pkgs.emacsWithPackagesFromUsePackage {
           config = "${emacs-config}/init.org";
           package = patched-emacs;
@@ -56,6 +46,5 @@
         };
 
         devShell = pkgs.mkShell { buildInputs = [ pkgs.jq ]; };
-      }
+      });
-    );
 }