From a6ea5da7a129adf67d6e277297f259e76642d450 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 7 Oct 2023 01:27:16 +0000 Subject: [PATCH] moby: disable legacy PulseAudio stuff --- hosts/by-name/moby/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/hosts/by-name/moby/default.nix b/hosts/by-name/moby/default.nix index 48ef421f..138a559a 100644 --- a/hosts/by-name/moby/default.nix +++ b/hosts/by-name/moby/default.nix @@ -37,11 +37,6 @@ sops.secrets.colin-passwd.neededForUsers = true; - sane.user.persist.plaintext = [ - # TODO: make this just generally conditional upon pulse being enabled? - ".config/pulse" # persist pulseaudio volume - ]; - sane.gui.sxmo.enable = true; sane.programs.guiApps.suggestedPrograms = [ "handheldGuiApps" ]; # sane.programs.consoleUtils.enableFor.user.colin = false; @@ -139,15 +134,11 @@ environment.variables.ALSA_CONFIG_UCM2 = "/run/current-system/sw/share/alsa/ucm2"; environment.pathsToLink = [ "/share/alsa/ucm2" ]; environment.systemPackages = [ pkgs.alsa-ucm-conf-sane ]; - systemd = - let ucm-env = config.environment.variables.ALSA_CONFIG_UCM2; - in { + systemd = let + ucm-env = config.environment.variables.ALSA_CONFIG_UCM2; + in { # cribbed from - # pulseaudio - user.services.pulseaudio.environment.ALSA_CONFIG_UCM2 = ucm-env; - services.pulseaudio.environment.ALSA_CONFIG_UCM2 = ucm-env; - # pipewire user.services.pipewire.environment.ALSA_CONFIG_UCM2 = ucm-env; user.services.pipewire-pulse.environment.ALSA_CONFIG_UCM2 = ucm-env; @@ -156,6 +147,10 @@ services.pipewire-pulse.environment.ALSA_CONFIG_UCM2 = ucm-env; services.wireplumber.environment.ALSA_CONFIG_UCM2 = ucm-env; + # pulseaudio + # user.services.pulseaudio.environment.ALSA_CONFIG_UCM2 = ucm-env; + # services.pulseaudio.environment.ALSA_CONFIG_UCM2 = ucm-env; + # TODO: move elsewhere... services.ModemManager.serviceConfig = {