From 361b5f7f6533c2b597057805b16bdf229d675d15 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 11 Oct 2019 20:02:25 -0400 Subject: nixos/pulseaudio: don't autospawn ever This is long been superseded by socket activation. Additonally using autospawn nudges some unpleasant GDM related issues. --- nixos/modules/config/pulseaudio.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nixos/modules/config') diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 5c3e39302583..b3bc4a451aa0 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -51,8 +51,7 @@ let # that we can disable the autospawn feature in programs that # are built with PulseAudio support (like KDE). clientConf = writeText "client.conf" '' - autospawn=${if nonSystemWide then "yes" else "no"} - ${optionalString nonSystemWide "daemon-binary=${binary}"} + autospawn=no ${cfg.extraClientConf} ''; -- cgit 1.4.1 From 2c7f0f06b79aea5ecd433ae5601f1b021030dbba Mon Sep 17 00:00:00 2001 From: Tor Hedin Brønner Date: Tue, 15 Oct 2019 13:17:38 +0200 Subject: nixos/system-environment: prepend wrapperDir to PATH (#70430) This fixes user environment setup for sessions which doesn't successfully go through a shell init. Note we don't go through `sessionVariables` as we want the wrappers to have highest priority. It would also cause wrapperDir to occur twice when in shell sessions, as shells use `sessionVariables` too while prepending wrapperDir in a custom snippet. In particular logging in and out of gnome-shell could result in a broken path without this fix. --- nixos/modules/config/system-environment.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'nixos/modules/config') diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix index 361c3cfc553d..4888740ba3d5 100644 --- a/nixos/modules/config/system-environment.nix +++ b/nixos/modules/config/system-environment.nix @@ -88,6 +88,13 @@ in (mapAttrsToList pamVariable (zipAttrsWith (n: concatLists) [ + # Make sure security wrappers are prioritized without polluting + # shell environments with an extra entry. Sessions which depend on + # pam for its environment will otherwise have eg. broken sudo. In + # particular Gnome Shell sometimes fails to source a proper + # environment from a shell. + { PATH = [ config.security.wrapperDir ]; } + (mapAttrs (n: toList) cfg.sessionVariables) suffixedVariables ])); -- cgit 1.4.1