diff --git a/hosts/boreal/default.nix b/hosts/boreal/default.nix index b481ec7..5ed208b 100644 --- a/hosts/boreal/default.nix +++ b/hosts/boreal/default.nix @@ -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; diff --git a/services/default.nix b/services/default.nix index bfe8f02..93fe1fe 100644 --- a/services/default.nix +++ b/services/default.nix @@ -14,7 +14,6 @@ ./monitoring.nix ./nextcloud.nix ./nginx.nix - ./pipewire.nix ./postgresql-backup.nix ./postgresql.nix ./tgv.nix diff --git a/services/pipewire.nix b/services/pipewire.nix deleted file mode 100644 index c681cf4..0000000 --- a/services/pipewire.nix +++ /dev/null @@ -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; - }; - } - ]; - }; - }; - }; -}