diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-05-25 19:33:13 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-05-29 15:05:28 +0200 |
commit | 1e95e114e5eefdb0f792f9f7a620c9472e6d7da3 (patch) | |
tree | 67b8c3f40258a027d211ebd75dd685ee3e7d3841 /nixos/modules/config/pulseaudio.nix | |
parent | 13f2f8673b184599e7a65df422c968730554820f (diff) | |
download | nixlib-1e95e114e5eefdb0f792f9f7a620c9472e6d7da3.tar nixlib-1e95e114e5eefdb0f792f9f7a620c9472e6d7da3.tar.gz nixlib-1e95e114e5eefdb0f792f9f7a620c9472e6d7da3.tar.bz2 nixlib-1e95e114e5eefdb0f792f9f7a620c9472e6d7da3.tar.lz nixlib-1e95e114e5eefdb0f792f9f7a620c9472e6d7da3.tar.xz nixlib-1e95e114e5eefdb0f792f9f7a620c9472e6d7da3.tar.zst nixlib-1e95e114e5eefdb0f792f9f7a620c9472e6d7da3.zip |
nixos/xsession: use graphical systemd user target
While systemd suggests using the pre-defined graphical-session user target, I found that this interface is difficult to use. Additionally, no other major distribution, even in their unstable versions, currently use this mechanism. The window or desktop manager is supposed to run in a systemd user service which activates graphical-session.target and the user services that are binding to this target. The issue is that we can't elegantly pass the xsession environment to the window manager session, in particular whereas the PassEnvironment option does work for DISPLAY, it for some mysterious reason won't for PATH. This commit implements a new graphical user target that works just like default.target. Services which should be run in a graphical session just need to declare wantedBy graphical.target. The graphical target will be activated in the xsession before executing the window or display manager. Fixes #17858.
Diffstat (limited to 'nixos/modules/config/pulseaudio.nix')
-rw-r--r-- | nixos/modules/config/pulseaudio.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index bf66994b5022..bd80c8113483 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -240,11 +240,14 @@ in { }; systemd.user = { services.pulseaudio = { + restartIfChanged = true; serviceConfig = { RestartSec = "500ms"; + PassEnvironment = "DISPLAY"; }; - environment = { DISPLAY = ":${toString config.services.xserver.display}"; }; - restartIfChanged = true; + }; + sockets.pulseaudio = { + wantedBy = [ "sockets.target" ]; }; }; }) |