diff --git a/modules/hardware/audio/default.nix b/modules/hardware/audio/default.nix index d2b4aca..23aa02a 100644 --- a/modules/hardware/audio/default.nix +++ b/modules/hardware/audio/default.nix @@ -7,15 +7,6 @@ in { options.custom.hardware.audio = with types; { enable = mkBoolOpt false "Whether or not to enable audio support."; - alsa-monitor = mkOpt attrs { } "Alsa configuration."; - nodes = mkOpt (listOf attrs) [ ] - "Audio nodes to pass to Pipewire as `context.objects`."; - modules = mkOpt (listOf attrs) [ ] - "Audio modules to pass to Pipewire as `context.modules`."; - extra-packages = mkOpt (listOf package) [ - pkgs.qjackctl - pkgs.easyeffects - ] "Additional packages to install."; }; config = mkIf cfg.enable { @@ -31,38 +22,6 @@ in jack.enable = true; wireplumber.enable = true; - - #media-session.enable = true; - #media-session.config.alsa-monitor = mkAliasDefinitions options.custom.hardware.audio.alsa-monitor; - - #config.pipewire = { - # "context.objects" = cfg.nodes ++ [ ]; - # "context.modules" = [ - # { - # name = "libpipewire-module-rtkit"; - # args = { }; - # flags = [ "ifexists" "nofail" ]; - # } - # { name = "libpipewire-module-protocol-native"; } - # { name = "libpipewire-module-profiler"; } - # { name = "libpipewire-module-metadata"; } - # { name = "libpipewire-module-spa-device-factory"; } - # { name = "libpipewire-module-spa-node-factory"; } - # { name = "libpipewire-module-client-node"; } - # { name = "libpipewire-module-client-device"; } - # { - # name = "libpipewire-module-portal"; - # flags = [ "ifexists" "nofail" ]; - # } - # { - # name = "libpipewire-module-access"; - # args = { }; - # } - # { name = "libpipewire-module-adapter"; } - # { name = "libpipewire-module-link-factory"; } - # { name = "libpipewire-module-session-manager"; } - # ] ++ cfg.modules; - # }; }; hardware.pulseaudio.enable = mkForce false; @@ -70,6 +29,6 @@ in environment.systemPackages = with pkgs; [ pulsemixer pavucontrol - ] ++ cfg.extra-packages; + ]; }; }