From 38e82be3808ff50c2f713a840f28e9ce2e71f375 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Wed, 3 Apr 2024 21:39:13 -0400 Subject: [PATCH] meta: Merge pipewire module with hyprland Realistically if hyprland is being used then the user *probably* wants audio as well, so merging them makes sense here. This commit is a part of ultimately having a single module for "desktop" usage. --- modules/hyprland.nix | 15 +++++++++++++++ modules/pipewire.nix | 18 ------------------ 2 files changed, 15 insertions(+), 18 deletions(-) delete mode 100644 modules/pipewire.nix diff --git a/modules/hyprland.nix b/modules/hyprland.nix index dfa65722..3e2118e0 100644 --- a/modules/hyprland.nix +++ b/modules/hyprland.nix @@ -21,4 +21,19 @@ enable = true; excludePackages = [ pkgs.xterm ]; }; + + services.pipewire = { + enable = true; + + alsa = { + enable = true; + support32Bit = true; + }; + + pulse.enable = true; + }; + + environment.systemPackages = with pkgs; [ + pulseaudio + ]; } diff --git a/modules/pipewire.nix b/modules/pipewire.nix deleted file mode 100644 index e9b417f1..00000000 --- a/modules/pipewire.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs, ... }: - -{ - services.pipewire = { - enable = true; - - alsa = { - enable = true; - support32Bit = true; - }; - - pulse.enable = true; - }; - - environment.systemPackages = with pkgs; [ - pulseaudio - ]; -}