chore: rename services.xserver.desktopManager to services.desktopManager

Reputable2772 · Reputable2772 · commit 1468c52c8fc5 · 2025-06-24T19:29:20.000+05:30
Signed-off-by: Reputable2722 &lt;153411261+Reputable2772@users.noreply.github.com&gt;
diff --git a/System/HP-Laptop/Packages/gnome-specialisation.nix b/System/HP-Laptop/Packages/gnome-specialisation.nix
@@ -2,6 +2,6 @@
 {
   specialisation.gnome.configuration = {
     services.xserver.enable = lib.mkForce true;
-    services.xserver.desktopManager.gnome.enable = lib.mkForce true;
+    services.desktopManager.gnome.enable = lib.mkForce true;
   };
 }
diff --git a/System/HP-Laptop/Packages/gnome.nix b/System/HP-Laptop/Packages/gnome.nix
@@ -6,8 +6,8 @@
 }:
 {
   services.xserver.enable = lib.mkDefault false;
-  services.xserver.desktopManager.gnome.enable = false;
-  services.xserver.displayManager.gdm.enable = config.services.xserver.desktopManager.gnome.enable;
+  services.desktopManager.gnome.enable = false;
+  services.displayManager.gdm.enable = config.services.desktopManager.gnome.enable;
 
   environment.gnome.excludePackages = with pkgs; [
     gnome-tour
diff --git a/System/Rescue/misc.nix b/System/Rescue/misc.nix
@@ -1,6 +1,6 @@
 { lib, ... }:
 {
-  services.xserver.desktopManager.gnome.enable = true;
+  services.desktopManager.gnome.enable = true;
 
   services.openssh.enable = lib.mkForce false;
   services.avahi.enable = lib.mkForce false;
diff --git a/Users/WickedWizard/Programs/Desktop/Gnome/default.nix b/Users/WickedWizard/Programs/Desktop/Gnome/default.nix
@@ -6,6 +6,6 @@
       ./stub.nix
     ]
     # Unfortunately, this conditional import has to remain since we cannot modify either files.
-    ++ lib.optional osConfig.services.xserver.desktopManager.gnome.enable ./settings.nix
-    ++ lib.optional (!osConfig.services.xserver.desktopManager.gnome.enable) ./dconf.nix;
+    ++ lib.optional osConfig.services.desktopManager.gnome.enable ./settings.nix
+    ++ lib.optional (!osConfig.services.desktopManager.gnome.enable) ./dconf.nix;
 }
diff --git a/Users/WickedWizard/Programs/Desktop/Gnome/gnome.nix b/Users/WickedWizard/Programs/Desktop/Gnome/gnome.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  cond = osConfig.services.xserver.desktopManager.gnome.enable;
+  cond = osConfig.services.desktopManager.gnome.enable;
 in
 {
   stylix.targets.gnome.enable = cond;
diff --git a/Users/WickedWizard/Programs/Desktop/Gnome/stub.nix b/Users/WickedWizard/Programs/Desktop/Gnome/stub.nix
@@ -1,6 +1,6 @@
 { osConfig, lib, ... }:
 {
   options.programs.gnome.enable = lib.mkEnableOption "GNOME" // {
-    default = osConfig.services.xserver.desktopManager.gnome.enable;
+    default = osConfig.services.desktopManager.gnome.enable;
   };
 }
diff --git a/Users/WickedWizard/Programs/Programming/text-editor.nix b/Users/WickedWizard/Programs/Programming/text-editor.nix
@@ -1,11 +1,6 @@
 { osConfig, ... }:
 {
   services.flatpak.packages = [
-    (
-      if osConfig.services.xserver.desktopManager.gnome.enable then
-        "org.gnome.TextEditor"
-      else
-        "org.kde.kate"
-    )
+    (if osConfig.services.desktopManager.gnome.enable then "org.gnome.TextEditor" else "org.kde.kate")
   ];
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`{`
`3`	`3`	`specialisation.gnome.configuration = {`
`4`	`4`	`services.xserver.enable = lib.mkForce true;`
`5`		`- services.xserver.desktopManager.gnome.enable = lib.mkForce true;`
	`5`	`+ services.desktopManager.gnome.enable = lib.mkForce true;`
`6`	`6`	`};`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{ lib, ... }:`
`2`	`2`	`{`
`3`		`- services.xserver.desktopManager.gnome.enable = true;`
	`3`	`+ services.desktopManager.gnome.enable = true;`
`4`	`4`
`5`	`5`	`services.openssh.enable = lib.mkForce false;`
`6`	`6`	`services.avahi.enable = lib.mkForce false;`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`	`./stub.nix`
`7`	`7`	`]`
`8`	`8`	`# Unfortunately, this conditional import has to remain since we cannot modify either files.`
`9`		`- ++ lib.optional osConfig.services.xserver.desktopManager.gnome.enable ./settings.nix`
`10`		`- ++ lib.optional (!osConfig.services.xserver.desktopManager.gnome.enable) ./dconf.nix;`
	`9`	`+ ++ lib.optional osConfig.services.desktopManager.gnome.enable ./settings.nix`
	`10`	`+ ++ lib.optional (!osConfig.services.desktopManager.gnome.enable) ./dconf.nix;`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`...`
`6`	`6`	`}:`
`7`	`7`	`let`
`8`		`- cond = osConfig.services.xserver.desktopManager.gnome.enable;`
	`8`	`+ cond = osConfig.services.desktopManager.gnome.enable;`
`9`	`9`	`in`
`10`	`10`	`{`
`11`	`11`	`stylix.targets.gnome.enable = cond;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{ osConfig, lib, ... }:`
`2`	`2`	`{`
`3`	`3`	`options.programs.gnome.enable = lib.mkEnableOption "GNOME" // {`
`4`		`- default = osConfig.services.xserver.desktopManager.gnome.enable;`
	`4`	`+ default = osConfig.services.desktopManager.gnome.enable;`
`5`	`5`	`};`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,6 @@`
`1`	`1`	`{ osConfig, ... }:`
`2`	`2`	`{`
`3`	`3`	`services.flatpak.packages = [`
`4`		`- (`
`5`		`- if osConfig.services.xserver.desktopManager.gnome.enable then`
`6`		`- "org.gnome.TextEditor"`
`7`		`- else`
`8`		`- "org.kde.kate"`
`9`		`- )`
	`4`	`+ (if osConfig.services.desktopManager.gnome.enable then "org.gnome.TextEditor" else "org.kde.kate")`
`10`	`5`	`];`
`11`	`6`	`}`