From f2437e59e2f878994c14f932274e5bd57f5be6d6 Mon Sep 17 00:00:00 2001 From: winston Date: Wed, 25 Mar 2026 22:57:53 +0800 Subject: [PATCH] nixos/gdm: Drop wayland option daemon/WaylandEnable is gone. https://gitlab.gnome.org/GNOME/gdm/-/commit/b8fbd8ecc72b2d4974ee91e68407461fe97c5bef --- nixos/modules/services/display-managers/gdm.nix | 15 ++++++--------- nixos/tests/gnome-extensions.nix | 3 +-- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix index 6de21115eb2a..38b9f919bab2 100644 --- a/nixos/modules/services/display-managers/gdm.nix +++ b/nixos/modules/services/display-managers/gdm.nix @@ -103,6 +103,12 @@ in [ "services" "xserver" "displayManager" "gdm" "autoLogin" "delay" ] [ "services" "displayManager" "gdm" "autoLogin" "delay" ] ) + (lib.mkRemovedOptionModule [ + "services" + "displayManager" + "gdm" + "wayland" + ] "Disabling this option is no longer supported with GNOME 50.") ]; meta = { @@ -128,14 +134,6 @@ in ''; }; - wayland = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Allow GDM to run on Wayland instead of Xserver. - ''; - }; - autoSuspend = lib.mkOption { default = true; description = '' @@ -361,7 +359,6 @@ in # presented and there's a little delay. services.displayManager.gdm.settings = { daemon = lib.mkMerge [ - { WaylandEnable = cfg.wayland; } # nested if else didn't work (lib.mkIf (config.services.displayManager.autoLogin.enable && cfg.autoLogin.delay != 0) { TimedLoginEnable = true; diff --git a/nixos/tests/gnome-extensions.nix b/nixos/tests/gnome-extensions.nix index 66003daa09d9..2e7e08e47f15 100644 --- a/nixos/tests/gnome-extensions.nix +++ b/nixos/tests/gnome-extensions.nix @@ -23,10 +23,9 @@ # Configure GDM services.xserver.enable = true; - services.xserver.displayManager.gdm = { + services.displayManager.gdm = { enable = true; debug = true; - wayland = true; }; services.displayManager.autoLogin = { enable = true;