From 7850ad03219d4f144f8a8265ee89feaa9bbb2009 Mon Sep 17 00:00:00 2001
From: Griffin Smith <grfn@gws.fyi>
Date: Wed, 13 Jan 2021 10:14:33 -0500
Subject: feat(gs/yeren): Get internal soundcard working

Change-Id: Idafb951eb995a92e955e42bee5b563a738ce49c7
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2361
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
---
 users/glittershark/system/system/machines/yeren.nix | 12 ++++++++++++
 users/glittershark/system/system/modules/sound.nix  |  2 ++
 2 files changed, 14 insertions(+)

(limited to 'users/glittershark/system/system')

diff --git a/users/glittershark/system/system/machines/yeren.nix b/users/glittershark/system/system/machines/yeren.nix
index c695608977..eec5527a9f 100644
--- a/users/glittershark/system/system/machines/yeren.nix
+++ b/users/glittershark/system/system/machines/yeren.nix
@@ -33,6 +33,11 @@
     kernelParams = [
       "i915.preliminary_hw_support=1"
     ];
+
+    # https://bbs.archlinux.org/viewtopic.php?pid=1933643#p1933643
+    extraModprobeConfig = ''
+      options snd-intel-dspcfg dsp_driver=1
+    '';
   };
 
   fileSystems = {
@@ -63,6 +68,11 @@
     '';
   };
 
+  hardware.firmware = with pkgs; [
+    alsa-firmware
+    sof-firmware
+  ];
+
   hardware.opengl.extraPackages = with pkgs; [
     vaapiIntel
     vaapiVdpau
@@ -111,4 +121,6 @@
     load-module module-remap-source source_name=KompleteAudio6_2 source_properties=device.description=KompleteAudio6Input2 master=alsa_input.usb-Native_Instruments_Komplete_Audio_6_458E0FFD-00.multichannel-input remix=no channels=1 master_channel_map=front-right channel_map=mono
     load-module module-remap-sink sink_name=KompleteAudio6_12 sink_properties=device.description=KompleteAudio6_12 remix=no master=alsa_output.usb-Native_Instruments_Komplete_Audio_6_458E0FFD-00.analog-surround-21 channels=2 master_channel_map=front-left,front-right channel_map=front-left,front-right
   '';
+
+  services.fwupd.enable = true;
 }
diff --git a/users/glittershark/system/system/modules/sound.nix b/users/glittershark/system/system/modules/sound.nix
index 0d5ce3e318..15c8dd5e3f 100644
--- a/users/glittershark/system/system/modules/sound.nix
+++ b/users/glittershark/system/system/modules/sound.nix
@@ -11,4 +11,6 @@
     pasystray
     pavucontrol
   ];
+
+  hardware.pulseaudio.package = pkgs.pulseaudioFull;
 }
-- 
cgit 1.4.1