Revert to pulseaudio until pipewire works systemwide
This commit is contained in:
parent
2e1383af03
commit
bd6aaa4901
|
@ -6,8 +6,10 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
octoprintPort = 8080;
|
octoprintPort = 8080;
|
||||||
in {
|
in
|
||||||
imports = [ # Include the results of the hardware scan.
|
{
|
||||||
|
imports = [
|
||||||
|
# Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -41,9 +43,9 @@ in {
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "pulsebert"; # Define your hostname.
|
hostName = "pulsebert"; # Define your hostname.
|
||||||
|
|
||||||
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
|
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
|
||||||
# Per-interface useDHCP will be mandatory in the future, so this generated config
|
# Per-interface useDHCP will be mandatory in the future, so this generated config
|
||||||
# replicates the default behaviour.
|
# replicates the default behaviour.
|
||||||
useDHCP = false;
|
useDHCP = false;
|
||||||
interfaces.eth0.useDHCP = true;
|
interfaces.eth0.useDHCP = true;
|
||||||
interfaces.wlan0.useDHCP = true;
|
interfaces.wlan0.useDHCP = true;
|
||||||
|
@ -101,12 +103,28 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
services.pipewire = {
|
hardware.pulseaudio = {
|
||||||
enable = true;
|
enable = true;
|
||||||
alsa.enable = true;
|
systemWide = true;
|
||||||
config.pipewire-pulse = lib.importJSON ./pipewire-pulse.conf.json;
|
tcp.enable = true;
|
||||||
pulse.enable = true;
|
tcp.anonymousClients.allowedIpRanges = [
|
||||||
|
"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"
|
||||||
|
];
|
||||||
|
zeroconf.publish.enable = true;
|
||||||
|
package = pkgs.pulseaudioFull;
|
||||||
|
extraModules = [ pkgs.pulseaudio-modules-bt ];
|
||||||
};
|
};
|
||||||
|
#services.pipewire = {
|
||||||
|
# enable = true;
|
||||||
|
# alsa.enable = true;
|
||||||
|
# config.pipewire-pulse = lib.importJSON ./pipewire-pulse.conf.json;
|
||||||
|
# pulse.enable = true;
|
||||||
|
#};
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
|
|
||||||
# tell Avahi to publish CUPS and PulseAudio
|
# tell Avahi to publish CUPS and PulseAudio
|
||||||
|
|
Loading…
Reference in New Issue