From bea21f650faf5c5631800d0b5b9fe6e1d9d95ae8 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 15 Sep 2025 21:02:28 +0800
Subject: [PATCH 1/4] nixos/pantheon: Drop
 services.xserver.updateDbusEnvironment

Never useful, see issue 209847.
---
 nixos/modules/services/desktop-managers/pantheon.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/desktop-managers/pantheon.nix b/nixos/modules/services/desktop-managers/pantheon.nix
index d8beeca81b0d..2384cda86c50 100644
--- a/nixos/modules/services/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/desktop-managers/pantheon.nix
@@ -173,7 +173,6 @@ in
       services.upower.enable = config.powerManagement.enable;
       services.libinput.enable = mkDefault true;
       services.switcherooControl.enable = mkDefault true;
-      services.xserver.updateDbusEnvironment = true;
       services.zeitgeist.enable = mkDefault true;
       services.geoclue2.enable = mkDefault true;
       # pantheon has pantheon-agent-geoclue2

From 9aabcd1721a25d399f9c7aa1912a24ccf5502993 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 15 Sep 2025 21:51:10 +0800
Subject: [PATCH 2/4] pantheon.switchboard-plug-applications: 8.1.0 -> 8.2.0

https://github.com/elementary/switchboard-plug-applications/compare/8.1.0...8.2.0
---
 .../apps/switchboard-plugs/applications/default.nix    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
index 705f1bd4684c..2c5fa3c8c614 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-applications";
-  version = "8.1.0";
+  version = "8.2.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-jdSdzOHu1u/8N/eN6D9MjR/9K7n+rfmuBpyRSweb6lA=";
+    repo = "settings-applications";
+    tag = version;
+    hash = "sha256-kmyAEm4MlyHfm2xC55qsFSk+aLEJMMCy7/Vi0dndaNU=";
   };
 
   nativeBuildInputs = [
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Switchboard Applications Plug";
-    homepage = "https://github.com/elementary/switchboard-plug-applications";
+    homepage = "https://github.com/elementary/settings-applications";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     teams = [ teams.pantheon ];

From faadbfc4b80998a085a286263f0fada4b2f26417 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 15 Sep 2025 21:54:43 +0800
Subject: [PATCH 3/4] pantheon.wingpanel-quick-settings: 1.2.0 -> 1.3.0

https://github.com/elementary/quick-settings/compare/1.2.0...1.3.0
---
 .../desktop/wingpanel-indicators/quick-settings/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix
index 6a5b7e805bda..303d77e16b95 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wingpanel-quick-settings";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "quick-settings";
     rev = finalAttrs.version;
-    hash = "sha256-G8nwEbMMHVaT7czDG1E/AMsMdSYtmh0oiMruGr2tMdg=";
+    hash = "sha256-82XlZDnXuUB0PPmInrSQh1vrwnOYt9RplKWwYxIirVo=";
   };
 
   nativeBuildInputs = [

From dab21639eb73d96a3fe83a30d1807fc7a553f7f1 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 15 Sep 2025 21:59:00 +0800
Subject: [PATCH 4/4] pantheon.elementary-session-settings: Allow disabling x11
 session

As mentioned in PR 442810, I plan to do this very soon.
---
 .../desktop/elementary-session-settings/default.nix      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index b5d0948c9704..cc69765b1ff4 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -21,13 +21,15 @@
 }:
 stdenv.mkDerivation rec {
   pname = "elementary-session-settings";
-  version = "8.0.1";
+  # Allow disabling x11 session
+  # nixpkgs-update: no auto update
+  version = "8.0.1-unstable-2025-09-15";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "session-settings";
-    rev = version;
-    sha256 = "sha256-4B7lUjHEa4LdKrmsFCB3iFIsdVd/rgwmtQUAgAj3rXs=";
+    rev = "e708fd49356f145acd926d30683012d9488f0f9d";
+    hash = "sha256-wb9UUrEtwtmqtfNS2YPli99ZeY17UdJFQijTKs8mHn4=";
   };
 
   /*
@@ -59,7 +61,6 @@ stdenv.mkDerivation rec {
     "-Dfallback-session=GNOME"
     "-Ddetect-program-prefixes=true"
     "--sysconfdir=${placeholder "out"}/etc"
-    "-Dwayland=true"
   ];
 
   postInstall = ''