Merge branch 'master' into apple-t2-kernel-update
This commit is contained in:
mergify[bot]
GitHub
commit
9ed86a83bc
|
|
@ -5,8 +5,7 @@ queue_rules:
|
|||
defaults:
|
||||
actions:
|
||||
queue:
|
||||
allow_merging_configuration_change: true
|
||||
method: rebase
|
||||
merge_method: rebase
|
||||
pull_request_rules:
|
||||
- name: merge using the merge queue
|
||||
conditions:
|
||||
|
|
|
|||
|
|
@ -144,6 +144,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 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 16 AMD Ryzen 7040 Series](framework/16-inch/cpu/7040-amd) | `<nixos-hardware/framework/16-inch/cpu/7040-amd>` |
|
||||
| [FriendlyARM NanoPC-T4](friendlyarm/nanopc-t4) | `<nixos-hardware/friendlyarm/nanopc-t4>` |
|
||||
| [FriendlyARM NanoPi R5s](friendlyarm/nanopi-r5s) | `<nixos-hardware/friendlyarm/nanopi-r5s>` |
|
||||
| [Focus M2 Gen 1](focus/m2/gen1) | `<nixos-hardware/focus/m2/gen1>` |
|
||||
|
|
@ -288,4 +289,5 @@ See code for all available configurations.
|
|||
| [Toshiba Chromebook 2 `swanky`](toshiba/swanky) | `<nixos-hardware/toshiba/swanky>` |
|
||||
| [Tuxedo InfinityBook v4](tuxedo/infinitybook/v4) | `<nixos-hardware/tuxedo/infinitybook/v4>` |
|
||||
| [TUXEDO InfinityBook Pro 14 - Gen7](tuxedo/infinitybook/pro14/gen7) | `<nixos-hardware/tuxedo/infinitybook/pro14/gen7>` |
|
||||
| [TUXEDO Pulse 14 - Gen3](tuxedo/pulse/14/gen3) | `<nixos-hardware/tuxedo/pulse/14/gen3>` |
|
||||
| [TUXEDO Pulse 15 - Gen2](tuxedo/pulse/15/gen2) | `<nixos-hardware/tuxedo/pulse/15/gen2>` |
|
||||
|
|
|
|||
|
|
@ -77,6 +77,7 @@
|
|||
framework-12th-gen-intel = import ./framework/13-inch/12th-gen-intel;
|
||||
framework-13th-gen-intel = import ./framework/13-inch/13th-gen-intel;
|
||||
framework-13-7040-amd = import ./framework/13-inch/7040-amd;
|
||||
framework-16-7040-amd = import ./framework/16-inch/cpu/7040-amd;
|
||||
friendlyarm-nanopc-t4 = import ./friendlyarm/nanopc-t4;
|
||||
friendlyarm-nanopi-r5s = import ./friendlyarm/nanopi-r5s;
|
||||
focus-m2-gen1 = import ./focus/m2/gen1;
|
||||
|
|
@ -229,6 +230,7 @@
|
|||
toshiba-swanky = import ./toshiba/swanky;
|
||||
tuxedo-infinitybook-v4 = import ./tuxedo/infinitybook/v4;
|
||||
tuxedo-infinitybook-pro14-gen7 = import ./tuxedo/infinitybook/pro14/gen7;
|
||||
tuxedo-pulse-14-gen3 = import ./tuxedo/pulse/14/gen3;
|
||||
tuxedo-pulse-15-gen2 = import ./tuxedo/pulse/15/gen2;
|
||||
|
||||
common-cpu-amd = import ./common/cpu/amd;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
# [Framework Laptop 16](https://frame.work/)
|
||||
|
||||
## Updating Firmware
|
||||
The Framework Laptop 16 uses LVFS, so it can be updated via fwupd; see https://wiki.nixos.org/wiki/Fwupd for details
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
../common
|
||||
../common/amd.nix
|
||||
../../../../common/cpu/amd/raphael/igpu.nix
|
||||
];
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
{ lib, config, ... }: {
|
||||
imports = [
|
||||
../../../../common/cpu/amd
|
||||
../../../../common/cpu/amd/pstate.nix
|
||||
../../../../common/gpu/amd
|
||||
];
|
||||
|
||||
# Workaround for SuspendThenHibernate: https://lore.kernel.org/linux-kernel/20231106162310.85711-1-mario.limonciello@amd.com/
|
||||
boot.kernelParams = lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8") ["rtc_cmos.use_acpi_alarm=1"] ;
|
||||
|
||||
# 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;
|
||||
}
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
{ lib, pkgs, ... }: {
|
||||
imports = [
|
||||
../../../../common/pc/laptop
|
||||
../../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
# Fix TRRS headphones missing a mic
|
||||
# https://community.frame.work/t/headset-microphone-on-linux/12387/3
|
||||
boot.extraModprobeConfig = lib.mkIf (lib.versionOlder pkgs.linux.version "6.6.8") ''
|
||||
options snd-hda-intel model=dell-headset-multi
|
||||
'';
|
||||
|
||||
# For fingerprint support
|
||||
services.fprintd.enable = lib.mkDefault true;
|
||||
|
||||
# Custom udev rules
|
||||
services.udev.extraRules = ''
|
||||
# Ethernet expansion card support
|
||||
ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0bda", ATTR{idProduct}=="8156", ATTR{power/autosuspend}="20"
|
||||
'';
|
||||
|
||||
# Needed for desktop environments to detect/manage display brightness
|
||||
hardware.sensor.iio.enable = lib.mkDefault true;
|
||||
|
||||
# Enable keyboard customization
|
||||
hardware.keyboard.qmk.enable = lib.mkDefault true;
|
||||
}
|
||||
|
|
@ -4,7 +4,7 @@ This document on how I configure [NixOS](https://nixos.org/) on [NanoPC-T4](http
|
|||
|
||||
# Installation
|
||||
|
||||
To install NixOS on you can follow the [official instructions](https://nixos.wiki/wiki/NixOS_on_ARM/NanoPC-T4) and use the [pre-built images](https://github.com/tmountain/arch-nanopct4/tree/main/images/) from @tmountain. You can also build the U-Boot image yourself from `nixpkgs` based on changes added in [#111034](https://github.com/NixOS/nixpkgs/pull/111034).
|
||||
To install NixOS on you can follow the [official instructions](https://wiki.nixos.org/wiki/NixOS_on_ARM/NanoPC-T4) and use the [pre-built images](https://github.com/tmountain/arch-nanopct4/tree/main/images/) from @tmountain. You can also build the U-Boot image yourself from `nixpkgs` based on changes added in [#111034](https://github.com/NixOS/nixpkgs/pull/111034).
|
||||
|
||||
## NixOS on NVMe with ZFS
|
||||
|
||||
|
|
@ -62,7 +62,7 @@ A reader using `CP2102` chip did not work but `FT232RL` works fine:
|
|||
|
||||
You can use `minicom` or `picocom` to connect:
|
||||
```
|
||||
sudo minicom -b 1500000 -D /dev/ttyUSB0
|
||||
sudo minicom -b 1500000 -D /dev/ttyUSB0
|
||||
sudo picocom -b 1500000 /dev/ttyUSB0
|
||||
```
|
||||
But you'll need to disable flow control with `Ctrl-A x`.
|
||||
|
|
|
|||
|
|
@ -3,10 +3,9 @@ with lib;
|
|||
{
|
||||
config = {
|
||||
# Wifi can't connect if rand mac address is used
|
||||
networking.networkmanager.extraConfig = concatStringsSep "\n" [
|
||||
"[device]"
|
||||
"match-device=driver:iwlwifi"
|
||||
"wifi.scan-rand-mac-address=no"
|
||||
];
|
||||
networking.networkmanager.settings.device = {
|
||||
match-device = "driver:iwlwifi";
|
||||
wifi.scan-rand-mac-address = "no";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ let
|
|||
|
||||
in {
|
||||
imports = [
|
||||
./linux-6.6.x
|
||||
./linux-6.8.x
|
||||
];
|
||||
|
||||
options.microsoft-surface.kernelVersion = mkOption {
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ let
|
|||
|
||||
cfg = config.microsoft-surface;
|
||||
|
||||
version = "6.6.25";
|
||||
version = "6.8.6";
|
||||
kernelPatches = surfacePatches {
|
||||
inherit version;
|
||||
patchFn = ./patches.nix;
|
||||
};
|
||||
kernelPackages = linuxPackage {
|
||||
inherit version kernelPatches;
|
||||
sha256 = "0i0zvqlj02rm6wpbidji0rn9559vrpfc1b8gbfjk70lhhyz11llr";
|
||||
sha256 = "sha256-nnIyMtYDq0Xr8EPDRxTEjyd6sZXCmry4Ry8qTDpaGZU=";
|
||||
ignoreConfigErrors=true;
|
||||
};
|
||||
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
linux-surface = fetchFromGitHub {
|
||||
owner = "linux-surface";
|
||||
repo = "linux-surface";
|
||||
rev = "arch-6.6.6-1";
|
||||
hash = "sha256-0pP/A0XllR/iheIBEBwEApaXpyFYzsnGZ+wdm4w5Jjg=";
|
||||
rev = "arch-6.8.6-1";
|
||||
hash = "sha256-kLnHcYFeQ7/8lbSL4p9D2aC4V/Ib1tU225UOkRcNnH4=";
|
||||
};
|
||||
|
||||
# This is the owner and repo for the pre-patched kernel from the "linux-surface" project:
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
# TUXEDO Pulse 14 - Gen3
|
||||
|
||||
## About
|
||||
|
||||
[NixOS hardware configuration](https://github.com/NixOS/nixos-hardware) for
|
||||
[TUXEDO Pulse 14 -
|
||||
Gen3](https://www.tuxedocomputers.com/en/TUXEDO-Pulse-14-Gen3).
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
{pkgs, ...}: {
|
||||
imports = [
|
||||
../../../../common/cpu/amd
|
||||
../../../../common/cpu/amd/pstate.nix
|
||||
../../../../common/cpu/amd/raphael/igpu.nix
|
||||
../../../../common/pc/laptop
|
||||
../../../../common/pc/laptop/ssd
|
||||
];
|
||||
}
|
||||
Loading…
Reference in New Issue