diff --git a/home/emmatherock/audio.nix b/home/emmatherock/audio.nix index 494aa64..493fff4 100644 --- a/home/emmatherock/audio.nix +++ b/home/emmatherock/audio.nix @@ -1,12 +1,25 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: + +let + pipewireDir = ./pipewire; + + pipewireFiles = + lib.filterAttrs + (name: type: type == "regular" && lib.hasSuffix ".conf" name) + (builtins.readDir pipewireDir); + + pipewireConfigFiles = + lib.mapAttrs' + (name: _: + lib.nameValuePair + "pipewire/pipewire.conf.d/${name}" + { source = pipewireDir + "/${name}"; } + ) + pipewireFiles; +in { - xdg.configFile = { - "pipewire/pipewire.conf.d/10-discord.conf".source = ./pipewire/10-discord.conf; - "pipewire/pipewire.conf.d/10-mic.conf".source = ./pipewire/10-mic.conf; - "pipewire/pipewire.conf.d/10-misc.conf".source = ./pipewire/10-misc.conf; - "pipewire/pipewire.conf.d/10-music.conf".source = ./pipewire/10-music.conf; - "pipewire/pipewire.conf.d/10-vban-send.conf".source = ./pipewire/10-vban-send.conf; - }; + xdg.configFile = pipewireConfigFiles; + systemd.user.services.carla = { Unit = { Description = "Carla Audio Host"; diff --git a/home/emmatherock/pipewire/10-vban-send.conf b/home/emmatherock/pipewire/10-vban-send.conf deleted file mode 100644 index 070f22f..0000000 --- a/home/emmatherock/pipewire/10-vban-send.conf +++ /dev/null @@ -1,27 +0,0 @@ - context.modules = [ - { name = libpipewire-module-vban-send - args = { - local.ifname = "enp6s0" - source.ip = "10.1.1.21" - destination.ip = "10.1.1.20" - #destination.port = 6980 - #net.mtu = 1500 - #net.ttl = 1 - #net.loop = false - #sess.min-ptime = 2 - #sess.max-ptime = 20 - sess.name = "mic-vban" - sess.media = "audio" - audio.format = "S24LE" - audio.rate = 48000 - audio.channels = 2 - audio.position = [ FL FR ] - stream.props = { - media.class = "Audio/Sink" - node.name = "vban-sender" - - } - } - #flags = [ nofail ] -} -]