From 7522f97cbef26c7ca6b15615ad2144730232dbe4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 9 Jul 2023 17:35:28 +0800 Subject: [PATCH] pantheon: Manage user session with systemd This is now needed as gnome-session 46 drops `--builtin` option. --- .../services/x11/desktop-managers/pantheon.nix | 14 ++++++++++++-- .../elementary-session-settings/default.nix | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 59bc142eeb7f..b9ca6bd4ba8d 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -174,12 +174,22 @@ in # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443 pkgs.pantheon.mutter ]; - systemd.packages = [ - pkgs.pantheon.gnome-settings-daemon + systemd.packages = with pkgs; [ + gnome.gnome-session + pantheon.gala + pantheon.gnome-settings-daemon + pantheon.elementary-session-settings ]; programs.dconf.enable = true; networking.networkmanager.enable = mkDefault true; + systemd.user.targets."gnome-session-x11-services".wants = [ + "org.gnome.SettingsDaemon.XSettings.service" + ]; + systemd.user.targets."gnome-session-x11-services-ready".wants = [ + "org.gnome.SettingsDaemon.XSettings.service" + ]; + # Global environment environment.systemPackages = (with pkgs.pantheon; [ elementary-session-settings diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index d1d2b6533e93..3f9489231474 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -72,7 +72,7 @@ let export XDG_DATA_DIRS=@out@/share:$XDG_DATA_DIRS # Start pantheon session. Keep in sync with upstream - exec ${gnome-session}/bin/gnome-session --builtin --session=pantheon "$@" + exec ${gnome-session}/bin/gnome-session --session=pantheon "$@" ''; # Absolute path patched version of the upstream xsession