diff --git a/README.md b/README.md index 11c1e3bef..1a604987e 100644 --- a/README.md +++ b/README.md @@ -223,6 +223,7 @@ See code for all available configurations. | [Framework 13 AMD Ryzen 7040 Series](framework/13-inch/7040-amd) | `` | `framework-13-7040-amd` | | [Framework 13 AMD AI 300 Series](framework/13-inch/amd-ai-300-series) | `` | `framework-amd-ai-300-series` | | [Framework 12 13th Gen Intel Core](framework/12-inch/13th-gen-intel) | `` | `framework-12-13th-gen-intel` | +| [Framework 12 Intel Core Series 3](framework/12-inch/intel-core-series3) | `` | `framework-12-intel-core-series3` | | [Framework 16 AMD Ryzen 7040 Series](framework/16-inch/7040-amd) | `` | `framework-16-7040-amd` | | [Framework 16 AMD Ryzen AI 300 Series](framework/16-inch/amd-ai-300-series) | `` | `framework-16-amd-ai-300-series` | | [FriendlyARM NanoPC-T4](friendlyarm/nanopc-t4) | `` | `friendlyarm-nanopc-t4` | diff --git a/flake.nix b/flake.nix index e7aa30bbb..307c948d8 100644 --- a/flake.nix +++ b/flake.nix @@ -176,6 +176,7 @@ framework-12th-gen-intel = import ./framework/13-inch/12th-gen-intel; framework-13th-gen-intel = import ./framework/13-inch/13th-gen-intel; framework-12-13th-gen-intel = import ./framework/12-inch/13th-gen-intel; + framework-12-intel-core-series3 = import ./framework/12-inch/intel-core-series3; framework-intel-core-ultra-series1 = import ./framework/13-inch/intel-core-ultra-series1; framework-intel-core-ultra-series3 = import ./framework/13-inch/intel-core-ultra-series3; framework-13-7040-amd = import ./framework/13-inch/7040-amd; diff --git a/framework/12-inch/common/default.nix b/framework/12-inch/common/default.nix index a8f4661f8..a717bb8c5 100644 --- a/framework/12-inch/common/default.nix +++ b/framework/12-inch/common/default.nix @@ -9,8 +9,11 @@ # Fix TRRS headphones missing a mic # https://github.com/torvalds/linux/commit/7b509910b3ad6d7aacead24c8744de10daf8715d + # And fix tablet mode driver loaded in the wrong order, causing tablet mode not working boot.extraModprobeConfig = lib.mkIf (lib.versionOlder config.boot.kernelPackages.kernel.version "6.13.0") '' options snd-hda-intel model=dell-headset-multi + softdep soc_button_array post: pinctrl_tigerlake + softdep soc_button_array post: pinctrl_intel_platform ''; # Needed for desktop environments to detect display orientation diff --git a/framework/12-inch/intel-core-series3/README.md b/framework/12-inch/intel-core-series3/README.md new file mode 100644 index 000000000..6baf516bd --- /dev/null +++ b/framework/12-inch/intel-core-series3/README.md @@ -0,0 +1,33 @@ +# [Framework Laptop 12](https://frame.work/laptop12) + +## Updating Firmware + +Everything is updateable through fwupd, so it's enabled by default. + +To get the latest firmware, run: + +```sh +$ fwupdmgr refresh +$ fwupdmgr update +``` + +- [Latest Update](https://example.com/TODO) + +## Touchscreen support in initrd (for unl0kr) + +To unlock your LUKS disk encryption with an onscreen touch keyboard, you can use unl0kr. + +This module will automatically included the necessary kernel modules in initrd to make touchpad and touchscreen work when `boot.initrd.unl0kr.enable = true`. + +Example configuration: + +```nix +{ + boot.initrd.systemd.enable = true; + boot.initrd.unl0kr.enable = true; + + boot.initrd.luks.devices."cryptroot" = { + device = "/dev/disk/by-uuid/YOUR-UUID-HERE"; + }; +} +``` diff --git a/framework/12-inch/intel-core-series3/default.nix b/framework/12-inch/intel-core-series3/default.nix new file mode 100644 index 000000000..ae1b03499 --- /dev/null +++ b/framework/12-inch/intel-core-series3/default.nix @@ -0,0 +1,44 @@ +{ + config, + lib, + pkgs, + ... +}: +{ + imports = [ + ../common + ../../../common/cpu/intel + ]; + + # Linux 7.1 includes BE213 WiFi support + boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "7.1") ( + lib.mkDefault pkgs.linuxPackages_latest + ); + + # Fingerprint reader support + services.fprintd.enable = lib.mkDefault true; + + # If enable serial console in BIOS you can use this to get logs and log + # into TTY through JECDB or the Type-C CCD connector + # See github.com/frameworkComputer/FrameworkDebugger + # boot.kernelParams = [ + # "console=ttyS0,115200n8" + # "console=tty0" # keeps display as primary /dev/console + # ]; + + # If this module isn't built into the kernel, we need to make sure it loads + # before soc_button_array. Otherwise the tablet mode gpio doesn't work. + # If correctly loaded, dmesg should show + # input: gpio-keys as /devices/platform/INT33D3:00 + boot.initrd.kernelModules = [ + "pinctrl_intel_platform" + ] + # Additional modules for touchscreen/touchpad in initrd (for unl0kr on-screen keyboard) + ++ lib.optionals config.boot.initrd.unl0kr.enable [ + "intel_lpss_pci" + "i2c_hid_acpi" + "i2c_hid" + "hid_multitouch" + "hid_generic" + ]; +}