framework: Add hardware.framework.laptop13.audioEnhancement option

Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
NixOS · Nov 16, 2024 · 2c7fa3e · 2c7fa3e
1 parent c2c275f
commit 2c7fa3e
Show file tree

Hide file tree

Showing 5 changed files with 394 additions and 5 deletions.
diff --git a/framework/13-inch/11th-gen-intel/default.nix b/framework/13-inch/11th-gen-intel/default.nix
@@ -7,4 +7,6 @@
   # Requires at least 5.16 for working wi-fi and bluetooth.
   # https://community.frame.work/t/using-the-ax210-with-linux-on-the-framework-laptop/1844/89
   boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.16") (lib.mkDefault pkgs.linuxPackages_latest);
+
+  hardware.framework.laptop13.audioEnhancement.rawDeviceName = lib.mkDefault "alsa_output.pci-0000_00_1f.3.analog-stereo";
 }
diff --git a/framework/13-inch/12th-gen-intel/default.nix b/framework/13-inch/12th-gen-intel/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 {
   imports = [
     ../common
@@ -8,17 +8,19 @@
   config = lib.mkMerge [
     {
       hardware.intelgpu.loadInInitrd = lib.versionOlder config.boot.kernelPackages.kernel.version "6.2";
+      # same as 13th gen framework 13-inch
+      hardware.framework.laptop13.audioEnhancement.rawDeviceName = lib.mkDefault "alsa_output.pci-0000_00_1f.3.analog-stereo";
     }
     # https://community.frame.work/t/tracking-hard-freezing-on-fedora-36-with-the-new-12th-gen-system/20675/391
     (lib.mkIf (lib.versionOlder config.boot.kernelPackages.kernel.version "6.2") {
-      boot.kernelParams = [ 
+      boot.kernelParams = [
         # Workaround iGPU hangs
         # https://discourse.nixos.org/t/intel-12th-gen-igpu-freezes/21768/4
-        "i915.enable_psr=1" 
+        "i915.enable_psr=1"
       ];
     })
     (lib.mkIf (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8") {
-      boot.blacklistedKernelModules = [ 
+      boot.blacklistedKernelModules = [
         # This enables the brightness and airplane mode keys to work
         # https://community.frame.work/t/12th-gen-not-sending-xf86monbrightnessup-down/20605/11
         "hid-sensor-hub"
@@ -27,7 +29,7 @@
         (lib.mkIf (config.hardware.framework.enableKmod == false) "cros_ec_lpcs")
       ];
 
-      boot.kernelParams = [ 
+      boot.kernelParams = [
         # For Power consumption
         # https://kvark.github.io/linux/framework/2021/10/17/framework-nixos.html
         # Update 04/2024: Combined with acpi_osi from framework-intel it increases the idle power-usage in my test (SebTM)

diff --git a/framework/13-inch/7040-amd/default.nix b/framework/13-inch/7040-amd/default.nix
@@ -32,5 +32,7 @@ in
       # https://community.frame.work/t/tracking-framework-amd-ryzen-7040-series-lid-wakeup-behavior-feedback/39128/45
       ACTION=="add", SUBSYSTEM=="serio", DRIVERS=="atkbd", ATTR{power/wakeup}="disabled"
     '';
+
+    hardware.framework.laptop13.audioEnhancement.rawDeviceName = lib.mkDefault "alsa_output.pci-0000_c1_00.6.analog-stereo";
   };
 }