From 8bc8de706829bf4567e78b6dc1f57e5a0cf0a6b2 Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Wed, 28 Feb 2024 11:44:43 -0500
Subject: [PATCH] alsa-ucm-conf: fixes in 1.2.11 which is in nixpkgs

---
 module.nix           | 6 ------
 packages/default.nix | 8 --------
 2 files changed, 14 deletions(-)

diff --git a/module.nix b/module.nix
index 788e3c0..9f285ee 100644
--- a/module.nix
+++ b/module.nix
@@ -25,8 +25,6 @@ let
           throw "Unsupported kernel"
       );
   dtb = "${linuxPackages_x13s.kernel}/dtbs/qcom/${dtbName}";
-
-  alsa-ucm-conf-env.ALSA_CONFIG_UCM2 = "${x13sPackages."x13s/alsa-ucm-conf"}/share/alsa/ucm2";
 in
 {
   options.nixos-x13s = {
@@ -64,10 +62,6 @@ in
       };
     };
 
-    environment.sessionVariables = alsa-ucm-conf-env;
-    systemd.user.services.pipewire.environment = alsa-ucm-conf-env;
-    systemd.user.services.wireplumber.environment = alsa-ucm-conf-env;
-
     boot = {
       loader.efi.canTouchEfiVariables = true;
       loader.systemd-boot.enable = lib.mkDefault true;
diff --git a/packages/default.nix b/packages/default.nix
index 21e2166..96afafc 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -67,14 +67,6 @@ rec {
     };
   };
 
-  "x13s/alsa-ucm-conf" = pkgs.alsa-ucm-conf.overrideAttrs (
-    _: {
-      version = sources.alsa-ucm-conf.version;
-      src = sources.alsa-ucm-conf;
-      patches = [ ];
-    }
-  );
-
   pd-mapper = pkgs.callPackage ./pd-mapper { inherit qrtr; };
   qrtr = pkgs.callPackage ./qrtr { };