@ -5,7 +5,7 @@ with lib;
let
inherit ( pkgs ) alsaU tils ;
inherit ( pkgs ) alsa-u tils ;
pulseaudioEnabled = config . hardware . pulseaudio . enable ;
@ -88,13 +88,13 @@ in
config = mkIf config . sound . enable {
environment . systemPackages = [ alsaU tils ] ;
environment . systemPackages = [ alsa-u tils ] ;
environment . etc = mkIf ( ! pulseaudioEnabled && config . sound . extraConfig != " " )
{ " a s o u n d . c o n f " . text = config . sound . extraConfig ; } ;
# ALSA provides a udev rule for restoring volume settings.
services . udev . packages = [ alsaU tils ] ;
services . udev . packages = [ alsa-u tils ] ;
boot . kernelModules = optional config . sound . enableOSSEmulation " s n d _ p c m _ o s s " ;
@ -107,7 +107,7 @@ in
Type = " o n e s h o t " ;
RemainAfterExit = true ;
ExecStart = " ${ pkgs . coreutils } / b i n / m k d i r - p / v a r / l i b / a l s a " ;
ExecStop = " ${ alsaU tils } / s b i n / a l s a c t l s t o r e - - i g n o r e " ;
ExecStop = " ${ alsa-u tils } / s b i n / a l s a c t l s t o r e - - i g n o r e " ;
} ;
} ;
@ -115,16 +115,16 @@ in
enable = true ;
bindings = [
# "Mute" media key
{ keys = [ 113 ] ; events = [ " k e y " ] ; command = " ${ alsaU tils } / b i n / a m i x e r - q s e t M a s t e r t o g g l e " ; }
{ keys = [ 113 ] ; events = [ " k e y " ] ; command = " ${ alsa-u tils } / b i n / a m i x e r - q s e t M a s t e r t o g g l e " ; }
# "Lower Volume" media key
{ keys = [ 114 ] ; events = [ " k e y " " r e p " ] ; command = " ${ alsaU tils } / b i n / a m i x e r - q s e t M a s t e r ${ config . sound . mediaKeys . volumeStep } - u n m u t e " ; }
{ keys = [ 114 ] ; events = [ " k e y " " r e p " ] ; command = " ${ alsa-u tils } / b i n / a m i x e r - q s e t M a s t e r ${ config . sound . mediaKeys . volumeStep } - u n m u t e " ; }
# "Raise Volume" media key
{ keys = [ 115 ] ; events = [ " k e y " " r e p " ] ; command = " ${ alsaU tils } / b i n / a m i x e r - q s e t M a s t e r ${ config . sound . mediaKeys . volumeStep } + u n m u t e " ; }
{ keys = [ 115 ] ; events = [ " k e y " " r e p " ] ; command = " ${ alsa-u tils } / b i n / a m i x e r - q s e t M a s t e r ${ config . sound . mediaKeys . volumeStep } + u n m u t e " ; }
# "Mic Mute" media key
{ keys = [ 190 ] ; events = [ " k e y " ] ; command = " ${ alsaU tils } / b i n / a m i x e r - q s e t C a p t u r e t o g g l e " ; }
{ keys = [ 190 ] ; events = [ " k e y " ] ; command = " ${ alsa-u tils } / b i n / a m i x e r - q s e t C a p t u r e t o g g l e " ; }
] ;
} ;