From ab0c9fe7ce53dca2cd870cfa57b45dd912c03800 Mon Sep 17 00:00:00 2001
From: mexisme <wildjim+dev@kiwinet.org>
Date: Tue, 10 Jan 2023 16:13:38 +1300
Subject: [PATCH] Move the last of the code into ./microsoft/common/old

---
 microsoft/surface/default.nix     | 14 +-------------
 microsoft/surface/old/default.nix | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 microsoft/surface/old/default.nix

diff --git a/microsoft/surface/default.nix b/microsoft/surface/default.nix
index 5b541c9..0633c4e 100644
--- a/microsoft/surface/default.nix
+++ b/microsoft/surface/default.nix
@@ -5,18 +5,6 @@ let
 
 in {
   imports = [
-    ./common
-    ./surface-go/firmware/ath10k
+    ./old
   ];
-
-  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
-  '';
-
-  microsoft-surface.surface-control.enable = true;
-  microsoft-surface.ipts.enable = true;
 }
diff --git a/microsoft/surface/old/default.nix b/microsoft/surface/old/default.nix
new file mode 100644
index 0000000..d8a2d67
--- /dev/null
+++ b/microsoft/surface/old/default.nix
@@ -0,0 +1,22 @@
+{ lib, pkgs, ... }:
+
+let
+  inherit (lib) mkDefault;
+
+in {
+  imports = [
+    ../common
+    ../surface-go/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
+  '';
+
+  microsoft-surface.surface-control.enable = true;
+  microsoft-surface.ipts.enable = true;
+}