From 03df3d2d530a69fe1d006c1a161f76885d3ffb2a Mon Sep 17 00:00:00 2001
From: mexisme <wildjim+dev@kiwinet.org>
Date: Tue, 10 Jan 2023 15:22:06 +1300
Subject: [PATCH] Move files around...

- "kernel" and "repos.nix" --> "common/"
- "firmware/surface-go/ath10k" --> "surface-go/firmware/ath10k"
- Update where "kernel", "firmware/surface-go" and "repos.nix" can be found
---
 microsoft/surface/common/default.nix                 |  7 +++++++
 microsoft/surface/{ => common}/kernel/default.nix    |  0
 .../{ => common}/kernel/linux-5.19.17/default.nix    |  0
 .../{ => common}/kernel/linux-5.19.17/patches.nix    |  0
 .../{ => common}/kernel/linux-6.0.11/default.nix     |  0
 .../kernel/linux-6.1.3}/patches.nix                  | 12 ++++++++----
 .../surface/{ => common}/kernel/linux-package.nix    |  0
 microsoft/surface/{ => common}/repos.nix             |  0
 microsoft/surface/default.nix                        |  4 ++--
 .../firmware}/ath10k/ath10k-replace.nix              |  2 +-
 .../firmware}/ath10k/default.nix                     |  0
 11 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 microsoft/surface/common/default.nix
 rename microsoft/surface/{ => common}/kernel/default.nix (100%)
 rename microsoft/surface/{ => common}/kernel/linux-5.19.17/default.nix (100%)
 rename microsoft/surface/{ => common}/kernel/linux-5.19.17/patches.nix (100%)
 rename microsoft/surface/{ => common}/kernel/linux-6.0.11/default.nix (100%)
 rename microsoft/surface/{kernel/linux-6.0.11 => common/kernel/linux-6.1.3}/patches.nix (94%)
 rename microsoft/surface/{ => common}/kernel/linux-package.nix (100%)
 rename microsoft/surface/{ => common}/repos.nix (100%)
 rename microsoft/surface/{firmware/surface-go => surface-go/firmware}/ath10k/ath10k-replace.nix (93%)
 rename microsoft/surface/{firmware/surface-go => surface-go/firmware}/ath10k/default.nix (100%)

diff --git a/microsoft/surface/common/default.nix b/microsoft/surface/common/default.nix
new file mode 100644
index 0000000..d7e1cfa
--- /dev/null
+++ b/microsoft/surface/common/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  imports = [
+    ./kernel
+  ];
+}
diff --git a/microsoft/surface/kernel/default.nix b/microsoft/surface/common/kernel/default.nix
similarity index 100%
rename from microsoft/surface/kernel/default.nix
rename to microsoft/surface/common/kernel/default.nix
diff --git a/microsoft/surface/kernel/linux-5.19.17/default.nix b/microsoft/surface/common/kernel/linux-5.19.17/default.nix
similarity index 100%
rename from microsoft/surface/kernel/linux-5.19.17/default.nix
rename to microsoft/surface/common/kernel/linux-5.19.17/default.nix
diff --git a/microsoft/surface/kernel/linux-5.19.17/patches.nix b/microsoft/surface/common/kernel/linux-5.19.17/patches.nix
similarity index 100%
rename from microsoft/surface/kernel/linux-5.19.17/patches.nix
rename to microsoft/surface/common/kernel/linux-5.19.17/patches.nix
diff --git a/microsoft/surface/kernel/linux-6.0.11/default.nix b/microsoft/surface/common/kernel/linux-6.0.11/default.nix
similarity index 100%
rename from microsoft/surface/kernel/linux-6.0.11/default.nix
rename to microsoft/surface/common/kernel/linux-6.0.11/default.nix
diff --git a/microsoft/surface/kernel/linux-6.0.11/patches.nix b/microsoft/surface/common/kernel/linux-6.1.3/patches.nix
similarity index 94%
rename from microsoft/surface/kernel/linux-6.0.11/patches.nix
rename to microsoft/surface/common/kernel/linux-6.1.3/patches.nix
index e111c26..7b0d096 100644
--- a/microsoft/surface/kernel/linux-6.0.11/patches.nix
+++ b/microsoft/surface/common/kernel/linux-6.1.3/patches.nix
@@ -111,8 +111,12 @@
     name = "ms-surface/0009-cameras";
     patch = patchDir + "/0009-cameras.patch";
   }
-  # {
-  #   name = "ms-surface/0010-amd-gpio";
-  #   patch = patchDir + "/0010-amd-gpio.patch";
-  # }
+  {
+    name = "ms-surface/0010-amd-gpio";
+    patch = patchDir + "/0010-amd-gpio.patch";
+  }
+  {
+    name = "ms-surface/0011-rtc";
+    patch = patchDir + "/0011-rtc.patch";
+  }
 ]
diff --git a/microsoft/surface/kernel/linux-package.nix b/microsoft/surface/common/kernel/linux-package.nix
similarity index 100%
rename from microsoft/surface/kernel/linux-package.nix
rename to microsoft/surface/common/kernel/linux-package.nix
diff --git a/microsoft/surface/repos.nix b/microsoft/surface/common/repos.nix
similarity index 100%
rename from microsoft/surface/repos.nix
rename to microsoft/surface/common/repos.nix
diff --git a/microsoft/surface/default.nix b/microsoft/surface/default.nix
index 2952dae..795262b 100644
--- a/microsoft/surface/default.nix
+++ b/microsoft/surface/default.nix
@@ -5,8 +5,8 @@ let
 
 in {
   imports = [
-    ./kernel
-    ./firmware/surface-go/ath10k
+    ./common
+    ./surface-go/firmware/ath10k
   ];
 
   microsoft-surface.kernelVersion = mkDefault "6.0.11";
diff --git a/microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix b/microsoft/surface/surface-go/firmware/ath10k/ath10k-replace.nix
similarity index 93%
rename from microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix
rename to microsoft/surface/surface-go/firmware/ath10k/ath10k-replace.nix
index e6b84e1..6cc55fa 100644
--- a/microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix
+++ b/microsoft/surface/surface-go/firmware/ath10k/ath10k-replace.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, pkgs, firmwareLinuxNonfree, ... }:
 
 let
-  repos = pkgs.callPackage ../../../repos.nix {};
+  repos = pkgs.callPackage ../../../common/repos.nix {};
   killernetworking_firmware = repos.surface-go-ath10k-firmware_backup + "/K1535_Debian";
 
 in stdenv.mkDerivation {
diff --git a/microsoft/surface/firmware/surface-go/ath10k/default.nix b/microsoft/surface/surface-go/firmware/ath10k/default.nix
similarity index 100%
rename from microsoft/surface/firmware/surface-go/ath10k/default.nix
rename to microsoft/surface/surface-go/firmware/ath10k/default.nix