From f0ef59bc1ac95c2bab968224ffa014f4ade869e4 Mon Sep 17 00:00:00 2001
From: workflow <4farlion@gmail.com>
Date: Mon, 2 Sep 2024 12:41:26 +0100
Subject: [PATCH] fix(flexbox): Update kernel to 6.6.48 addresses sound
 problems on newest Dell drivers

See https://github.com/NixOS/nixpkgs/issues/130882
---
 flake.lock                  | 24 ++++++++++++------------
 machines/flexbox/system.nix | 32 --------------------------------
 2 files changed, 12 insertions(+), 44 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0445994..7c4fdd5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -46,11 +46,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723950649,
-        "narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=",
+        "lastModified": 1725161148,
+        "narHash": "sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "392828aafbed62a6ea6ccab13728df2e67481805",
+        "rev": "32058e9138248874773630c846563b1a78ee7a5b",
         "type": "github"
       },
       "original": {
@@ -61,11 +61,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1724067415,
-        "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=",
+        "lastModified": 1724878143,
+        "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2",
+        "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef",
         "type": "github"
       },
       "original": {
@@ -77,11 +77,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1723991338,
-        "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
+        "lastModified": 1725103162,
+        "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8a3354191c0d7144db9756a74755672387b702ba",
+        "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1723938990,
-        "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=",
+        "lastModified": 1725001927,
+        "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890",
+        "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
         "type": "github"
       },
       "original": {
diff --git a/machines/flexbox/system.nix b/machines/flexbox/system.nix
index 2d84ee6..05c91cd 100644
--- a/machines/flexbox/system.nix
+++ b/machines/flexbox/system.nix
@@ -18,38 +18,6 @@ in {
   # https://lore.kernel.org/linux-nvme/YnR%2FFiWbErNGXIx+@kbusch-mbp/T/
   boot.kernelParams = ["nvme_core.default_ps_max_latency_us=0" "acpiphp.disable=1"];
 
-  # Temporary Audio fix on Kernel 6.6.37+
-  # See https://github.com/NixOS/nixpkgs/issues/330685
-  # boot.extraModprobeConfig = ''
-  #   options snd-hda-intel dmic_detect=0
-  # '';
-  # boot.kernelPatches = [
-  #   {
-  #     name = "fix-1";
-  #     patch = builtins.fetchurl {
-  #       url = "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/patch/sound/soc/soc-topology.c?id=e0e7bc2cbee93778c4ad7d9a792d425ffb5af6f7";
-  #       sha256 = "sha256:1y5nv1vgk73aa9hkjjd94wyd4akf07jv2znhw8jw29rj25dbab0q";
-  #     };
-  #   }
-  #   {
-  #     name = "fix-2";
-  #     patch = builtins.fetchurl {
-  #       url = "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/patch/sound/soc/soc-topology.c?id=0298f51652be47b79780833e0b63194e1231fa34";
-  #       sha256 = "sha256:14xb6nmsyxap899mg9ck65zlbkvhyi8xkq7h8bfrv4052vi414yb";
-  #     };
-  #   }
-  # ];
-  boot.kernelPackages = pkgs.linuxPackagesFor (pkgs.linux_6_6.override {
-    argsOverride = rec {
-      src = pkgs.fetchurl {
-        url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
-        sha256 = "sha256-85dud3CGlP5KH40TB8MVyKNsvFjwOKOOAGuR4pofMhQ=";
-      };
-      version = "6.6.37";
-      modDirVersion = "6.6.37";
-    };
-  });
-
   # GPU
   environment.systemPackages = [nvidia-offload];
   services.xserver.videoDrivers = ["nvidia"];