diff --git a/microsoft/surface/surface-go/default.nix b/microsoft/surface/surface-go/default.nix
new file mode 100644
index 00000000..6bfa33bc
--- /dev/null
+++ b/microsoft/surface/surface-go/default.nix
@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkDefault mkEnableOption mkIf mkMerge;
+in {
+  imports = [
+    ../common
+    ./firmware/ath10k
+  ];
+
+  boot.extraModprobeConfig = mkDefault ''
+    options i915 enable_fbc=1 enable_rc6=1 modeset=1
+    options snd_hda_intel power_save=1
+    options snd_ac97_codec power_save=1
+    options iwlwifi power_save=Y
+    options iwldvm force_cam=N
+  '';
+}