From bbf8345289c36539c299c6d633a85d16285489d3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 30 Jul 2024 13:14:06 +0200
Subject: ...

---
 hosts/sif/default.nix | 134 +++++++++++++++++++++++++-------------------------
 1 file changed, 68 insertions(+), 66 deletions(-)

(limited to 'hosts/sif')

diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index b90e7162..319dccd9 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -438,72 +438,74 @@ in {
       pulse.enable = true;
       jack.enable = true;
       wireplumber.enable = true;
-    };
-    environment.etc."pipewire/pipewire.conf.d/custom.conf".source = (pkgs.formats.json {}).generate "custom.conf" {
-      "context.properties" = {
-        "log.level" = 2;
-        "core.daemon" = true;
-        "core.name" = "pipewire-0";
-      };
-      "context.modules" = [
-        {
-          name = "libpipewire-module-rtkit";
-          args = {
-            "nice.level" = -15;
-            "rt.prio" = 88;
-            "rt.time.soft" = 200000;
-            "rt.time.hard" = 200000;
+      extraConfig = {
+        pipewire."10-custom" = {
+          "context.properties" = {
+            "log.level" = 2;
+            "core.daemon" = true;
+            "core.name" = "pipewire-0";
           };
-          flags = [ "ifexists" "nofail" ];
-        }
-        # { name = "libpipewire-module-protocol-native"; }
-        { name = "libpipewire-module-profiler"; }
-        # { name = "libpipewire-module-metadata"; }
-        { name = "libpipewire-module-spa-device-factory"; }
-        { name = "libpipewire-module-spa-node-factory"; }
-        # { name = "libpipewire-module-client-node"; }
-        # { name = "libpipewire-module-client-device"; }
-        {
-          name = "libpipewire-module-portal";
-          flags = [ "ifexists" "nofail" ];
-        }
-        {
-          name = "libpipewire-module-access";
-          args = {};
-        }
-        { name = "libpipewire-module-adapter"; }
-        { name = "libpipewire-module-link-factory"; }
-        { name = "libpipewire-module-session-manager"; }
-      ];
-    };
-    environment.etc."pipewire/pipewire-pulse.conf.d/custom.conf".source = (pkgs.formats.json {}).generate "custom.conf" {
-      "context.properties" = {
-        "log.level" = 2;
-      };
-      "context.modules" = [
-        {
-          name = "libpipewire-module-rtkit";
-          args = {
-            "nice.level" = -15;
-            "rt.prio" = 88;
-            "rt.time.soft" = 200000;
-            "rt.time.hard" = 200000;
+          "context.modules" = [
+            {
+              name = "libpipewire-module-rtkit";
+              args = {
+                "nice.level" = -15;
+                "rt.prio" = 88;
+                "rt.time.soft" = 200000;
+                "rt.time.hard" = 200000;
+              };
+              flags = [ "ifexists" "nofail" ];
+            }
+            # { name = "libpipewire-module-protocol-native"; }
+            { name = "libpipewire-module-profiler"; }
+            # { name = "libpipewire-module-metadata"; }
+            { name = "libpipewire-module-spa-device-factory"; }
+            { name = "libpipewire-module-spa-node-factory"; }
+            # { name = "libpipewire-module-client-node"; }
+            # { name = "libpipewire-module-client-device"; }
+            {
+              name = "libpipewire-module-portal";
+              flags = [ "ifexists" "nofail" ];
+            }
+            {
+              name = "libpipewire-module-access";
+              args = {};
+            }
+            { name = "libpipewire-module-adapter"; }
+            { name = "libpipewire-module-link-factory"; }
+            { name = "libpipewire-module-session-manager"; }
+          ];
+        };
+        pipewire-pulse."10-custom" = {
+          "context.properties" = {
+            "log.level" = 2;
           };
-          flags = [ "ifexists" "nofail" ];
-        }
-        # { name = "libpipewire-module-protocol-native"; }
-        # { name = "libpipewire-module-client-node"; }
-        { name = "libpipewire-module-adapter"; }
-        # { name = "libpipewire-module-metadata"; }
-        # {
-        #   name = "libpipewire-module-protocol-pulse";
-        #   args = {
-        #     "server.address" = [ "unix:native" ];
-        #   };
-        # }
-      ];
-      "stream.properties" = {
-        "resample.quality" = 1;
+          "context.modules" = [
+            {
+              name = "libpipewire-module-rtkit";
+              args = {
+                "nice.level" = -15;
+                "rt.prio" = 88;
+                "rt.time.soft" = 200000;
+                "rt.time.hard" = 200000;
+              };
+              flags = [ "ifexists" "nofail" ];
+            }
+            # { name = "libpipewire-module-protocol-native"; }
+            # { name = "libpipewire-module-client-node"; }
+            { name = "libpipewire-module-adapter"; }
+            # { name = "libpipewire-module-metadata"; }
+            # {
+            #   name = "libpipewire-module-protocol-pulse";
+            #   args = {
+            #     "server.address" = [ "unix:native" ];
+            #   };
+            # }
+          ];
+          "stream.properties" = {
+            "resample.quality" = 1;
+          };
+        };
       };
     };
 
@@ -538,7 +540,7 @@ in {
       opengl = {
         enable = true;
         driSupport32Bit = true;
-        setLdLibraryPath = true;
+        # setLdLibraryPath = true;
       };
 
       firmware = [ pkgs.firmwareLinuxNonfree ];
@@ -547,7 +549,7 @@ in {
       nitrokey.enable = true;
     };
 
-    sound.enable = true;
+    # sound.enable = true;
 
     nix = {
       settings.auto-optimise-store = true;
-- 
cgit v1.2.3