From f8c3b6e50e09844f08a36416c191caa2f0d70a9f Mon Sep 17 00:00:00 2001
From: mexisme <wildjim+dev@kiwinet.org>
Date: Tue, 23 Feb 2021 17:59:34 +1300
Subject: [PATCH] Move a modprobe option for Surface Go Wifi device (ath10k)
 into that specific derivative

---
 microsoft/surface/firmware/surface-go/ath10k/default.nix | 4 ++++
 microsoft/surface/hardware_configuration.nix             | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/microsoft/surface/firmware/surface-go/ath10k/default.nix b/microsoft/surface/firmware/surface-go/ath10k/default.nix
index bc52187..44f2bfd 100644
--- a/microsoft/surface/firmware/surface-go/ath10k/default.nix
+++ b/microsoft/surface/firmware/surface-go/ath10k/default.nix
@@ -14,5 +14,9 @@ in
     hardware.firmware = [
       (pkgs.callPackage ./ath10k.nix {})
     ];
+
+    boot.extraModprobeConfig = lib.mkDefault ''
+      options ath10k_core skip_otp=Y
+    '';
   };
 }
diff --git a/microsoft/surface/hardware_configuration.nix b/microsoft/surface/hardware_configuration.nix
index 2053b01..ba06b30 100644
--- a/microsoft/surface/hardware_configuration.nix
+++ b/microsoft/surface/hardware_configuration.nix
@@ -6,7 +6,6 @@
     options snd_ac97_codec power_save=1
     options iwlwifi power_save=Y
     options iwldvm force_cam=N
-    options ath10k_core skip_otp=Y
   '';
 
   boot.kernelParams = [ "mem_sleep_default=deep" ];