moby: disable legacy PulseAudio stuff
This commit is contained in:
parent
98a6671e95
commit
a6ea5da7a1
|
@ -37,11 +37,6 @@
|
||||||
|
|
||||||
sops.secrets.colin-passwd.neededForUsers = true;
|
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.gui.sxmo.enable = true;
|
||||||
sane.programs.guiApps.suggestedPrograms = [ "handheldGuiApps" ];
|
sane.programs.guiApps.suggestedPrograms = [ "handheldGuiApps" ];
|
||||||
# sane.programs.consoleUtils.enableFor.user.colin = false;
|
# sane.programs.consoleUtils.enableFor.user.colin = false;
|
||||||
|
@ -139,15 +134,11 @@
|
||||||
environment.variables.ALSA_CONFIG_UCM2 = "/run/current-system/sw/share/alsa/ucm2";
|
environment.variables.ALSA_CONFIG_UCM2 = "/run/current-system/sw/share/alsa/ucm2";
|
||||||
environment.pathsToLink = [ "/share/alsa/ucm2" ];
|
environment.pathsToLink = [ "/share/alsa/ucm2" ];
|
||||||
environment.systemPackages = [ pkgs.alsa-ucm-conf-sane ];
|
environment.systemPackages = [ pkgs.alsa-ucm-conf-sane ];
|
||||||
systemd =
|
systemd = let
|
||||||
let ucm-env = config.environment.variables.ALSA_CONFIG_UCM2;
|
ucm-env = config.environment.variables.ALSA_CONFIG_UCM2;
|
||||||
in {
|
in {
|
||||||
# cribbed from <repo:nixos/mobile-nixos:modules/quirks/audio.nix>
|
# cribbed from <repo:nixos/mobile-nixos:modules/quirks/audio.nix>
|
||||||
|
|
||||||
# pulseaudio
|
|
||||||
user.services.pulseaudio.environment.ALSA_CONFIG_UCM2 = ucm-env;
|
|
||||||
services.pulseaudio.environment.ALSA_CONFIG_UCM2 = ucm-env;
|
|
||||||
|
|
||||||
# pipewire
|
# pipewire
|
||||||
user.services.pipewire.environment.ALSA_CONFIG_UCM2 = ucm-env;
|
user.services.pipewire.environment.ALSA_CONFIG_UCM2 = ucm-env;
|
||||||
user.services.pipewire-pulse.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.pipewire-pulse.environment.ALSA_CONFIG_UCM2 = ucm-env;
|
||||||
services.wireplumber.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...
|
# TODO: move elsewhere...
|
||||||
services.ModemManager.serviceConfig = {
|
services.ModemManager.serviceConfig = {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user