From edc1a8ecbc40459f15c6a75e6993f941aa06674f Mon Sep 17 00:00:00 2001 From: Kevin J Hoerr Date: Wed, 25 Oct 2023 01:35:25 -0400 Subject: [PATCH] FW13 7040: Add configuration as default.nix --- README.md | 1 + flake.nix | 1 + framework/7040-amd/README.md | 17 ++++++++++++ framework/7040-amd/default.nix | 49 ++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 framework/7040-amd/README.md create mode 100644 framework/7040-amd/default.nix diff --git a/README.md b/README.md index 30cd586..a9493ea 100644 --- a/README.md +++ b/README.md @@ -134,6 +134,7 @@ See code for all available configurations. | [Framework 11th Gen Intel Core](framework) | `` | | [Framework 12th Gen Intel Core](framework/12th-gen-intel) | `` | | [Framework 13th Gen Intel Core](framework/13th-gen-intel) | `` | +| [Framework AMD Ryzen 7040 Series](framework/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 ed75537..f5ba9cb 100644 --- a/flake.nix +++ b/flake.nix @@ -68,6 +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; 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/7040-amd/README.md new file mode 100644 index 0000000..09fc14f --- /dev/null +++ b/framework/7040-amd/README.md @@ -0,0 +1,17 @@ +# [Framework Laptop 13](https://frame.work/) + +## Updating Firmware + +First put enable `fwupd` + +```nix +services.fwupd.enable = true; +``` + +Then run + +```sh + $ sudo fwupdmgr update +``` + +- [Latest Update](https://fwupd.org/lvfs/devices/work.frame.Laptop.Ryzen7040.BIOS.firmware) diff --git a/framework/7040-amd/default.nix b/framework/7040-amd/default.nix new file mode 100644 index 0000000..ee976b4 --- /dev/null +++ b/framework/7040-amd/default.nix @@ -0,0 +1,49 @@ +{ lib, pkgs, ... }: { + imports = [ + ../../common/cpu/amd + ../../common/cpu/amd/pstate.nix + ../../common/gpu/amd + ../../common/pc/laptop + ../../common/pc/laptop/ssd + ]; + + boot.kernelParams = [ + # Fixes a regression in s2idle, making it more power efficient than deep sleep + "acpi_osi=\"!Windows 2020\"" + ]; + + # Newer kernel is better for amdgpu driver updates + # Requires at least 5.16 for working wi-fi and bluetooth (RZ616, kmod mt7922): + # https://wireless.wiki.kernel.org/en/users/drivers/mediatek + boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.16") (lib.mkDefault pkgs.linuxPackages_latest); + + # AMD has better battery life with PPD over TLP: + # https://community.frame.work/t/responded-amd-7040-sleep-states/38101/13 + services.power-profiles-daemon.enable = lib.mkDefault true; + + # Fix TRRS headphones missing a mic + # https://community.frame.work/t/headset-microphone-on-linux/12387/3 + boot.extraModprobeConfig = '' + options snd-hda-intel model=dell-headset-multi + ''; + + # For fingerprint support + services.fprintd.enable = lib.mkDefault true; + + # Custom udev rules + services.udev.extraRules = '' + # Fix headphone noise when on powersave + # https://community.frame.work/t/headphone-jack-intermittent-noise/5246/55 + SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0xa0e0", ATTR{power/control}="on" + # Ethernet expansion card support + ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0bda", ATTR{idProduct}=="8156", ATTR{power/autosuspend}="20" + ''; + + # Mis-detected by nixos-generate-config + # https://github.com/NixOS/nixpkgs/issues/171093 + # https://wiki.archlinux.org/title/Framework_Laptop#Changing_the_brightness_of_the_monitor_does_not_work + hardware.acpilight.enable = lib.mkDefault true; + + # Needed for desktop environments to detect/manage display brightness + hardware.sensor.iio.enable = lib.mkDefault true; +}