diff options
author | Robert Helgesson <robert@rycee.net> | 2020-09-06 22:57:54 +0200 |
---|---|---|
committer | Robert Helgesson <robert@rycee.net> | 2020-09-13 11:17:16 +0200 |
commit | f292a27f442d10de4827800d064a3a8c64d05cee (patch) | |
tree | 1efba36be2b6c242ea54cf66d12bd712150e29dc /nixos/modules/services/system/dbus.nix | |
parent | fbc5093649b17b65a5db6caa252f7d3aa99f94d0 (diff) | |
download | nixpkgs-f292a27f442d10de4827800d064a3a8c64d05cee.tar nixpkgs-f292a27f442d10de4827800d064a3a8c64d05cee.tar.gz nixpkgs-f292a27f442d10de4827800d064a3a8c64d05cee.tar.bz2 nixpkgs-f292a27f442d10de4827800d064a3a8c64d05cee.tar.lz nixpkgs-f292a27f442d10de4827800d064a3a8c64d05cee.tar.xz nixpkgs-f292a27f442d10de4827800d064a3a8c64d05cee.tar.zst nixpkgs-f292a27f442d10de4827800d064a3a8c64d05cee.zip |
nixos/dbus: always use socket activates user session
This removes the `services.dbus.socketActivated` and `services.xserver.startDbusSession` options. Instead the user D-Bus session is always socket activated.
Diffstat (limited to 'nixos/modules/services/system/dbus.nix')
-rw-r--r-- | nixos/modules/services/system/dbus.nix | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 4a60fec1ca8..d9dd26f0f18 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -19,6 +19,12 @@ in { + imports = [ + (mkRemovedOptionModule + [ "services" "dbus" "socketActivated" ] + "The user D-Bus session is now always socket activated and this option can safely be removed.") + ]; + ###### interface options = { @@ -51,14 +57,6 @@ in <filename><replaceable>pkg</replaceable>/share/dbus-1/services</filename> ''; }; - - socketActivated = mkOption { - type = types.bool; - default = false; - description = '' - Make the user instance socket activated. - ''; - }; }; }; @@ -108,7 +106,7 @@ in reloadIfChanged = true; restartTriggers = [ configDir ]; }; - sockets.dbus.wantedBy = mkIf cfg.socketActivated [ "sockets.target" ]; + sockets.dbus.wantedBy = [ "sockets.target" ]; }; environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ]; |