From 65e1ab6bff14cdf9d7ca2b46c91462da9148db72 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 25 Sep 2022 14:46:39 +0200 Subject: ma gui: pulseaudio -> pipewire --- makefu/2configs/gui/base.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'makefu/2configs/gui') diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix index 4ae816d5f..b2192c7f9 100644 --- a/makefu/2configs/gui/base.nix +++ b/makefu/2configs/gui/base.nix @@ -17,8 +17,10 @@ in { imports = [ ./urxvtd.nix + ./pipewire.nix ]; + services.xserver = { enable = true; layout = "us"; @@ -49,7 +51,7 @@ in }; users.users.${mainUser} = { - extraGroups = [ "audio" ]; + extraGroups = [ "pipewire" "audio" ]; packages = with pkgs;[ pavucontrol xlockmore @@ -57,10 +59,6 @@ in ]; }; - hardware.pulseaudio = { - enable = true; - # systemWide = true; - }; services.xserver.displayManager.sessionCommands = let xdefaultsfile = pkgs.writeText "Xdefaults" '' cat |derp <