Fix the pyLoad user/group option that I added upstream [1]. Fix an evaluation error due to Pipewire changes [2]. [1]: https://github.com/NixOS/nixpkgs/pull/287304 [2]: https://github.com/NixOS/nixpkgs/pull/282377
This commit is contained in:
parent
f9cdff8c13
commit
b9b47fffd6
3 changed files with 24 additions and 43 deletions
|
|
@ -25,8 +25,8 @@ in
|
|||
package = pkgs.pulseaudioFull;
|
||||
};
|
||||
|
||||
environment.etc = {
|
||||
"wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = ''
|
||||
services.pipewire.wireplumber.configPackages = [
|
||||
(pkgs.writeTextDir "share/wireplumber/bluetooth.lua.d/51-bluez-config.lua" ''
|
||||
bluez_monitor.properties = {
|
||||
-- SBC XQ provides better audio
|
||||
["bluez5.enable-sbc-xq"] = true,
|
||||
|
|
@ -40,8 +40,8 @@ in
|
|||
-- FIXME: Some devices may now support both hsp_ag and hfp_ag
|
||||
["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
|
||||
}
|
||||
'';
|
||||
};
|
||||
'')
|
||||
];
|
||||
})
|
||||
|
||||
# Support for A2DP audio profile
|
||||
|
|
|
|||
|
|
@ -39,31 +39,12 @@ in
|
|||
downloadDirectory
|
||||
port
|
||||
;
|
||||
};
|
||||
|
||||
# Use pyload user/media group when downloading files
|
||||
systemd.services.pyload = {
|
||||
serviceConfig = {
|
||||
User = lib.mkForce "pyload";
|
||||
Group = lib.mkForce "media";
|
||||
DynamicUser = lib.mkForce false;
|
||||
};
|
||||
};
|
||||
|
||||
# And make sure the download directory has the correct owners
|
||||
systemd.tmpfiles.settings.pyload = {
|
||||
${cfg.downloadDirectory}.d = {
|
||||
user = "pyload";
|
||||
group = "media";
|
||||
};
|
||||
};
|
||||
|
||||
# Set-up pyload user and media group
|
||||
users.users.pyload = {
|
||||
isSystemUser = true;
|
||||
# Use media group when downloading files
|
||||
group = "media";
|
||||
};
|
||||
|
||||
# Set-up media group
|
||||
users.groups.media = { };
|
||||
|
||||
my.services.nginx.virtualHosts = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue