aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

framework/16-inch: moved out of the CPU folder

Browse source 
as it doesn't only define configuration for the CPU
This commit is contained in:
pinage404 2024-04-28 17:54:40 +02:00 committed by mergify[bot]
parent 8a4adfe48b
commit 88eb241bbd
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -146,7 +146,7 @@ See code for all available configurations.
| [Framework 12th Gen Intel Core](framework/13-inch/12th-gen-intel) | `<nixos-hardware/framework/13-inch/12th-gen-intel>` | | [Framework 12th Gen Intel Core](framework/13-inch/12th-gen-intel) | `<nixos-hardware/framework/13-inch/12th-gen-intel>` |
| [Framework 13th Gen Intel Core](framework/13-inch/13th-gen-intel) | `<nixos-hardware/framework/13-inch/13th-gen-intel>` | | [Framework 13th Gen Intel Core](framework/13-inch/13th-gen-intel) | `<nixos-hardware/framework/13-inch/13th-gen-intel>` |
| [Framework 13 AMD Ryzen 7040 Series](framework/13-inch/7040-amd) | `<nixos-hardware/framework/13-inch/7040-amd>` | | [Framework 13 AMD Ryzen 7040 Series](framework/13-inch/7040-amd) | `<nixos-hardware/framework/13-inch/7040-amd>` |
| [Framework 16 AMD Ryzen 7040 Series](framework/16-inch/cpu/7040-amd) | `<nixos-hardware/framework/16-inch/cpu/7040-amd>` | | [Framework 16 AMD Ryzen 7040 Series](framework/16-inch/7040-amd) | `<nixos-hardware/framework/16-inch/7040-amd>` |
| [FriendlyARM NanoPC-T4](friendlyarm/nanopc-t4) | `<nixos-hardware/friendlyarm/nanopc-t4>` | | [FriendlyARM NanoPC-T4](friendlyarm/nanopc-t4) | `<nixos-hardware/friendlyarm/nanopc-t4>` |
| [FriendlyARM NanoPi R5s](friendlyarm/nanopi-r5s) | `<nixos-hardware/friendlyarm/nanopi-r5s>` | | [FriendlyARM NanoPi R5s](friendlyarm/nanopi-r5s) | `<nixos-hardware/friendlyarm/nanopi-r5s>` |
| [Focus M2 Gen 1](focus/m2/gen1) | `<nixos-hardware/focus/m2/gen1>` | | [Focus M2 Gen 1](focus/m2/gen1) | `<nixos-hardware/focus/m2/gen1>` |

2
flake.nix
View file

@ -79,7 +79,7 @@
framework-12th-gen-intel = import ./framework/13-inch/12th-gen-intel; framework-12th-gen-intel = import ./framework/13-inch/12th-gen-intel;
framework-13th-gen-intel = import ./framework/13-inch/13th-gen-intel; framework-13th-gen-intel = import ./framework/13-inch/13th-gen-intel;
framework-13-7040-amd = import ./framework/13-inch/7040-amd; 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-nanopc-t4 = import ./friendlyarm/nanopc-t4;
friendlyarm-nanopi-r5s = import ./friendlyarm/nanopi-r5s; friendlyarm-nanopi-r5s = import ./friendlyarm/nanopi-r5s;
focus-m2-gen1 = import ./focus/m2/gen1; focus-m2-gen1 = import ./focus/m2/gen1;

0
framework/16-inch/cpu/7040-amd/README.md → framework/16-inch/7040-amd/README.md
View file

2
framework/16-inch/cpu/7040-amd/default.nix → framework/16-inch/7040-amd/default.nix
View file

@ -4,7 +4,7 @@
imports = [ imports = [
../common ../common
../common/amd.nix ../common/amd.nix
../../../../common/cpu/amd/raphael/igpu.nix ../../../common/cpu/amd/raphael/igpu.nix
]; ];
} }

6
framework/16-inch/cpu/common/amd.nix → framework/16-inch/common/amd.nix
View file

@ -1,8 +1,8 @@
{ lib, config, ... }: { { lib, config, ... }: {
imports = [ imports = [
../../../../common/cpu/amd ../../../common/cpu/amd
../../../../common/cpu/amd/pstate.nix ../../../common/cpu/amd/pstate.nix
../../../../common/gpu/amd ../../../common/gpu/amd
]; ];
# Workaround for SuspendThenHibernate: https://lore.kernel.org/linux-kernel/20231106162310.85711-1-mario.limonciello@amd.com/ # Workaround for SuspendThenHibernate: https://lore.kernel.org/linux-kernel/20231106162310.85711-1-mario.limonciello@amd.com/

4
framework/16-inch/cpu/common/default.nix → framework/16-inch/common/default.nix
View file

@ -1,7 +1,7 @@
{ lib, pkgs, ... }: { { lib, pkgs, ... }: {
imports = [ imports = [
../../../../common/pc/laptop ../../../common/pc/laptop
../../../../common/pc/laptop/ssd ../../../common/pc/laptop/ssd
]; ];
# Fix TRRS headphones missing a mic # Fix TRRS headphones missing a mic