From 1931d7ead73c9060e0d163073e091e028e7b5dfa Mon Sep 17 00:00:00 2001
From: devhell <devhell@mailfresser.de>
Date: Sun, 18 Apr 2021 17:36:23 +0100
Subject: Revert "profiles/{base,packages,services}: Swith to pipewire"

This isn't working for me right now. Various different issues are afoot.
For one, my new headset at work functions as expected, until I change
volume, either on the headset itself or via normal volume control. My
local MPD isn't working either since the switch and there doesn't seem
to be a way to replicate that functionality with `pipewire` right now.

While I'd be more than happy to look into it, as usual, right now is not
a good time.

This reverts commit 997cbff6504bcd6bbc2b9fc72fecf271508956b8.
---
 modules/user/devhell/profiles/base.nix     | 5 +++++
 modules/user/devhell/profiles/packages.nix | 2 ++
 modules/user/devhell/profiles/services.nix | 6 ------
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'modules/user/devhell')

diff --git a/modules/user/devhell/profiles/base.nix b/modules/user/devhell/profiles/base.nix
index 5146f505..8905d001 100644
--- a/modules/user/devhell/profiles/base.nix
+++ b/modules/user/devhell/profiles/base.nix
@@ -37,6 +37,11 @@ in {
       opengl = {
         driSupport32Bit = true;
       };
+      pulseaudio = {
+        enable = true;
+        systemWide = false;
+        extraConfig = "load-module module-native-protocol-tcp auth-ip-acl=127.0.0.1";
+      };
     };
 
     networking = {
diff --git a/modules/user/devhell/profiles/packages.nix b/modules/user/devhell/profiles/packages.nix
index 07027017..7d5bcfb3 100644
--- a/modules/user/devhell/profiles/packages.nix
+++ b/modules/user/devhell/profiles/packages.nix
@@ -28,6 +28,8 @@ in {
     }));
 
     nixpkgs.config = {
+      pulseaudio = true;
+
       allowUnfree = true;
 
       systemd = {
diff --git a/modules/user/devhell/profiles/services.nix b/modules/user/devhell/profiles/services.nix
index 77e31689..12cb4004 100644
--- a/modules/user/devhell/profiles/services.nix
+++ b/modules/user/devhell/profiles/services.nix
@@ -50,12 +50,6 @@ in {
       };
     };
 
-    services.pipewire = {
-      enable = true;
-      alsa.enable = true;
-      pulse.enable = true;
-      socketActivation = true;
-    };
 
     services.xserver = {
       displayManager.defaultSession = "none+i3";
-- 
cgit 1.4.1