From 88eb241bbd87e21bbf6c8be7319fe997550b90f8 Mon Sep 17 00:00:00 2001 From: pinage404 Date: Sun, 28 Apr 2024 17:54:40 +0200 Subject: [PATCH] framework/16-inch: moved out of the CPU folder as it doesn't only define configuration for the CPU --- README.md | 2 +- flake.nix | 2 +- framework/16-inch/{cpu => }/7040-amd/README.md | 0 framework/16-inch/{cpu => }/7040-amd/default.nix | 2 +- framework/16-inch/{cpu => }/common/amd.nix | 6 +++--- framework/16-inch/{cpu => }/common/default.nix | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) rename framework/16-inch/{cpu => }/7040-amd/README.md (100%) rename framework/16-inch/{cpu => }/7040-amd/default.nix (64%) rename framework/16-inch/{cpu => }/common/amd.nix (82%) rename framework/16-inch/{cpu => }/common/default.nix (91%) diff --git a/README.md b/README.md index 6698010..10d82bb 100644 --- a/README.md +++ b/README.md @@ -146,7 +146,7 @@ See code for all available configurations. | [Framework 12th Gen Intel Core](framework/13-inch/12th-gen-intel) | `` | | [Framework 13th Gen Intel Core](framework/13-inch/13th-gen-intel) | `` | | [Framework 13 AMD Ryzen 7040 Series](framework/13-inch/7040-amd) | `` | -| [Framework 16 AMD Ryzen 7040 Series](framework/16-inch/cpu/7040-amd) | `` | +| [Framework 16 AMD Ryzen 7040 Series](framework/16-inch/7040-amd) | `` | | [FriendlyARM NanoPC-T4](friendlyarm/nanopc-t4) | `` | | [FriendlyARM NanoPi R5s](friendlyarm/nanopi-r5s) | `` | | [Focus M2 Gen 1](focus/m2/gen1) | `` | diff --git a/flake.nix b/flake.nix index 416d4c6..2b77735 100644 --- a/flake.nix +++ b/flake.nix @@ -79,7 +79,7 @@ framework-12th-gen-intel = import ./framework/13-inch/12th-gen-intel; framework-13th-gen-intel = import ./framework/13-inch/13th-gen-intel; framework-13-7040-amd = import ./framework/13-inch/7040-amd; - framework-16-7040-amd = import ./framework/16-inch/cpu/7040-amd; + framework-16-7040-amd = import ./framework/16-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/16-inch/cpu/7040-amd/README.md b/framework/16-inch/7040-amd/README.md similarity index 100% rename from framework/16-inch/cpu/7040-amd/README.md rename to framework/16-inch/7040-amd/README.md diff --git a/framework/16-inch/cpu/7040-amd/default.nix b/framework/16-inch/7040-amd/default.nix similarity index 64% rename from framework/16-inch/cpu/7040-amd/default.nix rename to framework/16-inch/7040-amd/default.nix index 2059a49..6c02455 100644 --- a/framework/16-inch/cpu/7040-amd/default.nix +++ b/framework/16-inch/7040-amd/default.nix @@ -4,7 +4,7 @@ imports = [ ../common ../common/amd.nix - ../../../../common/cpu/amd/raphael/igpu.nix + ../../../common/cpu/amd/raphael/igpu.nix ]; } diff --git a/framework/16-inch/cpu/common/amd.nix b/framework/16-inch/common/amd.nix similarity index 82% rename from framework/16-inch/cpu/common/amd.nix rename to framework/16-inch/common/amd.nix index f75720d..f5341b6 100644 --- a/framework/16-inch/cpu/common/amd.nix +++ b/framework/16-inch/common/amd.nix @@ -1,8 +1,8 @@ { lib, config, ... }: { imports = [ - ../../../../common/cpu/amd - ../../../../common/cpu/amd/pstate.nix - ../../../../common/gpu/amd + ../../../common/cpu/amd + ../../../common/cpu/amd/pstate.nix + ../../../common/gpu/amd ]; # Workaround for SuspendThenHibernate: https://lore.kernel.org/linux-kernel/20231106162310.85711-1-mario.limonciello@amd.com/ diff --git a/framework/16-inch/cpu/common/default.nix b/framework/16-inch/common/default.nix similarity index 91% rename from framework/16-inch/cpu/common/default.nix rename to framework/16-inch/common/default.nix index 34a769b..2b53522 100644 --- a/framework/16-inch/cpu/common/default.nix +++ b/framework/16-inch/common/default.nix @@ -1,7 +1,7 @@ { lib, pkgs, ... }: { imports = [ - ../../../../common/pc/laptop - ../../../../common/pc/laptop/ssd + ../../../common/pc/laptop + ../../../common/pc/laptop/ssd ]; # Fix TRRS headphones missing a mic