c3d2/nix-config
c3d2
/
nix-config
24
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

audio-server: cleanup

This commit is contained in:
Sandro - 2022-09-28 20:29:42 +02:00
parent 52bc6c7a84
commit 1f100e5f87
Signed by: sandro
GPG Key ID: 3AF5A43A3EECC2E5
4 changed files with 2 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/audio-server/default.nix
View File

@ -43,7 +43,6 @@
services.pipewire = {
enable = true;
# config.pipewire-pulse = lib.importJSON ./pipewire-pulse.conf.json;
config.pipewire-pulse =
let
default-pipewire-pulse = lib.importJSON (pkgs.path + "/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json");
@ -76,7 +75,7 @@
security.rtkit.enable = true;
# tell Avahi to publish CUPS and PulseAudio
# tell Avahi to publish services like Pipewire/PulseAudio
services.avahi = {
enable = true;
publish = {
@ -107,9 +106,7 @@
};
users = {
groups = {
pulse-access = { };
};
groups.pulse-access = { };
users.k-ot.extraGroups = [
"pipewire"
"pulse-access" # required for system wide pulseaudio

9
config/audio-server/generate.sh
View File

@ -1,9 +0,0 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p jq
# shellcheck shell=bash
dir=$(dirname "$(readlink -f "$0")")
default_pipewire_pulse=$(nix-instantiate --eval -E '(import <nixos> { }).pkgs.path')/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json
jq -s '.[0] * .[1] * .[2]' "$dir/pipewire-pulse.conf.in.json" "$default_pipewire_pulse" > "$dir/pipewire-pulse.conf.json" <(jq -cnS '{ "context.modules": [ inputs."context.modules" ] | add}' "$default_pipewire_pulse" "$dir/pipewire-pulse.conf.in.json")

30
config/audio-server/pipewire-pulse.conf.in.json
View File

@ -1,30 +0,0 @@
{
"context.exec": [
{
"path": "pactl",
"args": "load-module module-zeroconf-publish"
}
],
"pulse.properties": {
"auth-ip-acl": [
"127.0.0.0/8",
"::1/128",
"fd23:42:c3d2:500::/56",
"172.22.99.0/24",
"172.20.72.0/21",
"2a00:8180:2c00:200::/56",
"2a0f:5382:acab:1400::/56"
],
"pulse.min.req": "256/48000",
"pulse.default.req": "960/48000",
"pulse.min.frag": "256/48000",
"pulse.default.frag": "96000/48000",
"pulse.default.tlength": "96000/48000",
"pulse.min.quantum": "256/48000",
"pulse.default.format": "F32",
"server.address": [
"unix:native",
"tcp:4713"
]
}
}

119
config/audio-server/pipewire-pulse.conf.json
View File

@ -1,119 +0,0 @@
{
"context.exec": [
{
"path": "pactl",
"args": "load-module module-always-sink"
}
],
"context.modules": [
{
"args": {
"nice.level": -11
},
"flags": [
"ifexists",
"nofail"
],
"name": "libpipewire-module-rt"
},
{
"name": "libpipewire-module-protocol-native"
},
{
"name": "libpipewire-module-client-node"
},
{
"name": "libpipewire-module-adapter"
},
{
"name": "libpipewire-module-metadata"
},
{
"name": "libpipewire-module-protocol-pulse"
}
],
"context.properties": {},
"context.spa-libs": {
"audio.convert.*": "audioconvert/libspa-audioconvert",
"support.*": "support/libspa-support"
},
"stream.properties": {},
"pulse.properties": {
"auth-ip-acl": [
"127.0.0.0/8",
"::1/128",
"fd23:42:c3d2:500::/56",
"172.22.99.0/24",
"172.20.72.0/21",
"2a00:8180:2c00:200::/56",
"2a0f:5382:acab:1400::/56"
],
"pulse.default.format": "F32",
"pulse.default.frag": "96000/48000",
"pulse.default.req": "960/48000",
"pulse.default.tlength": "96000/48000",
"pulse.min.frag": "256/48000",
"pulse.min.quantum": "256/48000",
"pulse.min.req": "256/48000",
"server.address": [
"unix:native",
"tcp:4713"
],
"vm.overrides": {
"pulse.min.quantum": "1024/48000"
}
},
"pulse.rules": [
{
"matches": [
{}
],
"actions": {
"update-props": {}
}
},
{
"matches": [
{
"application.process.binary": "teams"
},
{
"application.process.binary": "teams-insiders"
},
{
"application.process.binary": "skypeforlinux"
}
],
"actions": {
"quirks": [
"force-s16-info"
]
}
},
{
"matches": [
{
"application.process.binary": "firefox"
}
],
"actions": {
"quirks": [
"remove-capture-dont-move"
]
}
},
{
"matches": [
{
"application.name": "~speech-dispatcher*"
}
],
"actions": {
"update-props": {
"pulse.min.req": "1024/48000",
"pulse.min.quantum": "1024/48000"
}
}
}
]
}