Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Framework 13 Ryzen 7040 Series #765

Merged
merged 8 commits into from
Nov 11, 2023
Merged

Add Framework 13 Ryzen 7040 Series #765

merged 8 commits into from
Nov 11, 2023

Conversation

kjhoerr
Copy link
Contributor

@kjhoerr kjhoerr commented Oct 25, 2023

Note: It may be prudent to reorganize the structure of these changes slightly since the Framework Laptop 16 7040 Series is supposed to ship by the end of the year, and there will be new unique features to the FW16 with the expansion bay and input modules. Let me know if I should place these files in a different folder structure with that in mind. See #773

Description of changes
  • Added new configuration for Framework Laptop 13 AMD Ryzen 7040 Series. This shares some common configuration with the other Framework laptops around core shared components, though since this is the first AMD based Framework laptop there are other common modules for import and other options that are slightly different. Namely:
    • Prefer PPD over TLP for compatibility
    • nvme.noacpi=1 kernel param causes issues with standby (cannot log back in after suspending)
    • Do not include the fw-ectool package - the ectool will likely have to be packaged differently somehow (?) since it's using a different code branch of ChromeOS EC than the Intel based Framework laptops: https://community.frame.work/t/what-ec-is-used/38574/2
  • Best kernel version to select is not locked in as of yet, but likely prefer kernel_latest due to amdgpu driver updates. Other recommended distros at launch are Fedora 39 Beta and Ubuntu 23.04 with some changes required.
Things done
  • Tested the changes in your own NixOS Configuration
  • Tested the changes end-to-end by using your fork of nixos-hardware and
    importing it via <nixos-hardware> or Flake input

@kjhoerr kjhoerr changed the title FW13 7040: Add configuration as default.nix Add Framework 13 Ryzen 7040 Series Oct 25, 2023
framework/7040-amd/default.nix Outdated Show resolved Hide resolved
framework/7040-amd/default.nix Outdated Show resolved Hide resolved
framework/7040-amd/default.nix Outdated Show resolved Hide resolved
framework/7040-amd/README.md Outdated Show resolved Hide resolved
framework/7040-amd/default.nix Outdated Show resolved Hide resolved
@leona-ya
Copy link
Member

Maybe something along the line of framework/13-inch/amd-7040 would make sense as a future file structure?

README.md Outdated Show resolved Hide resolved
@nodu
Copy link

nodu commented Nov 1, 2023 via email

@reedriley
Copy link
Contributor

Is there anything blocking landing this? I've been running NixOS with it on my 7840U from Framework successfully for about a week now.

@Mic92
Copy link
Member

Mic92 commented Nov 11, 2023

@mergify queue

Copy link
Contributor

mergify bot commented Nov 11, 2023

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at b689465

@mergify mergify bot merged commit b689465 into NixOS:master Nov 11, 2023
3 checks passed
@kjhoerr kjhoerr deleted the fw13-7040 branch November 11, 2023 14:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants