From 997cbff6504bcd6bbc2b9fc72fecf271508956b8 Mon Sep 17 00:00:00 2001
From: devhell <devhell@mailfresser.de>
Date: Sun, 11 Apr 2021 15:14:37 +0100
Subject: profiles/{base,packages,services}: Swith to pipewire

This seems very neat, and after a brief test I'm going to see if I can
switch to it permanently.

This is also the beginning of my journey to move to sway eventually.
---
 modules/user/devhell/profiles/base.nix     | 5 -----
 modules/user/devhell/profiles/packages.nix | 2 --
 modules/user/devhell/profiles/services.nix | 6 ++++++
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'modules')

diff --git a/modules/user/devhell/profiles/base.nix b/modules/user/devhell/profiles/base.nix
index 8905d001..5146f505 100644
--- a/modules/user/devhell/profiles/base.nix
+++ b/modules/user/devhell/profiles/base.nix
@@ -37,11 +37,6 @@ 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 8ebae31e..6add7da2 100644
--- a/modules/user/devhell/profiles/packages.nix
+++ b/modules/user/devhell/profiles/packages.nix
@@ -28,8 +28,6 @@ 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 a7cb4c68..591f5055 100644
--- a/modules/user/devhell/profiles/services.nix
+++ b/modules/user/devhell/profiles/services.nix
@@ -50,6 +50,12 @@ in {
       };
     };
 
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      pulse.enable = true;
+      socketActivation = true;
+    };
 
     services.xserver = {
       displayManager.defaultSession = "none+i3";
-- 
cgit 1.4.1