From c82bf95274382eab4aa72a9d03a13fc0514ac9ac Mon Sep 17 00:00:00 2001
From: stanleyj-edsn <stanley.jaddoe@edsn.nl>
Date: Wed, 4 Dec 2024 10:35:46 +0100
Subject: [PATCH] nixos/exwm: remove option enableDefaultConfig

The default configuration was removed from upstream, see https://github.com/emacs-exwm/exwm/issues/57

Fix: #319541
Co-authored-by: Lin Jian <me@linj.tech>
---
 .../services/x11/window-managers/exwm.nix     | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/exwm.nix b/nixos/modules/services/x11/window-managers/exwm.nix
index 923a554b2d96a..1c08ef93f9b67 100644
--- a/nixos/modules/services/x11/window-managers/exwm.nix
+++ b/nixos/modules/services/x11/window-managers/exwm.nix
@@ -6,17 +6,17 @@ let
   cfg = config.services.xserver.windowManager.exwm;
   loadScript = pkgs.writeText "emacs-exwm-load" ''
     ${cfg.loadScript}
-    ${optionalString cfg.enableDefaultConfig ''
-      (require 'exwm-config)
-      (exwm-config-default)
-    ''}
   '';
   packages = epkgs: cfg.extraPackages epkgs ++ [ epkgs.exwm ];
   exwm-emacs = pkgs.emacs.pkgs.withPackages packages;
-
 in
-
 {
+
+  imports = [
+    (mkRemovedOptionModule [ "services" "xserver" "windowManager" "exwm" "enableDefaultConfig" ]
+      "The upstream EXWM project no longer provides a default configuration, instead copy (parts of) exwm-config.el to your local config.")
+  ];
+
   options = {
     services.xserver.windowManager.exwm = {
       enable = mkEnableOption "exwm";
@@ -29,15 +29,9 @@ in
         '';
         description = ''
           Emacs lisp code to be run after loading the user's init
-          file. If enableDefaultConfig is true, this will be run
-          before loading the default config.
+          file.
         '';
       };
-      enableDefaultConfig = mkOption {
-        default = true;
-        type = lib.types.bool;
-        description = "Enable an uncustomised exwm configuration.";
-      };
       extraPackages = mkOption {
         type = types.functionTo (types.listOf types.package);
         default = epkgs: [];