feat(emacs): Pin EXWM to 0.18

There are several severe regressions from EXWM 0.15 to EXWM 0.17. This
commit pins the version to the somewhat newer 0.18 in hope that it
resolves those issues again.

2 files changed, 6 insertions, 2 deletions

diff --git a/emacs.nix b/emacs.nix
index 6b7b2bd71166..08bb346771e7 100644
--- a/emacs.nix
+++ b/emacs.nix
@@ -1,6 +1,6 @@
 # Derivation for Emacs configured with the packages that I need:
 
-{ pkgs ? import <nixos> {} }:
+{ pkgs }:
 
 let emacsWithPackages = with pkgs; (emacsPackagesNgGen emacs).emacsWithPackages;
 sly = with pkgs; emacsPackagesNg.melpaBuild {
@@ -59,13 +59,15 @@ nix-mode = with pkgs; emacsPackagesNg.melpaBuild {
 };
 
 in emacsWithPackages(epkgs:
+  # Pinned packages:
+  (with pkgs.pinnedEmacs; [ exwm ]) ++
+
   # Actual ELPA packages (the enlightened!)
   (with epkgs.elpaPackages; [
     ace-window
     adjust-parens
     avy
     company
-    exwm
     pinentry
     rainbow-mode
     undo-tree
diff --git a/packages.nix b/packages.nix
index d5bb5765128a..fe85f82dba1f 100644
--- a/packages.nix
+++ b/packages.nix
@@ -28,6 +28,8 @@ in {
       kontemplate = unstable.kontemplate;
       mq-cli = unstable.mq-cli;
 
+      # Override EXWM from 0.17 -> 0.18
+      pinnedEmacs.exwm = unstable.emacsPackagesNg.elpaPackages.exwm;
     };
   };