From 84ad67f7c6e4139df2a21d60e96767943fab0e05 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 7 Jan 2022 20:32:27 +0800 Subject: nixos/gnome-settings-daemon: pick up correct .wants directories In https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/153 the user target names for GSD components has been renamed for example from `gsd-a11y-settings.target` to `org.gnome.SettingsDaemon.A11ySettings.target`, and nowadays `gsd-*.target` are just symbolic links of `/dev/null` and will be removed in the future. At the same time, as mentioned in d27212d466d0e79c3d9781b60aa3374d234370c0, we are adding `systemd.user.targets..wants` stuff here only because systemd.packages doesn't pick the .wants directories. Nowadays those GSD components are managed in `/etc/systemd/user/gnome-session@gnome.target.d/gnome.session.conf` so it should be safe to remove them. In this commit we also try to pick up those new .wants directories, see also https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/blob/41.0/plugins/meson.build#L57 Result of `cd /nix/store/iqzy2a6wn9bq9hqx7pqx0a153s5xlnwp-gnome-settings-daemon-41.0; find | grep wants`: ``` ./share/systemd/user/gnome-session-x11-services-ready.target.wants ./share/systemd/user/gnome-session-x11-services-ready.target.wants/org.gnome.SettingsDaemon.XSettings.service ./share/systemd/user/gnome-session-x11-services.target.wants ./share/systemd/user/gnome-session-x11-services.target.wants/org.gnome.SettingsDaemon.XSettings.service ``` Result of `cd /nix/store/armzljlnsvc1gn0nq0bncb9lf8fy32zy-gnome-settings-daemon-3.34.0; find | grep wants`: ``` ./lib/systemd/user/gnome-session-initialized.target.wants ./lib/systemd/user/gnome-session-initialized.target.wants/gsd-a11y-settings.target ./lib/systemd/user/gnome-session-initialized.target.wants/gsd-color.target ./lib/systemd/user/gnome-session-initialized.target.wants/gsd-datetime.target ./lib/systemd/user/gnome-session-initialized.target.wants/gsd-power.target ./lib/systemd/user/gnome-session-initialized.target.wants/gsd-housekeeping.target ./lib/systemd/user/gnome-session-initialized.target.wants/gsd-keyboard.target ./lib/systemd/user/gnome-session-initialized.target.wants/gsd-media-keys.target ./lib/systemd/user/gnome-session-initialized.target.wants/gsd-screensaver-proxy.target ./lib/systemd/user/gnome-session-initialized.target.wants/gsd-sharing.target ./lib/systemd/user/gnome-session-initialized.target.wants/gsd-sound.target ./lib/systemd/user/gnome-session-initialized.target.wants/gsd-smartcard.target ./lib/systemd/user/gnome-session-initialized.target.wants/gsd-wacom.target ./lib/systemd/user/gnome-session-initialized.target.wants/gsd-print-notifications.target ./lib/systemd/user/gnome-session-initialized.target.wants/gsd-rfkill.target ./lib/systemd/user/gnome-session-initialized.target.wants/gsd-wwan.target ./lib/systemd/user/gnome-session-x11-services.target.wants ./lib/systemd/user/gnome-session-x11-services.target.wants/gsd-xsettings.target ``` --- .../desktops/gnome/gnome-settings-daemon.nix | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix index 05b5c86ddcb..9c68c9b76e9 100644 --- a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix +++ b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix @@ -57,26 +57,12 @@ in pkgs.gnome.gnome-settings-daemon ]; - systemd.user.targets."gnome-session-initialized".wants = [ - "gsd-color.target" - "gsd-datetime.target" - "gsd-keyboard.target" - "gsd-media-keys.target" - "gsd-print-notifications.target" - "gsd-rfkill.target" - "gsd-screensaver-proxy.target" - "gsd-sharing.target" - "gsd-smartcard.target" - "gsd-sound.target" - "gsd-wacom.target" - "gsd-wwan.target" - "gsd-a11y-settings.target" - "gsd-housekeeping.target" - "gsd-power.target" + systemd.user.targets."gnome-session-x11-services".wants = [ + "org.gnome.SettingsDaemon.XSettings.service" ]; - systemd.user.targets."gnome-session-x11-services".wants = [ - "gsd-xsettings.target" + systemd.user.targets."gnome-session-x11-services-ready".wants = [ + "org.gnome.SettingsDaemon.XSettings.service" ]; }; -- cgit 1.4.1