From e1d2db34a7e10f53c4c7e573877641f1492f84ce Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Tue, 2 Apr 2024 23:39:01 +0200 Subject: [PATCH] Remove "pipewire" from the sound option name --- hosts/seb-desktop/default.nix | 2 +- hosts/seb-laptop/default.nix | 4 ++-- modules/system/sound.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hosts/seb-desktop/default.nix b/hosts/seb-desktop/default.nix index 21bcc4d..f4dcbcf 100644 --- a/hosts/seb-desktop/default.nix +++ b/hosts/seb-desktop/default.nix @@ -14,7 +14,7 @@ dm.sddm.enable = true; de.qtile.enable = true; - sound.pipewire.enable = true; + sound.enable = true; auto-gc.enable = true; vm.qemu.enable = true; flatpak.enable = true; diff --git a/hosts/seb-laptop/default.nix b/hosts/seb-laptop/default.nix index b2a4234..d5b0243 100644 --- a/hosts/seb-laptop/default.nix +++ b/hosts/seb-laptop/default.nix @@ -17,7 +17,7 @@ wlan.enable = true; bluetooth.enable = true; - sound.pipewire.enable = true; + sound.enable = true; auto-gc.enable = true; vm.qemu.enable = true; flatpak.enable = true; @@ -31,6 +31,6 @@ boot.kernelPackages = pkgs.linuxPackages_latest; services.gvfs.enable = true; - + hardware.brillo.enable = true; } diff --git a/modules/system/sound.nix b/modules/system/sound.nix index 797c759..84b97f2 100644 --- a/modules/system/sound.nix +++ b/modules/system/sound.nix @@ -3,9 +3,9 @@ lib, ... }: { - options.myConfig.sound.pipewire.enable = lib.mkEnableOption ""; + options.myConfig.sound.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.sound.pipewire.enable { + config = lib.mkIf config.myConfig.sound.enable { security.rtkit.enable = true; hardware.pulseaudio.enable = false; services.pipewire = {