From 48c463685622064b1ea6e4d5cdcb74efec8b7f65 Mon Sep 17 00:00:00 2001
From: repparw <45952970+repparw@users.noreply.github.com>
Date: Sun, 1 Jun 2025 13:30:05 -0300
Subject: [PATCH] gnome: fix xserver option renames (#1429)

---
 flake.lock                             | 6 +++---
 modules/gnome/nixos.nix                | 4 ++--
 modules/gnome/testbeds/gnome.nix       | 3 +--
 modules/qt/nixos.nix                   | 4 ++--
 stylix/maintainers.nix                 | 6 ------
 stylix/testbed/modules/application.nix | 3 +--
 6 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0c7004dd..5a8e3deb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -218,11 +218,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1747542820,
-        "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
+        "lastModified": 1748460289,
+        "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
+        "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102",
         "type": "github"
       },
       "original": {
diff --git a/modules/gnome/nixos.nix b/modules/gnome/nixos.nix
index 12232d00..05a54a70 100644
--- a/modules/gnome/nixos.nix
+++ b/modules/gnome/nixos.nix
@@ -22,8 +22,8 @@ in
         config.stylix.enable
         && config.stylix.targets.gnome.enable
         && (
-          config.services.xserver.desktopManager.gnome.enable
-          || config.services.xserver.displayManager.gdm.enable
+          config.services.desktopManager.gnome.enable
+          || config.services.displayManager.gdm.enable
         )
       )
       {
diff --git a/modules/gnome/testbeds/gnome.nix b/modules/gnome/testbeds/gnome.nix
index fa3a15cd..5eee93bb 100644
--- a/modules/gnome/testbeds/gnome.nix
+++ b/modules/gnome/testbeds/gnome.nix
@@ -1,6 +1,5 @@
 {
-  services.xserver = {
-    enable = true;
+  services = {
     desktopManager.gnome.enable = true;
     displayManager.gdm.enable = true;
   };
diff --git a/modules/qt/nixos.nix b/modules/qt/nixos.nix
index 55fe5afa..6d6f0ea4 100644
--- a/modules/qt/nixos.nix
+++ b/modules/qt/nixos.nix
@@ -30,8 +30,8 @@ in
 
   config =
     let
-      inherit (config.services.xserver.desktopManager) gnome plasma5 lxqt;
-      inherit (config.services.desktopManager) plasma6;
+      inherit (config.services.xserver.desktopManager) plasma5 lxqt;
+      inherit (config.services.desktopManager) gnome plasma6;
     in
     lib.mkIf (config.stylix.enable && config.stylix.targets.qt.enable) {
       stylix.targets.qt.platform =
diff --git a/stylix/maintainers.nix b/stylix/maintainers.nix
index 44cf01a6..de6eee71 100644
--- a/stylix/maintainers.nix
+++ b/stylix/maintainers.nix
@@ -44,12 +44,6 @@
       { fingerprint = "3C97 1C61 0E9E BE35 3259  C1D3 2CA7 0354 EA17 07B9"; }
     ];
   };
-  repparw = {
-    email = "ubritos@gmail.com";
-    name = "Ulises Britos";
-    github = "repparw";
-    githubId = 45952970;
-  };
   skoove = {
     email = "zie@sturges.com.au";
     name = "Zie Sturges";
diff --git a/stylix/testbed/modules/application.nix b/stylix/testbed/modules/application.nix
index cd3a0969..5db3cfb3 100644
--- a/stylix/testbed/modules/application.nix
+++ b/stylix/testbed/modules/application.nix
@@ -84,8 +84,7 @@ in
   };
 
   config = lib.mkIf (config.stylix.testbed.ui != null) {
-    services.xserver = {
-      enable = true;
+    services = {
       displayManager.gdm.enable = true;
       desktopManager.gnome.enable = true;
     };