From 55b4caf931477fdfd70b86bae2ca000de18eab88 Mon Sep 17 00:00:00 2001
From: Kevin J Hoerr <kjhoerr@protonmail.com>
Date: Wed, 1 Nov 2023 16:23:29 -0400
Subject: [PATCH] Add 13-inch directory to framework and move new module

---
 README.md                                    |  2 +-
 flake.nix                                    |  2 +-
 framework/{ => 13-inch}/7040-amd/README.md   |  0
 framework/{ => 13-inch}/7040-amd/default.nix | 10 +++++-----
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename framework/{ => 13-inch}/7040-amd/README.md (100%)
 rename framework/{ => 13-inch}/7040-amd/default.nix (87%)

diff --git a/README.md b/README.md
index a9493ea..a987196 100644
--- a/README.md
+++ b/README.md
@@ -134,7 +134,7 @@ See code for all available configurations.
 | [Framework 11th Gen Intel Core](framework)                          | `<nixos-hardware/framework>`                       |
 | [Framework 12th Gen Intel Core](framework/12th-gen-intel)           | `<nixos-hardware/framework/12th-gen-intel>`        |
 | [Framework 13th Gen Intel Core](framework/13th-gen-intel)           | `<nixos-hardware/framework/13th-gen-intel>`        |
-| [Framework AMD Ryzen 7040 Series](framework/7040-amd)               | `<nixos-hardware/framework/7040-amd>`              |
+| [Framework 13 AMD Ryzen 7040 Series](framework/13-inch/7040-amd)    | `<nixos-hardware/framework/13-inch/7040-amd>`      |
 | [FriendlyARM NanoPC-T4](friendlyarm/nanopc-t4)                      | `<nixos-hardware/friendlyarm/nanopc-t4>`           |
 | [FriendlyARM NanoPi R5s](friendlyarm/nanopi-r5s)                    | `<nixos-hardware/friendlyarm/nanopi-r5s>`          |
 | [Focus M2 Gen 1](focus/m2/gen1)                                     | `<nixos-hardware/focus/m2/gen1>`                   |
diff --git a/flake.nix b/flake.nix
index f5ba9cb..eb40bb4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,7 +68,7 @@
       framework = import ./framework;
       framework-12th-gen-intel = import ./framework/12th-gen-intel;
       framework-13th-gen-intel = import ./framework/13th-gen-intel;
-      framework-7040-amd = import ./framework/7040-amd;
+      framework-13-7040-amd = import ./framework/13-inch/7040-amd;
       friendlyarm-nanopc-t4 = import ./friendlyarm/nanopc-t4;
       friendlyarm-nanopi-r5s = import ./friendlyarm/nanopi-r5s;
       focus-m2-gen1 = import ./focus/m2/gen1;
diff --git a/framework/7040-amd/README.md b/framework/13-inch/7040-amd/README.md
similarity index 100%
rename from framework/7040-amd/README.md
rename to framework/13-inch/7040-amd/README.md
diff --git a/framework/7040-amd/default.nix b/framework/13-inch/7040-amd/default.nix
similarity index 87%
rename from framework/7040-amd/default.nix
rename to framework/13-inch/7040-amd/default.nix
index 7b41313..71a89cd 100644
--- a/framework/7040-amd/default.nix
+++ b/framework/13-inch/7040-amd/default.nix
@@ -1,10 +1,10 @@
 { lib, pkgs, ... }: {
   imports = [
-    ../../common/cpu/amd
-    ../../common/cpu/amd/pstate.nix
-    ../../common/gpu/amd
-    ../../common/pc/laptop
-    ../../common/pc/laptop/ssd
+    ../../../common/cpu/amd
+    ../../../common/cpu/amd/pstate.nix
+    ../../../common/gpu/amd
+    ../../../common/pc/laptop
+    ../../../common/pc/laptop/ssd
   ];
 
   # Newer kernel is better for amdgpu driver updates