From 3918f03d0debe32ce0062baba67751c3fe88bae9 Mon Sep 17 00:00:00 2001 From: Robert Ricci Date: Mon, 12 Sep 2022 11:53:42 -0600 Subject: [PATCH 1/3] Initial support for Framework 12th Gen Intel Core This commit simply replicates the base Framework, future commits will specialize for this version --- README.md | 1 + framework/12th-gen-intel/README.md | 17 ++++++++++ framework/12th-gen-intel/default.nix | 47 ++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) create mode 100644 framework/12th-gen-intel/README.md create mode 100644 framework/12th-gen-intel/default.nix diff --git a/README.md b/README.md index 2561c80..f86b9c4 100644 --- a/README.md +++ b/README.md @@ -107,6 +107,7 @@ See code for all available configurations. | [Dell XPS 17 9710, intel only](dell/xps/17-9710/intel) | `` | | [Dell XPS E7240](dell/e7240) | `` | | [Framework](framework) | `` | +| [Framework 12th Gen Intel Core](framework/12th-gen-intel) | `` | | [FriendlyARM NanoPC-T4](friendlyarm/nanopc-t4) | `` | | [GPD MicroPC](gpd/micropc) | `` | | [Google Pixelbook](google/pixelbook) | `` | diff --git a/framework/12th-gen-intel/README.md b/framework/12th-gen-intel/README.md new file mode 100644 index 0000000..e8d10e0 --- /dev/null +++ b/framework/12th-gen-intel/README.md @@ -0,0 +1,17 @@ +# [Framework Laptop](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.TGL.BIOS.firmware) diff --git a/framework/12th-gen-intel/default.nix b/framework/12th-gen-intel/default.nix new file mode 100644 index 0000000..a67a70d --- /dev/null +++ b/framework/12th-gen-intel/default.nix @@ -0,0 +1,47 @@ +{ lib, pkgs, ... }: { + imports = [ + ../../common/cpu/intel + ../../common/pc/laptop + ../../common/pc/laptop/ssd + ]; + + boot.kernelParams = [ + # For Power consumption + # https://kvark.github.io/linux/framework/2021/10/17/framework-nixos.html + "mem_sleep_default=deep" + # For Power consumption + # https://community.frame.work/t/linux-battery-life-tuning/6665/156 + "nvme.noacpi=1" + ]; + + # Requires at least 5.16 for working wi-fi and bluetooth. + # https://community.frame.work/t/using-the-ax210-with-linux-on-the-framework-laptop/1844/89 + boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.16") (lib.mkDefault pkgs.linuxPackages_latest); + + # 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; + + # Fix headphone noise when on powersave + # https://community.frame.work/t/headphone-jack-intermittent-noise/5246/55 + services.udev.extraRules = '' + SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0xa0e0", ATTR{power/control}="on" + ''; + + # 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; + + # HiDPI + # Leaving here for documentation + # hardware.video.hidpi.enable = lib.mkDefault true; + + # Fix font sizes in X + # services.xserver.dpi = 200; +} From f0b864738dad352be659abd5e486dbb0b64cb3e9 Mon Sep 17 00:00:00 2001 From: Robert Ricci Date: Mon, 12 Sep 2022 19:22:04 -0600 Subject: [PATCH 2/3] Set options specific to the 12th gen Framework It requires a newer kernel than the 11th gen, and has some 'media keys' that require different handling --- framework/12th-gen-intel/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/framework/12th-gen-intel/default.nix b/framework/12th-gen-intel/default.nix index a67a70d..63adb48 100644 --- a/framework/12th-gen-intel/default.nix +++ b/framework/12th-gen-intel/default.nix @@ -14,9 +14,13 @@ "nvme.noacpi=1" ]; - # Requires at least 5.16 for working wi-fi and bluetooth. - # https://community.frame.work/t/using-the-ax210-with-linux-on-the-framework-laptop/1844/89 - boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.16") (lib.mkDefault pkgs.linuxPackages_latest); + # This enables the brightness keys to work + # https://community.frame.work/t/12th-gen-not-sending-xf86monbrightnessup-down/20605/11 + boot.blacklistedKernelModules = [ "hid-sensor-hub" ]; + + # Alder Lake CPUs benefit from kernel 5.18 for ThreadDirector + # https://www.tomshardware.com/news/intel-thread-director-coming-to-linux-5-18 + boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.18") (lib.mkDefault pkgs.linuxPackages_latest); # Fix TRRS headphones missing a mic # https://community.frame.work/t/headset-microphone-on-linux/12387/3 From 3aaf1fe6ee3f360633c3c24c0563d440a7376412 Mon Sep 17 00:00:00 2001 From: Robert Ricci Date: Mon, 12 Sep 2022 22:49:26 -0600 Subject: [PATCH 3/3] Add framework-12th-gen-intel to flake.nix --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index defec0e..3d7f5cf 100644 --- a/flake.nix +++ b/flake.nix @@ -46,6 +46,7 @@ dell-xps-17-9700-nvidia = import ./dell/xps/17-9700/nvidia; dell-xps-17-9710-intel = import ./dell/xps/17-9710/intel; framework = import ./framework; + framework-12th-gen-intel = import ./framework/12th-gen-intel; friendlyarm-nanopc-t4 = import ./friendlyarm/nanopc-t4; google-pixelbook = import ./google/pixelbook; gpd-micropc = import ./gpd/micropc;