nixos/budgie: Move out from X11 (#478935)

nixos/doc/manual/release-notes/rl-2305.section.md

@@ -61,7 +61,7 @@ In addition to numerous new and updated packages, this release has the following
 
 - [blesh](https://github.com/akinomyoga/ble.sh), a line editor written in pure bash. Available as [programs.bash.blesh](#opt-programs.bash.blesh.enable).
 
-- [Budgie Desktop](https://github.com/BuddiesOfBudgie/budgie-desktop), a familiar, modern desktop environment. Available as [services.xserver.desktopManager.budgie](options.html#opt-services.xserver.desktopManager.budgie).
+- [Budgie Desktop](https://github.com/BuddiesOfBudgie/budgie-desktop), a familiar, modern desktop environment. Available as `services.xserver.desktopManager.budgie`.
 
 - [clash-verge](https://github.com/zzzgydi/clash-verge), a Clash GUI based on tauri. Available as [programs.clash-verge](#opt-programs.clash-verge.enable).
 

nixos/modules/services/desktop-managers/budgie.nix

@@ -17,7 +17,7 @@ let
     types
     ;
 
-  cfg = config.services.xserver.desktopManager.budgie;
+  cfg = config.services.desktopManager.budgie;
 
   nixos-background-light = pkgs.nixos-artwork.wallpapers.nineish;
   nixos-background-dark = pkgs.nixos-artwork.wallpapers.nineish-dark-gray;
@@ -63,8 +63,15 @@ in
 {
   meta.maintainers = lib.teams.budgie.members;
 
+  imports = [
+    (lib.mkRenamedOptionModule
+      [ "services" "xserver" "desktopManager" "budgie" ]
+      [ "services" "desktopManager" "budgie" ]
+    )
+  ];
+
   options = {
-    services.xserver.desktopManager.budgie = {
+    services.desktopManager.budgie = {
       enable = mkEnableOption "the Budgie desktop";
 
       sessionPath = mkOption {
@@ -128,7 +135,7 @@ in
       };
     };
 
-    services.xserver.desktopManager.budgie.sessionPath = [ pkgs.budgie-desktop-view ];
+    services.desktopManager.budgie.sessionPath = [ pkgs.budgie-desktop-view ];
 
     environment.extraInit = ''
       ${concatMapStrings (p: ''

nixos/modules/services/x11/desktop-managers/default.nix

@@ -37,7 +37,7 @@ in
     ./surf-display.nix
     ./cde.nix
     ./cinnamon.nix
-    ./budgie.nix
+    ../../desktop-managers/budgie.nix
     ../../desktop-managers/lomiri.nix
     ../../desktop-managers/cosmic.nix
     ../../desktop-managers/gnome.nix

nixos/tests/budgie.nix

@@ -12,20 +12,18 @@
       ];
 
       services.xserver.enable = true;
+      services.xserver.displayManager.lightdm.enable = true;
 
-      services.xserver.displayManager = {
-        lightdm.enable = true;
-        autoLogin = {
-          enable = true;
-          user = "alice";
-        };
+      services.displayManager.autoLogin = {
+        enable = true;
+        user = "alice";
       };
 
       # We don't ship gnome-text-editor in Budgie module, we add this line mainly
       # to catch eval issues related to this option.
       environment.budgie.excludePackages = [ pkgs.gnome-text-editor ];
 
-      services.xserver.desktopManager.budgie = {
+      services.desktopManager.budgie = {
         enable = true;
         extraPlugins = [
           pkgs.budgie-analogue-clock-applet

pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py

@@ -197,7 +197,7 @@ cfgbudgie = """  # Enable the X11 windowing system.
 
   # Enable the Budgie Desktop environment.
   services.xserver.displayManager.lightdm.enable = true;
-  services.xserver.desktopManager.budgie.enable = true;
+  services.desktopManager.budgie.enable = true;
 
 """