From 32a7e59b93a9c3748cd6aeca3d4fc9dadf8e0f59 Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Sun, 11 Jan 2026 08:03:58 -0600 Subject: move various configs into modules where they belong --- modules/services/nixos/audio.nix | 5 +++-- modules/services/options.nix | 8 +++----- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'modules/services') diff --git a/modules/services/nixos/audio.nix b/modules/services/nixos/audio.nix index 93f8289..8f2f23e 100644 --- a/modules/services/nixos/audio.nix +++ b/modules/services/nixos/audio.nix @@ -12,9 +12,10 @@ in enable = true; wireplumber.enable = true; alsa.enable = true; - - pulse.enable = cfg.pulse.enable; + pulse.enable = false; }; + boot.blacklistedKernelModules = ["snd_seq_dummy"]; # remove extraneous alsa midi devices + environment.systemPackages = [pkgs.pwvucontrol]; } diff --git a/modules/services/options.nix b/modules/services/options.nix index df8bc52..16bf5ac 100644 --- a/modules/services/options.nix +++ b/modules/services/options.nix @@ -46,11 +46,9 @@ in { }; }; }; - audio = { - enable = mkEnableOption "pipewire + wireplumber"; - pulse.enable = mkEnableOption "pipewire-pulse"; - # some config to make audio work with wine (TODO for jupiter) - }; + + audio.enable = mkEnableOption "pipewire + wireplumber"; + bluetooth = { enable = mkEnableOption "bluetooth"; blueman.enable = mkEnableOption "graphical bluetooth manager"; -- cgit v1.3.1