From b4c83987f99704073101c9609c098b811930dd32 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Wed, 2 Aug 2023 06:38:46 +0000
Subject: [PATCH] overlays: split the pipewire ffado tweak into a `preferences`
 overlay

---
 flake.nix                         |  1 +
 overlays/all.nix                  |  2 ++
 overlays/disable-flakey-tests.nix |  6 ------
 overlays/preferences.nix          | 10 ++++++++++
 4 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 overlays/preferences.nix

diff --git a/flake.nix b/flake.nix
index e2e8465e..7dc0324f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -174,6 +174,7 @@
         disable-flakey-tests = final: prev: import ./overlays/disable-flakey-tests.nix final prev;
         pkgs = final: prev: import ./overlays/pkgs.nix final prev;
         pins = final: prev: import ./overlays/pins.nix final prev;
+        preferences = final: prev: import ./overlays/preferences.nix final prev;
         optimizations = final: prev: import ./overlays/optimizations.nix final prev;
         passthru = final: prev:
           let
diff --git a/overlays/all.nix b/overlays/all.nix
index 8ced83ef..7c522814 100644
--- a/overlays/all.nix
+++ b/overlays/all.nix
@@ -5,6 +5,7 @@
 final: prev:
 let
   pkgs = import ./pkgs.nix;
+  preferences = import ./preferences.nix;
   disable-flakey-tests = import ./disable-flakey-tests.nix;
   optimizations = import ./optimizations.nix;
   cross = import ./cross.nix;
@@ -18,6 +19,7 @@ let
 in
   renderOverlays [
     pkgs
+    preferences
     disable-flakey-tests
     (ifCross optimizations)
     (ifCross cross)
diff --git a/overlays/disable-flakey-tests.nix b/overlays/disable-flakey-tests.nix
index 65d5ef1f..7eb539ab 100644
--- a/overlays/disable-flakey-tests.nix
+++ b/overlays/disable-flakey-tests.nix
@@ -50,12 +50,6 @@ in {
     mesonFlags = [ "-Dtests=disabled" ];
   }) prev.libwacom;
 
-  pipewire = prev.pipewire.override {
-    # avoid a dep on python3.10-PyQt5, which has mixed qt5 versions.
-    # this means we lose firewire support (oh well..?)
-    ffadoSupport = false;
-  };
-
   pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
     (py-next: py-prev: {
       pyarrow = py-prev.pyarrow.overridePythonAttrs (upstream: {
diff --git a/overlays/preferences.nix b/overlays/preferences.nix
new file mode 100644
index 00000000..57909660
--- /dev/null
+++ b/overlays/preferences.nix
@@ -0,0 +1,10 @@
+# personal preferences
+# prefer to encode these in `sane.programs`
+# resort to this method for e.g. system dependencies, or things which are referenced from too many places.
+(next: prev: {
+  pipewire = prev.pipewire.override {
+    # avoid a dep on python3.10-PyQt5, which has mixed qt5 versions.
+    # this means we lose firewire support (oh well..?)
+    ffadoSupport = false;
+  };
+})