Compare commits
No commits in common. "c75979acef6ff2e3fd9a8fc06e633854d3d8d6a0" and "d1e7ab17e264498c06bc8d5bdb0129e09b6cb23f" have entirely different histories.
c75979acef
...
d1e7ab17e2
|
@ -74,8 +74,6 @@ in
|
|||
];
|
||||
};
|
||||
|
||||
pipewire.enable = true;
|
||||
|
||||
wireguard = {
|
||||
enable = false;
|
||||
iface = "wg";
|
||||
|
@ -114,6 +112,13 @@ in
|
|||
# TODO: remove when https://nixpk.gs/pr-tracker.html?pr=124237 reaches unstable
|
||||
nix.sandboxPaths = [ "/bin/sh=${pkgs.bash}/bin/sh" ];
|
||||
|
||||
sound.enable = true;
|
||||
hardware.pulseaudio = {
|
||||
enable = true;
|
||||
extraModules = [ pkgs.pulseaudio-modules-bt ];
|
||||
package = pkgs.pulseaudioFull;
|
||||
};
|
||||
|
||||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
powerOnBoot = true;
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
./monitoring.nix
|
||||
./nextcloud.nix
|
||||
./nginx.nix
|
||||
./pipewire.nix
|
||||
./postgresql-backup.nix
|
||||
./postgresql.nix
|
||||
./tgv.nix
|
||||
|
|
|
@ -1,68 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.my.services.pipewire;
|
||||
my = config.my;
|
||||
in
|
||||
{
|
||||
options.my.services.pipewire = {
|
||||
enable = lib.mkEnableOption "Pipewire sound backend";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
# from NixOS wiki, causes conflicts with pipewire
|
||||
sound.enable = false;
|
||||
# recommended for pipewire as well
|
||||
security.rtkit.enable = true;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
|
||||
alsa = {
|
||||
enable = true;
|
||||
support32Bit = true;
|
||||
};
|
||||
pulse.enable = true;
|
||||
jack.enable = true;
|
||||
|
||||
media-session = {
|
||||
enable = true;
|
||||
config.bluez-monitor.rules = [
|
||||
{
|
||||
# Matches all cards
|
||||
matches = [{ "device.name" = "~bluez_card.*"; }];
|
||||
actions = {
|
||||
"update-props" = {
|
||||
"bluez5.reconnect-profiles" = [
|
||||
"a2dp_sink"
|
||||
"hfp_hf"
|
||||
"hsp_hs"
|
||||
];
|
||||
# mSBC provides better audio + microphone
|
||||
"bluez5.msbc-support" = true;
|
||||
# SBC XQ provides better audio
|
||||
"bluez5.sbc-xq-support" = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
{
|
||||
matches = [
|
||||
# Matches all sources
|
||||
{
|
||||
"node.name" = "~bluez_input.*";
|
||||
}
|
||||
# Matches all outputs
|
||||
{
|
||||
"node.name" = "~bluez_output.*";
|
||||
}
|
||||
];
|
||||
actions = {
|
||||
"node.pause-on-idle" = false;
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
Loading…
Reference in a new issue