diff --git a/machines/laptop.nix b/machines/laptop.nix index 15b2085..cc3016c 100644 --- a/machines/laptop.nix +++ b/machines/laptop.nix @@ -23,25 +23,6 @@ printing.enable = true; }; - # Pipewire roc sink - services.pipewire.extraConfig.pipewire."60-roc-sink" = { - context.modules = [ - { - name = "libpipewire-module-roc-source"; - args = { - fec.code = "rs8m"; - remote.ip = "10.20.60.251"; - remote.source.port = 10001; - remote.repair.port = 10002; - source.name = "Roc Sink"; - source.props = { - node.name = "roc-sink"; - }; - }; - } - ]; - }; - # Hardware configuration hardware.enableRedistributableFirmware = true; boot.initrd.availableKernelModules = [ diff --git a/machines/vm-audio.nix b/machines/vm-audio.nix index f99aefb..b17b531 100644 --- a/machines/vm-audio.nix +++ b/machines/vm-audio.nix @@ -44,20 +44,18 @@ # Pipewire roc source services.pipewire.extraConfig.pipewire."60-roc-source" = { - context.modules = [ + "context.modules" = [ { - name = "libpipewire-module-roc-source"; - args = { - local.ip = "0.0.0.0"; - resampler.profile = "medium"; - fec.code = "rs8m"; - sess.latency.msec = 10; - local.source.port = 10001; - local.repair.port = 10002; - source.name = "Roc Source"; - source.props = { - node.name = "roc-source"; - }; + "name" = "libpipewire-module-roc-source"; + "args" = { + "fec.code" = "rs8m"; + "local.ip" = "0.0.0.0"; + "resampler.profile" = "medium"; + # sess.latency.msec = 10; + "local.source.port" = 10001; + "local.repair.port" = 10002; + "source.name" = "Roc Source"; + "source.props.node.name" = "roc-source"; }; } ]; diff --git a/users/jan.nix b/users/jan.nix index a51331d..6ee8d04 100644 --- a/users/jan.nix +++ b/users/jan.nix @@ -295,6 +295,25 @@ }; }; + # Pipewire roc sink + xdg.configFile."pipewire/pipewire.conf.d/60-roc-sink.conf" = { + text = '' + context.modules = [ + { + name = "libpipewire-module-roc-sink" + args = { + fec.code = "rs8m" + remote.ip = "10.20.60.251" + remote.source.port = 10001 + remote.repair.port = 10002 + sink.name = "Roc Sink" + sink.props.node.name = "roc-sink" + } + } + ] + ''; + }; + # Enabled modules modules = { # Communication