Merge pull request #1668 from concatime/fix/rename-modules

Rename some modules to their correct names
meta: rename module to pcie-brcmstb
2025-11-08 19:46:10 +01:00 · 2025-11-06 21:07:11 +00:00 · 2025-11-06 15:05:04 -05:00 · 2025-11-06 15:05:04 -05:00 · 2025-11-06 11:05:22 +00:00 · 2025-11-06 11:04:51 +00:00
854 changed files with 34269 additions and 2898 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -0,0 +1,48 @@
+# EditorConfig configuration for nixpkgs
+# https://EditorConfig.org
+
+# Top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file, utf-8 charset
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+
+# Ignore diffs/patches
+[*.{diff,patch}]
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+
+# see https://nixos.org/nixpkgs/manual/#chap-conventions
+
+# Match json/lockfiles/markdown/nix/perl/python/ruby/shell/docbook files, set indent to spaces
+[*.{json,lock,md,nix,pl,pm,py,rb,sh,xml}]
+indent_style = space
+
+# Match docbook files, set indent width of one
+[*.xml]
+indent_size = 1
+
+# Match json/lockfiles/markdown/nix/ruby files, set indent width of two
+[*.{json,lock,md,nix,rb}]
+indent_size = 2
+
+# Match perl/python/shell scripts, set indent width of four
+[*.{pl,pm,py,sh}]
+indent_size = 4
+
+# Match gemfiles, set indent to spaces with width of two
+[Gemfile]
+indent_size = 2
+indent_style = space
+
+# Disable file types or individual files
+# some of these files may be auto-generated and/or require significant changes
+
+[*.{c,h}]
+insert_final_newline = unset
+trim_trailing_whitespace = unset
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@ -0,0 +1,12 @@
+# This file contains commits that should be ignored by git blame
+# See https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-file
+# and https://github.com/NixOS/nixpkgs/blob/master/.git-blame-ignore-revs for more info
+
+# To enable this in your local repository, run:
+#   git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+# For rebasing PRs, commits marked with !autorebase will be automatically
+# reapplied by the auto-rebase script
+
+# nixfmt-rfc-style formatting
+51e51e601448705c0d2f92ef90ec7b680123077c #!autorebase cd tests && nix fmt ..
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -0,0 +1,11 @@
+###### Description of changes
+
+
+###### Things done
+
+<!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. -->
+
+- [ ] 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
+
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -2,14 +2,20 @@ name: "Test"
 on:
  pull_request:
  push:
+    branches:
+      - master
+  merge_group:
 jobs:
-  tests:
+  nixfmt:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v2
-    - uses: cachix/install-nix-action@v13
-      with:
-        nix_path: nixpkgs=channel:nixos-unstable
-    - name: Show nixpkgs version
-      run: nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version'
-    - run: ./tests/run.py
+    - uses: actions/checkout@v5
+    - uses: cachix/install-nix-action@v31
+    - run: nix build .#checks.x86_64-linux.formatting
+  tests:
+    needs: nixfmt
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v5
+    - uses: cachix/install-nix-action@v31
+    - run: nix run .#run-tests
--- a/.mergify.yml
+++ b/.mergify.yml
@ -0,0 +1,13 @@
+queue_rules:
+  - name: default
+    merge_conditions:
+      - check-success=tests
+    batch_size: 5
+    merge_method: rebase
+pull_request_rules:
+  - name: merge using the merge queue
+    conditions:
+      - base=master
+      - label~=merge-queue|dependencies
+    actions:
+      queue: {}
--- a/6
+++ b/6
@ -1,8 +1,14 @@
 beagleboard/pocketbeagle @yegortimoshenko
 dell/xps/13-9370 @moredread
 dell/xps/13-9380 @kalbasit
+dell/xps/15-9560 @Lyndeno
 lenovo/thinkpad/x230 @makefu @yegortimoshenko
 lenovo/thinkpad/x250 @Mic92
 pcengines/apu @yegortimoshenko
+pine64/rockpro64 @tomfitzhenry
+pine64/star64 @fgaz
 purism/librem/13v3 @yegortimoshenko
 system76/darp6 @khumba
+framework @emiller88
+tuxedo/pulse/15/gen2 @trueNAHO
+tuxedo/pulse/14/gen3 @gabyx @britter
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,8 +1,14 @@
-# Writing profiles
+# Contributing a Device Profile
+
+## 1. Writing profiles
+
+Create an appropriate directory and start writing your expression.

 When setting an option, use `lib.mkDefault` unless:
- The option *must* be set and the user should get an error if they try to override it.
- The setting should merge with the user's settings (typical for list or set options).
+- The option *must* be set and the user should get an error if they try to
+  override it.
+- The setting should merge with the user's settings (typical for list or set
+  options).

 For example:

@ -15,17 +21,33 @@ For example:
 }
 ```

-Try to avoid "opinionated" settings relating to optional features like sound, bluetooth, choice of bootloader etc.
+Where possible, use module imports to share code between similar hardware
+variants. In most cases, import:
+- a cpu module;
+- a gpu module;
+- either the pc or the laptop module;
+- either the HDD or the SSD module.

-Where possible, use module imports to share code between similar hardware variants.
+Try to avoid "opinionated" settings relating to optional features like sound,
+bluetooth, choice of bootloader etc. You can mention these in the readme.

-# Performance
+Profiles should favor usability and stability, so performance improvements
+should either be conservative or be guarded behind additional NixOS module
+options. If it makes sense to have a performance-focussed config, it can be
+declared in a separate profile.

-Profiles should favor usability and stability, so performance improvements should either be conservative or 
-be guarded behind additional NixOS module options.
+## 2. Adding Entry

-If it makes sense to have a performance-focussed config, it can be declared in a separate profile.
+Link the profile in the table in README.md and in flake.nix.

-# Testing
+## 3. Testing

-Because profiles can only be tested with the appropriate hardware, quality assurance is up to *you*.
+Run `nix run .#run-tests` to evaluate all hardware profiles.
+Because profiles can only be tested with the appropriate hardware, quality
+assurance is up to *you*.
+
+# For reviewers:
+
+This repository has [mergify](https://mergify.com/) enabled for easier merging after a successfull build:
+
+* `@mergify queue` will add the current pull request to the merge queue and merge when all tests succeed
--- a/README.md
+++ b/README.md
@ -24,14 +24,15 @@ imports = [

 New updates to the expressions here will be fetched when you update the channel.

-## Using nix flakes support
+### Using nix flakes support

-There is also experimental flake support. In your `/etc/nixos/flake.nix` add the following:
+There is also experimental flake support. In your `/etc/nixos/flake.nix` add
+the following:

 ```nix
 {
  description = "NixOS configuration with flakes";
-  inputs.nixos-hardware.url = github:NixOS/nixos-hardware/master;
+  inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master";

  outputs = { self, nixpkgs, nixos-hardware }: {
    # replace <your-hostname> with your actual hostname
@ -47,7 +48,6 @@ There is also experimental flake support. In your `/etc/nixos/flake.nix` add the
 }
 ```

-
 ### Using fetchGit

 You can fetch the git repository directly:
@ -61,132 +61,389 @@ imports = [
 Unlike the channel, this will update the git repository on a rebuild. However,
 you can easily pin to a particular revision if you desire more stability.

+## How to contribute a new device profile
+
+See [CONTRIBUTING.md](./CONTRIBUTING.md).
+
+## Get in touch
+
+For questions and discussions, come join us in the [nixos-anywhere matrix](https://matrix.to/#/#nixos-hardware:nixos.org) room.
+
+# Community Meetings
+
+The [NixOS hardware](https://github.com/orgs/NixOS/teams/nixos-hardware) team meets regularly to discuss hardware profiles and maintenance:
+
+- **When**: Every 3rd Friday of the month
+- **Time**: 04:00 pm (UTC) / 16:00 (UTC)
+- **Where**: https://jitsi.lassul.us/Hardware-team
+- **Contact**: hardware@nixos.org
+
+All contributors and users are welcome to join!
+
 ## List of Profiles

 See code for all available configurations.

-| Model                             | Path                                               |
-| --------------------------------- | -------------------------------------------------- |
-| [Acer Aspire 4810T][]             | `<nixos-hardware/acer/aspire/4810t>`               |
-| Airis N990                        | `<nixos-hardware/airis/n990>`                      |
-| Apple MacBook Air 3,X             | `<nixos-hardware/apple/macbook-air/3>`             |
-| Apple MacBook Air 4,X             | `<nixos-hardware/apple/macbook-air/4>`             |
-| Apple MacBook Air 6,X             | `<nixos-hardware/apple/macbook-air/6>`             |
-| [Apple MacBook Pro 10,1][]        | `<nixos-hardware/apple/macbook-pro/10-1>`          |
-| Apple MacBook Pro 12,1            | `<nixos-hardware/apple/macbook-pro/12-1>`          |
-| Asus TUF FX504GD                  | `<nixos-hardware/asus/fx504gd>`                    |
-| BeagleBoard PocketBeagle          | `<nixos-hardware/beagleboard/pocketbeagle>`        |
-| [Dell G3 3779][]                  | `<nixos-hardware/dell/g3/3779>`                    |
-| Dell Latitude 3480                | `<nixos-hardware/dell/latitude/3480>`              |
-| Dell Precision 5530               | `<nixos-hardware/dell/precision/5530>`             |
-| [Dell XPS E7240][]                | `<nixos-hardware/dell/e7240>`                      |
-| [Dell XPS 13 7390][]              | `<nixos-hardware/dell/xps/13-7390>`                |
-| [Dell XPS 13 9310][]              | `<nixos-hardware/dell/xps/13-9310>`                |
-| [Dell XPS 13 9343][]              | `<nixos-hardware/dell/xps/13-9343>`                |
-| [Dell XPS 13 9360][]              | `<nixos-hardware/dell/xps/13-9360>`                |
-| [Dell XPS 13 9370][]              | `<nixos-hardware/dell/xps/13-9370>`                |
-| [Dell XPS 13 9380][]              | `<nixos-hardware/dell/xps/13-9380>`                |
-| [Dell XPS 15 7590][]              | `<nixos-hardware/dell/xps/15-7590>`                |
-| [Dell XPS 15 9550][]              | `<nixos-hardware/dell/xps/15-9550>`                |
-| [Dell XPS 15 9550, nvidia][]      | `<nixos-hardware/dell/xps/15-9550/nvidia>`         |
-| [Dell XPS 15 9560][]              | `<nixos-hardware/dell/xps/15-9560>`                |
-| [Dell XPS 15 9560, intel only][]  | `<nixos-hardware/dell/xps/15-9560/intel>`          |
-| [Dell XPS 15 9560, nvidia only][] | `<nixos-hardware/dell/xps/15-9560/nvidia>`         |
-| [Dell XPS 15 9500][]              | `<nixos-hardware/dell/xps/15-9500>`                |
-| [Dell XPS 15 9500, nvidia][]      | `<nixos-hardware/dell/xps/15-9500/nvidia>`         |
-| FriendlyARM NanoPC-T4             | `<nixos-hardware/friendlyarm/nanopc-t4>`           |
-| [Google Pixelbook][]              | `<nixos-hardware/google/pixelbook>`                |
-| [GPD MicroPC][]                   | `<nixos-hardware/gpd/micropc>`                     |
-| [Inverse Path USB armory][]       | `<nixos-hardware/inversepath/usbarmory>`           |
-| Lenovo IdeaPad Z510               | `<nixos-hardware/lenovo/ideapad/z510>`             |
-| Lenovo ThinkPad E470              | `<nixos-hardware/lenovo/thinkpad/e470>`            |
-| Lenovo ThinkPad E495              | `<nixos-hardware/lenovo/thinkpad/e495>`            |
-| Lenovo ThinkPad L13               | `<nixos-hardware/lenovo/thinkpad/l13>`             |
-| Lenovo ThinkPad L14 (Intel)       | `<nixos-hardware/lenovo/thinkpad/l14/intel>        |
-| Lenovo ThinkPad L14 (AMD)         | `<nixos-hardware/lenovo/thinkpad/l14/amd>          |
-| Lenovo ThinkPad P53               | `<nixos-hardware/lenovo/thinkpad/p53>`             |
-| Lenovo ThinkPad T14               | `<nixos-hardware/lenovo/thinkpad/t14>`             |
-| Lenovo ThinkPad T14 AMD Gen 1     | `<nixos-hardware/lenovo/thinkpad/t14/amd/gen1>`    |
-| Lenovo ThinkPad T14s              | `<nixos-hardware/lenovo/thinkpad/t14s>`            |
-| Lenovo ThinkPad T14s AMD Gen 1    | `<nixos-hardware/lenovo/thinkpad/t14s/amd/gen1>`   |
-| Lenovo ThinkPad T410              | `<nixos-hardware/lenovo/thinkpad/t410>`            |
-| Lenovo ThinkPad T420              | `<nixos-hardware/lenovo/thinkpad/t420>`            |
-| Lenovo ThinkPad T430              | `<nixos-hardware/lenovo/thinkpad/t430>`            |
-| Lenovo ThinkPad T440s             | `<nixos-hardware/lenovo/thinkpad/t440s>`           |
-| Lenovo ThinkPad T440p             | `<nixos-hardware/lenovo/thinkpad/t440p>`           |
-| Lenovo ThinkPad T450s             | `<nixos-hardware/lenovo/thinkpad/t450s>`           |
-| Lenovo ThinkPad T460              | `<nixos-hardware/lenovo/thinkpad/t460>`            |
-| Lenovo ThinkPad T460s             | `<nixos-hardware/lenovo/thinkpad/t460s>`           |
-| Lenovo ThinkPad T470s             | `<nixos-hardware/lenovo/thinkpad/t470s>`           |
-| Lenovo ThinkPad T480s             | `<nixos-hardware/lenovo/thinkpad/t480s>`           |
-| Lenovo ThinkPad T490              | `<nixos-hardware/lenovo/thinkpad/t490>`            |
-| Lenovo ThinkPad T495              | `<nixos-hardware/lenovo/thinkpad/t495>`            |
-| Lenovo ThinkPad X113 Yoga         | `<nixos-hardware/lenovo/thinkpad/x13-yoga>`        |
-| Lenovo ThinkPad X140e             | `<nixos-hardware/lenovo/thinkpad/x140e>`           |
-| Lenovo ThinkPad X200s             | `<nixos-hardware/lenovo/thinkpad/x200s>`           |
-| Lenovo ThinkPad X220              | `<nixos-hardware/lenovo/thinkpad/x220>`            |
-| Lenovo ThinkPad X230              | `<nixos-hardware/lenovo/thinkpad/x230>`            |
-| Lenovo ThinkPad X250              | `<nixos-hardware/lenovo/thinkpad/x250>`            |
-| [Lenovo ThinkPad X260][]          | `<nixos-hardware/lenovo/thinkpad/x260>`            |
-| Lenovo ThinkPad X270              | `<nixos-hardware/lenovo/thinkpad/x270>`            |
-| Lenovo ThinkPad X280              | `<nixos-hardware/lenovo/thinkpad/x280>`            |
-| [Lenovo ThinkPad X1 (6th Gen)][]  | `<nixos-hardware/lenovo/thinkpad/x1/6th-gen>`      |
-| [Lenovo ThinkPad X1 (7th Gen)][]  | `<nixos-hardware/lenovo/thinkpad/x1/7th-gen>`      |
-| Lenovo ThinkPad X1 Extreme Gen 2  | `<nixos-hardware/lenovo/thinkpad/x1-extreme/gen2>` |
-| [Lenovo ThinkPad X13][]           | `<nixos-hardware/lenovo/thinkpad/x13`              |
-| [Microsoft Surface Range][]       | `<nixos-hardware/microsoft/surface>`               |
-| [Microsoft Surface Pro 3][]       | `<nixos-hardware/microsoft/surface-pro/3>`         |
-| [MSI GS60 2QE][]                  | `<nixos-hardware/msi/gs60>`                        |
-| PC Engines APU                    | `<nixos-hardware/pcengines/apu>`                   |
-| [Raspberry Pi 2][]                | `<nixos-hardware/raspberry-pi/2>`                  |
-| [Raspberry Pi 4][]                | `<nixos-hardware/raspberry-pi/4>`                  |
-| [Samsung Series 9 NP900X3C][]     | `<nixos-hardware/samsung/np900x3c>`                |
-| [Purism Librem 13v3][]            | `<nixos-hardware/purism/librem/13v3>`              |
-| [Purism Librem 15v3][]            | `<nixos-hardware/purism/librem/15v3>`              |
-| Supermicro A1SRi-2758F            | `<nixos-hardware/supermicro/a1sri-2758f>`          |
-| Supermicro X10SLL-F               | `<nixos-hardware/supermicro/x10sll-f>`             |
-| [System76 (generic)][]            | `<nixos-hardware/system76>`                        |
-| [System76 Darter Pro 6][]         | `<nixos-hardware/system76/darp6>`                  |
-| [Toshiba Chromebook 2 `swanky`][] | `<nixos-hardware/toshiba/swanky>`                  |
-| [Tuxedo InfinityBook v4][]        | `<nixos-hardware/tuxedo/infinitybook/v4>`          |
-
-[Acer Aspire 4810T]: acer/aspire/4810t
-[Asus TUF FX504GD]: asus/fx504gd
-[Apple MacBook Pro 10,1]: apple/macbook-pro/10-1
-[Dell G3 3779]: dell/g3/3779
-[Dell XPS E7240]: dell/e7240
-[Dell XPS 13 7390]: dell/xps/13-7390
-[Dell XPS 13 9343]: dell/xps/13-9343
-[Dell XPS 13 9310]: dell/xps/13-9310
-[Dell XPS 13 9360]: dell/xps/13-9360
-[Dell XPS 13 9370]: dell/xps/13-9370
-[Dell XPS 13 9380]: dell/xps/13-9380
-[Dell XPS 15 7590]: dell/xps/15-7590
-[Dell XPS 15 9550]: dell/xps/15-9550
-[Dell XPS 15 9560]: dell/xps/15-9560
-[Dell XPS 15 9560, intel only]: dell/xps/15-9560/intel
-[Dell XPS 15 9560, nvidia only]: dell/xps/15-9560/nvidia
-[Google Pixelbook]: google/pixelbook
-[GPD MicroPC]: gpd/micropc
-[Inverse Path USB armory]: inversepath/usbarmory
-[Lenovo ThinkPad X1 (6th Gen)]: lenovo/thinkpad/x1/6th-gen
-[Lenovo ThinkPad X1 (7th Gen)]: lenovo/thinkpad/x1/7th-gen
-[Lenovo ThinkPad X13]: lenovo/thinkpad/x13
-[Lenovo ThinkPad X13 Yoga]: lenovo/thinkpad/x13-yoga
-[Lenovo ThinkPad X260]: lenovo/thinkpad/x260
-[Microsoft Surface Pro 3]: microsoft/surface-pro/3
-[MSI GS60 2QE]: msi/gs60
-[Raspberry Pi 2]: raspberry-pi/2
-[Samsung Series 9 NP900X3C]: samsung/np900x3c
-[System76 (generic)]: system76
-[System76 Darter Pro 6]: system76/darp6
-[Purism Librem 13v3]: purism/librem/13v3
-[Purism Librem 15v5]: purism/librem/15v5
-[Toshiba Chromebook 2 `swanky`]: toshiba/swanky
-[Tuxedo InfinityBook v4]: nixos-hardware/tuxedo/infinitybook/v4
-
-## How to contribute a new device profile
-
-1. Add your device profile expression in the appropriate directory
-2. Link it in the table in README.md and in flake.nix
-3. Run ./tests/run.py to test it. The test script script will parse all the profiles from the README.md
+| Model                                                                             | Path                                                    | Flake Module                           |
+| --------------------------------------------------------------------------------- | ------------------------------------------------------- | -------------------------------------- |
+| [Acer Aspire 4810T](acer/aspire/4810t)                                            | `<nixos-hardware/acer/aspire/4810t>`                    | `acer-aspire-4810t`                    |
+| [Airis N990](airis/n990)                                                          | `<nixos-hardware/airis/n990>`                           | `airis-n990`                           |
+| [Apple iMac 14.2](apple/imac/14-2)                                                | `<nixos-hardware/apple/imac/14-2>`                      | `apple-imac-14-2`                      |
+| [Apple iMac 18.2](apple/imac/18-2)                                                | `<nixos-hardware/apple/imac/18-2>`                      | `apple-imac-18-2`                      |
+| [Apple MacBook Air 3,X](apple/macbook-air/3)                                      | `<nixos-hardware/apple/macbook-air/3>`                  | `apple-macbook-air-3`                  |
+| [Apple MacBook Air 4,X](apple/macbook-air/4)                                      | `<nixos-hardware/apple/macbook-air/4>`                  | `apple-macbook-air-4`                  |
+| [Apple MacBook Air 5,X](apple/macbook-air/5)                                      | `<nixos-hardware/apple/macbook-air/5>`                  | `apple-macbook-air-5`                  |
+| [Apple MacBook Air 6,X](apple/macbook-air/6)                                      | `<nixos-hardware/apple/macbook-air/6>`                  | `apple-macbook-air-6`                  |
+| [Apple MacBook Air 7,X](apple/macbook-air/7)                                      | `<nixos-hardware/apple/macbook-air/7>`                  | `apple-macbook-air-7`                  |
+| [Apple MacBook Pro 8,1](apple/macbook-pro/8-1)                                    | `<nixos-hardware/apple/macbook-pro/8-1>`                | `apple-macbook-pro-8-1`                |
+| [Apple MacBook Pro 10,1](apple/macbook-pro/10-1)                                  | `<nixos-hardware/apple/macbook-pro/10-1>`               | `apple-macbook-pro-10-1`               |
+| [Apple MacBook Pro 11,1](apple/macbook-pro/11-1)                                  | `<nixos-hardware/apple/macbook-pro/11-1>`               | `apple-macbook-pro-11-1`               |
+| [Apple MacBook Pro 11,4](apple/macbook-pro/11-4)                                  | `<nixos-hardware/apple/macbook-pro/11-4>`               | `apple-macbook-pro-11-4`               |
+| [Apple MacBook Pro 11,5](apple/macbook-pro/11-5)                                  | `<nixos-hardware/apple/macbook-pro/11-5>`               | `apple-macbook-pro-11-5`               |
+| [Apple MacBook Pro 12,1](apple/macbook-pro/12-1)                                  | `<nixos-hardware/apple/macbook-pro/12-1>`               | `apple-macbook-pro-12-1`               |
+| [Apple MacBook Pro 14,1](apple/macbook-pro/14-1)                                  | `<nixos-hardware/apple/macbook-pro/14-1>`               | `apple-macbook-pro-14-1`               |
+| [Apple MacMini (2010, Intel, Nvidia)](apple/macmini/4)                            | `<nixos-hardware/apple/macmini/4>`                      | `apple-macmini-4-1`                    |
+| [Apple Macs with a T2 Chip](apple/t2)                                             | `<nixos-hardware/apple/t2>`                             | `apple-t2`                             |
+| [Aoostar R1 N100](aoostar/r1/n100)                                                | `<nixos-hardware/aoostar/r1/n100>`                      | `aoostar-r1-n100`                      |
+| [Asus Pro WS X570-ACE](asus/pro-ws-x570-ace)                                      | `<nixos-hardware/asus/pro-ws-x570-ace>`                 | `asus-pro-ws-x570-ace`                 |
+| [Asus ROG Ally RC71L (2023)](asus/ally/rc71l)                                     | `<nixos-hardware/asus/ally/rc71l>`                      | `asus-ally-rc71l`                      |
+| [Asus ROG Flow X13 GV302X\* (2023)](asus/flow/gv302x/amdgpu)                      | `<nixos-hardware/asus/flow/gv302x/amdgpu>`              | `asus-flow-gv302x-amdgpu`              |
+| [Asus ROG Flow X13 GV302X\* (2023)](asus/flow/gv302x/nvidia)                      | `<nixos-hardware/asus/flow/gv302x/nvidia>`              | `asus-flow-gv302x-nvidia`              |
+| [Asus ROG GL552VW](asus/rog-gl552vw)                                              | `<nixos-hardware/asus/rog-gl552vw>`                     | `asus-rog-gl552vw`                     |
+| [Asus ROG Strix G513IM](asus/rog-strix/g513im)                                    | `<nixos-hardware/asus/rog-strix/g513im>`                | `asus-rog-strix-g513im`                |
+| [Asus ROG Strix G533ZW](asus/rog-strix/g533zw)                                    | `<nixos-hardware/asus/rog-strix/g533zw>`                | `asus-rog-strix-g533zw`                |
+| [Asus ROG Strix G533Q](asus/rog-strix/g533q)                                      | `<nixos-hardware/asus/rog-strix/g533q>`                 | `asus-rog-strix-g533zw`                |
+| [Asus ROG Strix G713IE](asus/rog-strix/g713ie)                                    | `<nixos-hardware/asus/rog-strix/g713ie>`                | `asus-rog-strix-g713ie`                |
+| [Asus ROG Strix G733QS](asus/rog-strix/g733qs)                                    | `<nixos-hardware/asus/rog-strix/g733qs>`                | `asus-rog-strix-g733qs`                |
+| [Asus ROG Strix X570-E GAMING](asus/rog-strix/x570e)                              | `<nixos-hardware/asus/rog-strix/x570e>`                 | `asus-rog-strix-x570e`                 |
+| [Asus ROG Zephyrus G14 GA401IV (2020)](asus/zephyrus/ga401iv)                     | `<nixos-hardware/asus/zephyrus/ga401iv>`                | `asus-zephyrus-ga401iv`                |
+| [Asus ROG Zephyrus G14 GA401 (2021)](asus/zephyrus/ga401)                         | `<nixos-hardware/asus/zephyrus/ga401>`                  | `asus-zephyrus-ga401`                  |
+| [Asus ROG Zephyrus G14 GA402](asus/zephyrus/ga402)                                | `<nixos-hardware/asus/zephyrus/ga402>`                  | `asus-zephyrus-ga402`                  |
+| [Asus ROG Zephyrus G14 GA402X\* (2023)](asus/zephyrus/ga402x/amdgpu)              | `<nixos-hardware/asus/zephyrus/ga402x/amdgpu>`          | `asus-zephyrus-ga402x-amdgpu`          |
+| [Asus ROG Zephyrus G14 GA402X\* (2023)](asus/zephyrus/ga402x/nvidia)              | `<nixos-hardware/asus/zephyrus/ga402x/nvidia>`          | `asus-zephyrus-ga402x-nvidia`          |
+| [Asus ROG Zephyrus G15 GA502](asus/zephyrus/ga502)                                | `<nixos-hardware/asus/zephyrus/ga502>`                  | `asus-zephyrus-ga502`                  |
+| [Asus ROG Zephyrus G15 GA503](asus/zephyrus/ga503)                                | `<nixos-hardware/asus/zephyrus/ga503>`                  | `asus-zephyrus-ga503`                  |
+| [Asus ROG Zephyrus G16 GU605MY](asus/zephyrus/gu605my)                            | `<nixos-hardware/asus/zephyrus/gu605my>`                | `asus-zephyrus-gu605my`                |
+| [Asus ROG Zephyrus M16 GU603H](asus/zephyrus/gu603h)                              | `<nixos-hardware/asus/zephyrus/gu603h>`                 | `asus-zephyrus-gu603h`                 |
+| [Asus TUF FX504GD](asus/fx504gd)                                                  | `<nixos-hardware/asus/fx504gd>`                         | `asus-fx504gd`                         |
+| [Asus TUF FX506HM](asus/fx506hm)                                                  | `<nixos-hardware/asus/fx506hm>`                         | `asus-fx506hm`                         |
+| [Asus TUF FA506IC](asus/fa506ic)                                                  | `<nixos-hardware/asus/fa506ic>`                         | `asus-fa506ic`                         |
+| [Asus TUF FA507RM](asus/fa507rm)                                                  | `<nixos-hardware/asus/fa507rm>`                         | `asus-fa507rm`                         |
+| [Asus TUF FA507NV](asus/fa507nv)                                                  | `<nixos-hardware/asus/fa507nv>`                         | `asus-fa507nv`                         |
+| [Asus Zenbook Duo 14 UX481](asus/zenbook/ux481/intelgpu/)                         | `<nixos-hardware/asus/zenbook/ux481/intelgpu>`          | `asus-zenbook-ux481-intelgpu`          |
+| [Asus Zenbook Duo 14 UX481](asus/zenbook/ux481/nvidia/)                           | `<nixos-hardware/asus/zenbook/ux481/nvidia>`            | `asus-zenbook-ux481-nvidia`            |
+| [Asus Zenbook Flip S13 UX371](asus/zenbook/ux371/)                                | `<nixos-hardware/asus/zenbook/ux371>`                   | `asus-zenbook-ux371`                   |
+| [Asus Zenbook Pro 15 UX535](asus/zenbook/ux535/)                                  | `<nixos-hardware/asus/zenbook/ux535>`                   | `asus-zenbook-ux535`                   |
+| [Asus Zenbook Pro 17 UM6702](asus/zenbook/um6702/)                                | `<nixos-hardware/asus/zenbook/um6702>`                  | `asus-zenbook-um6702`                  |
+| [BeagleBoard PocketBeagle](beagleboard/pocketbeagle)                              | `<nixos-hardware/beagleboard/pocketbeagle>`             | `beagleboard-pocketbeagle`             |
+| [Chuwi MiniBook X](chuwi/minibook-x)                                              | `<nixos-hardware/chuwi/minibook-x>`                     | `chuwi-minibook-x`                     |
+| [Deciso DEC series](deciso/dec)                                                   | `<nixos-hardware/deciso/dec>`                           | `deciso-dec`                           |
+| [Dell G3 3779](dell/g3/3779)                                                      | `<nixos-hardware/dell/g3/3779>`                         | `dell-g3-3779`                         |
+| [Dell G3 3579](dell/g3/3579)                                                      | `<nixos-hardware/dell/g3/3579>`                         | `dell-g3-3579`                         |
+| [Dell Inspiron 3442](dell/inspiron/3442)                                          | `<nixos-hardware/dell/inspiron/3442>`                   | `dell-inspiron-3442`                   |
+| [Dell Inspiron 14 5420](dell/inspiron/14-5420)                                    | `<nixos-hardware/dell/inspiron/14-5420>`                | `dell-inspiron-14-5420`                |
+| [Dell Inspiron 5509](dell/inspiron/5509)                                          | `<nixos-hardware/dell/inspiron/5509>`                   | `dell-inspiron-5509`                   |
+| [Dell Inspiron 5515](dell/inspiron/5515)                                          | `<nixos-hardware/dell/inspiron/5515>`                   | `dell-inspiron-5515`                   |
+| [Dell Inspiron 7405](dell/inspiron/7405)                                          | `<nixos-hardware/dell/inspiron/7405>`                   | `dell-inspiron-7405`                   |
+| [Dell Inspiron 7460](dell/inspiron/7460)                                          | `<nixos-hardware/dell/inspiron/7460>`                   | `dell-inspiron-7460`                   |
+| [Dell Inspiron 7559](dell/inspiron/7559)                                          | `<nixos-hardware/dell/inspiron/7559>`                   | `dell-inspiron-7559`                   |
+| [Dell Latitude 3340](dell/latitude/3340)                                          | `<nixos-hardware/dell/latitude/3340>`                   | `dell-latitude-3340`                   |
+| [Dell Latitude 3480](dell/latitude/3480)                                          | `<nixos-hardware/dell/latitude/3480>`                   | `dell-latitude-3480`                   |
+| [Dell Latitude 5490](dell/latitude/5490)                                          | `<nixos-hardware/dell/latitude/5490>`                   | `dell-latitude-5490`                   |
+| [Dell Latitude 5520](dell/latitude/5520)                                          | `<nixos-hardware/dell/latitude/5520>`                   | `dell-latitude-5520`                   |
+| [Dell Latitude 7280](dell/latitude/7280)                                          | `<nixos-hardware/dell/latitude/7280>`                   | `dell-latitude-7280`                   |
+| [Dell Latitude 7390](dell/latitude/7390)                                          | `<nixos-hardware/dell/latitude/7390>`                   | `dell-latitude-7390`                   |
+| [Dell Latitude 7420](dell/latitude/7420)                                          | `<nixos-hardware/dell/latitude/7420>`                   | `dell-latitude-7420`                   |
+| [Dell Latitude 7430](dell/latitude/7430)                                          | `<nixos-hardware/dell/latitude/7430>`                   | `dell-latitude-7430`                   |
+| [Dell Latitude 7490](dell/latitude/7490)                                          | `<nixos-hardware/dell/latitude/7490>`                   | `dell-latitude-7490`                   |
+| [Dell Latitude 9430](dell/latitude/9430)                                          | `<nixos-hardware/dell/latitude/9430>`                   | `dell-latitude-9430`                   |
+| [Dell Latitude E7240](dell/latitude/e7240)                                        | `<nixos-hardware/dell/latitude/e7240>`                  | `dell-latitude-e7240`                  |
+| [Dell Optiplex 3050](dell/optiplex/3050)                                          | `<nixos-hardware/dell/optiplex/3050>`                   | `dell-optiplex-3050`                   |
+| [Dell Poweredge R7515](dell/poweredge/r7515)                                      | `<nixos-hardware/dell/poweredge/r7515>`                 | `dell-poweredge-r7515`                 |
+| [Dell Precision 3490, nvidia](dell/precision/3490/nvidia)                         | `<nixos-hardware/dell/precision/3490/nvidia>`           | `dell-precision-3490-nvidia`           |
+| [Dell Precision 3490, intel](dell/precision/3490/intel)                           | `<nixos-hardware/dell/precision/3490/intel>`            | `dell-precision-3490-intel`            |
+| [Dell Precision 3541](dell/precision/3541)                                        | `<nixos-hardware/dell/precision/3541>`                  | `dell-precision-3541`                  |
+| [Dell Precision 5490](dell/precision/5490)                                        | `<nixos-hardware/dell/precision/5490>`                  | `dell-precision-5490`                  |
+| [Dell Precision 5530](dell/precision/5530)                                        | `<nixos-hardware/dell/precision/5530>`                  | `dell-precision-5530`                  |
+| [Dell Precision 5560](dell/precision/5560)                                        | `<nixos-hardware/dell/precision/5560>`                  | `dell-precision-5560`                  |
+| [Dell Precision 5570](dell/precision/5570)                                        | `<nixos-hardware/dell/precision/5570>`                  | `dell-precision-5570`                  |
+| [Dell Precision 7520](dell/precision/7520)                                        | `<nixos-hardware/dell/precision/7520>`                  | `dell-precision-7520`                  |
+| [Dell XPS 13 7390](dell/xps/13-7390)                                              | `<nixos-hardware/dell/xps/13-7390>`                     | `dell-xps-13-7390`                     |
+| [Dell XPS 13 9300](dell/xps/13-9300)                                              | `<nixos-hardware/dell/xps/13-9300>`                     | `dell-xps-13-9300`                     |
+| [Dell XPS 13 9310](dell/xps/13-9310)                                              | `<nixos-hardware/dell/xps/13-9310>`                     | `dell-xps-13-9310`                     |
+| [Dell XPS 13 9315](dell/xps/13-9315)                                              | `<nixos-hardware/dell/xps/13-9315>`                     | `dell-xps-13-9315`                     |
+| [Dell XPS 13 9333](dell/xps/13-9333)                                              | `<nixos-hardware/dell/xps/13-9333>`                     | `dell-xps-13-9333`                     |
+| [Dell XPS 13 9343](dell/xps/13-9343)                                              | `<nixos-hardware/dell/xps/13-9343>`                     | `dell-xps-13-9343`                     |
+| [Dell XPS 13 9350](dell/xps/13-9350)                                              | `<nixos-hardware/dell/xps/13-9350>`                     | `dell-xps-13-9350`                     |
+| [Dell XPS 13 9360](dell/xps/13-9360)                                              | `<nixos-hardware/dell/xps/13-9360>`                     | `dell-xps-13-9360`                     |
+| [Dell XPS 13 9370](dell/xps/13-9370)                                              | `<nixos-hardware/dell/xps/13-9370>`                     | `dell-xps-13-9370`                     |
+| [Dell XPS 13 9380](dell/xps/13-9380)                                              | `<nixos-hardware/dell/xps/13-9380>`                     | `dell-xps-13-9380`                     |
+| [Dell XPS 15 7590, nvidia](dell/xps/15-7590/nvidia)                               | `<nixos-hardware/dell/xps/15-7590/nvidia>`              | `dell-xps-15-7590-nvidia`              |
+| [Dell XPS 15 7590](dell/xps/15-7590)                                              | `<nixos-hardware/dell/xps/15-7590>`                     | `dell-xps-15-7590`                     |
+| [Dell XPS 15 9500, nvidia](dell/xps/15-9500/nvidia)                               | `<nixos-hardware/dell/xps/15-9500/nvidia>`              | `dell-xps-15-9500-nvidia`              |
+| [Dell XPS 15 9500](dell/xps/15-9500)                                              | `<nixos-hardware/dell/xps/15-9500>`                     | `dell-xps-15-9500`                     |
+| [Dell XPS 15 9510, nvidia](dell/xps/15-9510/nvidia)                               | `<nixos-hardware/dell/xps/15-9510/nvidia>`              | `dell-xps-15-9510-nvidia`              |
+| [Dell XPS 15 9510](dell/xps/15-9510)                                              | `<nixos-hardware/dell/xps/15-9510>`                     | `dell-xps-15-9510`                     |
+| [Dell XPS 15 9520, nvidia](dell/xps/15-9520/nvidia)                               | `<nixos-hardware/dell/xps/15-9520/nvidia>`              | `dell-xps-15-9520-nvidia`              |
+| [Dell XPS 15 9520](dell/xps/15-9520)                                              | `<nixos-hardware/dell/xps/15-9520>`                     | `dell-xps-15-9520`                     |
+| [Dell XPS 15 9530, nvidia](dell/xps/15-9530/nvidia)                               | `<nixos-hardware/dell/xps/15-9530/nvidia>`              | `dell-xps-15-9530-nvidia`              |
+| [Dell XPS 15 9530](dell/xps/15-9530)                                              | `<nixos-hardware/dell/xps/15-9530>`                     | `dell-xps-15-9530`                     |
+| [Dell XPS 15 9550, nvidia](dell/xps/15-9550/nvidia)                               | `<nixos-hardware/dell/xps/15-9550/nvidia>`              | `dell-xps-15-9550-nvidia`              |
+| [Dell XPS 15 9550](dell/xps/15-9550)                                              | `<nixos-hardware/dell/xps/15-9550>`                     | `dell-xps-15-9550`                     |
+| [Dell XPS 15 9560, intel only](dell/xps/15-9560/intel)                            | `<nixos-hardware/dell/xps/15-9560/intel>`               | `dell-xps-15-9560-intel`               |
+| [Dell XPS 15 9560, nvidia only](dell/xps/15-9560/nvidia)                          | `<nixos-hardware/dell/xps/15-9560/nvidia>`              | `dell-xps-15-9560-nvidia`              |
+| [Dell XPS 15 9560](dell/xps/15-9560)                                              | `<nixos-hardware/dell/xps/15-9560>`                     | `dell-xps-15-9560`                     |
+| [Dell XPS 15 9570, intel only](dell/xps/15-9570/intel)                            | `<nixos-hardware/dell/xps/15-9570/intel>`               | `dell-xps-15-9570-intel`               |
+| [Dell XPS 15 9570, nvidia](dell/xps/15-9570/nvidia)                               | `<nixos-hardware/dell/xps/15-9570/nvidia>`              | `dell-xps-15-9570-nvidia`              |
+| [Dell XPS 15 9570](dell/xps/15-9570)                                              | `<nixos-hardware/dell/xps/15-9570>`                     | `dell-xps-15-9570`                     |
+| [Dell XPS 17 9700, intel](dell/xps/17-9700/intel)                                 | `<nixos-hardware/dell/xps/17-9700/intel`                | `dell-xps-17-9700-intel`               |
+| [Dell XPS 17 9700, nvidia](dell/xps/17-9700/nvidia)                               | `<nixos-hardware/dell/xps/17-9700/nvidia>`              | `dell-xps-17-9700-nvidia`              |
+| [Dell XPS 17 9710, intel only](dell/xps/17-9710/intel)                            | `<nixos-hardware/dell/xps/17-9710/intel>`               | `dell-xps-17-9710-intel`               |
+| [Framework 11th Gen Intel Core](framework/13-inch/11th-gen-intel)                 | `<nixos-hardware/framework/13-inch/11th-gen-intel>`     | `framework-11th-gen-intel`             |
+| [Framework 12th Gen Intel Core](framework/13-inch/12th-gen-intel)                 | `<nixos-hardware/framework/13-inch/12th-gen-intel>`     | `framework-12th-gen-intel`             |
+| [Framework 13th Gen Intel Core](framework/13-inch/13th-gen-intel)                 | `<nixos-hardware/framework/13-inch/13th-gen-intel>`     | `framework-13th-gen-intel`             |
+| [Framework Intel Core Ultra Series 1](framework/13-inch/intel-core-ultra-series1) | `<nixos-hardware/framework/13-inch/intel-core-ultra-series1>`     | `framework-intel-core-ultra-series1` |
+| [Framework 13 AMD Ryzen 7040 Series](framework/13-inch/7040-amd)                  | `<nixos-hardware/framework/13-inch/7040-amd>`           | `framework-13-7040-amd`                |
+| [Framework 13 AMD AI 300 Series](framework/13-inch/amd-ai-300-series)             | `<nixos-hardware/framework/13-inch/amd-ai-300-series>`  | `framework-amd-ai-300-series`          |
+| [Framework 12 13th Gen Intel Core](framework/12-inch/13th-gen-intel)              | `<nixos-hardware/framework/12-inch/13th-gen-intel>`     | `framework-12-13th-gen-intel`          |
+| [Framework 16 AMD Ryzen 7040 Series](framework/16-inch/7040-amd)                  | `<nixos-hardware/framework/16-inch/7040-amd>`           | `framework-16-7040-amd`                |
+| [Framework 16 AMD Ryzen AI 300 Series](framework/16-inch/amd-ai-300-series)       | `<nixos-hardware/framework/16-inch/amd-ai-300-series>`  | `framework-16-amd-ai-300-series`       |
+| [FriendlyARM NanoPC-T4](friendlyarm/nanopc-t4)                                    | `<nixos-hardware/friendlyarm/nanopc-t4>`                | `friendlyarm-nanopc-t4`                |
+| [FriendlyARM NanoPi R5s](friendlyarm/nanopi-r5s)                                  | `<nixos-hardware/friendlyarm/nanopi-r5s>`               | `friendlyarm-nanopi-r5s`               |
+| [Focus M2 Gen 1](focus/m2/gen1)                                                   | `<nixos-hardware/focus/m2/gen1>`                        | `focus-m2-gen1`                        |
+| [Fydetab Duo](fydetab/duo)                                                        | `<nixos-hardware/fydetab/duo>`                          | `fydetab-duo`                          |
+| [Gigabyte B550](gigabyte/b550)                                                    | `<nixos-hardware/gigabyte/b550>`                        | `gigabyte-b550`                        |
+| [Gigabyte B650](gigabyte/b650)                                                    | `<nixos-hardware/gigabyte/b650>`                        | `gigabyte-b650`                        |
+| [GMKtec NucBox G3 Plus](gmktec/nucbox/g3-plus)                                    | `<nixos-hardware/gmktec/nucbox/g3-plus>`                | `gmktec-nucbox-g3-plus`                |
+| [GPD MicroPC](gpd/micropc)                                                        | `<nixos-hardware/gpd/micropc>`                          | `gpd-micropc`                          |
+| [GPD P2 Max](gpd/p2-max)                                                          | `<nixos-hardware/gpd/p2-max>`                           | `gpd-p2-max`                           |
+| [GPD Pocket 3](gpd/pocket-3)                                                      | `<nixos-hardware/gpd/pocket-3>`                         | `gpd-pocket-3`                         |
+| [GPD Pocket 4](gpd/pocket-4)                                                      | `<nixos-hardware/gpd/pocket-4>`                         | `gpd-pocket-4`                         |
+| [GPD WIN 2](gpd/win-2)                                                            | `<nixos-hardware/gpd/win-2>`                            | `gpd-win-2`                            |
+| [GPD WIN Max 2 2023](gpd/win-max-2/2023)                                          | `<nixos-hardware/gpd/win-max-2/2023>`                   | `gpd-win-max-2-2023`                   |
+| [GPD WIN Mini 2024](gpd/win-mini/2024)                                            | `<nixos-hardware/gpd/win-mini/2024>`                    | `gpd-win-mini-2024`                    |
+| [Google Pixelbook](google/pixelbook)                                              | `<nixos-hardware/google/pixelbook>`                     | `google-pixelbook`                     |
+| [HP Elitebook 2560p](hp/elitebook/2560p)                                          | `<nixos-hardware/hp/elitebook/2560p>`                   | `hp-elitebook-2560p`                   |
+| [HP Elitebook 830g6](hp/elitebook/830/g6)                                         | `<nixos-hardware/hp/elitebook/830/g6>`                  | `hp-elitebook-830g6`                   |
+| [HP Elitebook 845g7](hp/elitebook/845/g7)                                         | `<nixos-hardware/hp/elitebook/845/g7>`                  | `hp-elitebook-845g7`                   |
+| [HP Elitebook 845g8](hp/elitebook/845/g8)                                         | `<nixos-hardware/hp/elitebook/845/g8>`                  | `hp-elitebook-845g8`                   |
+| [HP Elitebook 845g9](hp/elitebook/845/g9)                                         | `<nixos-hardware/hp/elitebook/845/g9>`                  | `hp-elitebook-845g9`                   |
+| [HP Laptop 14s-dq2024nf](hp/laptop/14s-dq2024nf)                                  | `<nixos-hardware/hp/laptop/14s-dq2024nf>`               | `hp-laptop-14s-dq2024nf`               |
+| [HP Notebook 14-df0023](hp/notebook/14-df0023)                                    | `<nixos-hardware/hp/notebook/14-df0023>`                | `hp-notebook-14-df0023`                |
+| [HP Probook 440G5](hp/probook/440G5)                                              | `<nixos-hardware/hp/probook/440G5>`                     | `hp-probook-440G5`                     |
+| [HP Laptop 14s-dq2024nf](hp/laptop/14s-dq2024nf)                                  | `<nixos-hardware/hp/laptop/14s-dq2024nf>`               | `hp-laptop-14s-dq2024nf`               |
+| [HP Probook 460G11](hp/probook/460g11)                                            | `<nixos-hardware/hp/probook/460g11>`                    | `hp-probook-46011`                     |
+| [Huawei Matebook X Pro (2020)](huawei/machc-wa)                                   | `<nixos-hardware/huawei/machc-wa>`                      | `huawei-machc-wa`                      |
+| [i.MX8QuadMax Multisensory Enablement Kit](nxp/imx8qm-mek/)                       | `<nixos-hardware/nxp/imx8qm-mek>`                       | `nxp-imx8qm-mek`                       |
+| [Intel NUC 5i5RYB](intel/nuc/5i5ryb/)                                             | `<nixos-hardware/intel/nuc/5i5ryb>`                     | `intel-nuc-5i5ryb`                     |
+| [Intel NUC 8i7BEH](intel/nuc/8i7beh/)                                             | `<nixos-hardware/intel/nuc/8i7beh>`                     | `intel-nuc-8i7beh`                     |
+| [Kobol Helios4](kobol/helios4)                                                    | `<nixos-hardware/kobol/helios4>`                        | `kobol-helios-4`                       |
+| [Lenovo IdeaCentre K330](lenovo/ideacentre/k330)                                  | `<nixos-hardware/lenovo/ideacentre/k330>`               | `lenovo-ideacentre-k330`               |
+| [Lenovo IdeaPad 3 15alc6](lenovo/ideapad/15alc6)                                  | `<nixos-hardware/lenovo/ideapad/15alc6>`                | `lenovo-ideapad-15alc6`                |
+| [Lenovo IdeaPad Gaming 3 15arh05](lenovo/ideapad/15arh05)                         | `<nixos-hardware/lenovo/ideapad/15arh05>`               | `lenovo-ideapad-15arh05`               |
+| [Lenovo IdeaPad Gaming 3 15ach6](lenovo/ideapad/15ach6)                           | `<nixos-hardware/lenovo/ideapad/15ach6>`                | `lenovo-ideapad-15ach6`                |
+| [Lenovo IdeaPad 5 Pro 14imh9](lenovo/ideapad/14imh9)                              | `<nixos-hardware/lenovo/ideapad/14imh9>`                | `lenovo-ideapad-14imh9`                |
+| [Lenovo IdeaPad 5 Pro 16ach6](lenovo/ideapad/16ach6)                              | `<nixos-hardware/lenovo/ideapad/16ach6>`                | `lenovo-ideapad-16ach6`                |
+| [Lenovo IdeaPad Z510](lenovo/ideapad/z510)                                        | `<nixos-hardware/lenovo/ideapad/z510>`                  | `lenovo-ideapad-z510`                  |
+| [Lenovo IdeaPad Slim 5](lenovo/ideapad/slim-5)                                    | `<nixos-hardware/lenovo/ideapad/slim-5>`                | `lenovo-ideapad-slim-5`                |
+| [Lenovo IdeaPad Slim 5 16iah8](lenovo/ideapad/16iah8)                             | `<nixos-hardware/lenovo/ideapad/16iah8`                 | `lenovo-ideapad-s5-16iah8`             |
+| [Lenovo IdeaPad 2-in-1 16ahp9](lenovo/ideapad/16ahp9)                             | `<nixos-hardware/lenovo/ideapad/16ahp9>`                | `lenovo-ideapad-16ahp9`                |
+| [Lenovo IdeaPad S145 15api](lenovo/ideapad/s145-15api)                            | `<nixos-hardware/lenovo/ideapad/s145-15api>`            | `lenovo-ideapad-s145-15api`            |
+| [Lenovo Legion 5 15ach6h](lenovo/legion/15ach6h)                                  | `<nixos-hardware/lenovo/legion/15ach6h>`                | `lenovo-legion-15ach6h`                |
+| [Lenovo Legion 5 15ach6h (Hybrid)](lenovo/legion/15ach6h/hybrid)                  | `<nixos-hardware/lenovo/legion/15ach6h/hybrid>`         | `lenovo-legion-15ach6h-hybrid`         |
+| [Lenovo Legion 5 15ach6h (Nvidia)](lenovo/legion/15ach6h/hybrid)                  | `<nixos-hardware/lenovo/legion/15ach6h/nvidia>`         | `lenovo-legion-15ach6h-nvidia`         |
+| [Lenovo Legion 5 15arh05h](lenovo/legion/15arh05h)                                | `<nixos-hardware/lenovo/legion/15arh05h>`               | `lenovo-legion-15arh05h`               |
+| [Lenovo Legion 7 Slim 15ach6](lenovo/legion/15ach6)                               | `<nixos-hardware/lenovo/legion/15ach6>`                 | `lenovo-legion-15ach6`                 |
+| [Lenovo Legion 5 Pro 16ach6h](lenovo/legion/16ach6h)                              | `<nixos-hardware/lenovo/legion/16ach6h>`                | `lenovo-legion-16ach6h`                |
+| [Lenovo Legion 5 Pro 16ach6h (Hybrid)](lenovo/legion/16ach6h/hybrid)              | `<nixos-hardware/lenovo/legion/16ach6h/hybrid>`         | `lenovo-legion-16ach6h-hybrid`         |
+| [Lenovo Legion 5 Pro 16ach6h (Nvidia)](lenovo/legion/16ach6h/nvidia)              | `<nixos-hardware/lenovo/legion/16ach6h/nvidia>`         | `lenovo-legion-16ach6h-nvidia`         |
+| [Lenovo Legion 5 Pro 16arh7h (IGPU Only)](lenovo/legion/16arh7h/igpu-only)        | `<nixos-hardware/lenovo/legion/16arh7h/igpu-only>`      | `lenovo-legion-16arh7h-igpu-only`      |
+| [Lenovo Legion 5 Pro 16arh7h (Hybrid)](lenovo/legion/16arh7h/hybrid)              | `<nixos-hardware/lenovo/legion/16arh7h/hybrid>`         | `lenovo-legion-16arh7h-hybrid`         |
+| [Lenovo Legion 5 Pro 16IAH7H (Intel)](lenovo/legion/16iah7h/)                     | `<nixos-hardware/lenovo/legion/16iah7h>`                | `lenovo-legion-16iah7h`                |
+| [Lenovo Legion 7 16achg6 (Hybrid)](lenovo/legion/16achg6/hybrid)                  | `<nixos-hardware/lenovo/legion/16achg6/hybrid>`         | `lenovo-legion-16achg6-hybrid`         |
+| [Lenovo Legion 7 16achg6 (Nvidia)](lenovo/legion/16achg6/nvidia)                  | `<nixos-hardware/lenovo/legion/16achg6/nvidia>`         | `lenovo-legion-16achg6-nvidia`         |
+| [Lenovo Legion 7i Pro 16irx8h (Intel)](lenovo/legion/16irx8h)                     | `<nixos-hardware/lenovo/legion/16irx8h>`                | `lenovo-legion-16irx8h`                |
+| [Lenovo Legion 7 Pro 16irx9h (Intel)](lenovo/legion/16irx9h)                      | `<nixos-hardware/lenovo/legion/16irx9h>`                | `lenovo-legion-16irx9h`                |
+| [Lenovo Legion Slim 5](lenovo/legion/16aph8/)                                     | `<nixos-hardware/lenovo/legion/16aph8>`                 | `lenovo-legion-16aph8`                 |
+| [Lenovo Legion Slim 7 Gen 7 (AMD)](lenovo/legion/16arha7/)                        | `<nixos-hardware/lenovo/legion/16arha7>`                | `lenovo-legion-16arha7`                |
+| [Lenovo Legion T5 AMR5](lenovo/legion/t526amr5)                                   | `<nixos-hardware/lenovo/legion/t526amr5>`               | `lenovo-legion-t526amr5`               |
+| [Lenovo Legion Y530 15ICH](lenovo/legion/15ich)                                   | `<nixos-hardware/lenovo/legion/15ich>`                  | `lenovo-legion-y530-15ich`             |
+| [Lenovo ThinkPad A475](lenovo/thinkpad/a475)                                      | `<nixos-hardware/lenovo/thinkpad/a475>`                 | `lenovo-thinkpad-a475`                 |
+| [Lenovo ThinkPad E14 (AMD)](lenovo/thinkpad/e14/amd)                              | `<nixos-hardware/lenovo/thinkpad/e14/amd>`              | `lenovo-thinkpad-e14-amd`              |
+| [Lenovo ThinkPad E14 (Intel - Gen 1)](lenovo/thinkpad/e14/intel)                  | `<nixos-hardware/lenovo/thinkpad/e14/intel>`            | `lenovo-thinkpad-e14-intel`            |
+| [Lenovo ThinkPad E14 (Intel - Gen 4)](lenovo/thinkpad/e14/intel/gen4)             | `<nixos-hardware/lenovo/thinkpad/e14/intel/gen4>`       | `lenovo-thinkpad-e14-intel-gen4`       |
+| [Lenovo ThinkPad E14 (Intel - Gen 6)](lenovo/thinkpad/e14/intel/gen6)             | `<nixos-hardware/lenovo/thinkpad/e14/intel/gen6>`       | `lenovo-thinkpad-e14-intel-gen6`       |
+| [Lenovo ThinkPad E15 (Intel)](lenovo/thinkpad/e15/intel)                          | `<nixos-hardware/lenovo/thinkpad/e15/intel>`            | `lenovo-thinkpad-e15-intel`            |
+| [Lenovo ThinkPad E470](lenovo/thinkpad/e470)                                      | `<nixos-hardware/lenovo/thinkpad/e470>`                 | `lenovo-thinkpad-e470`                 |
+| [Lenovo ThinkPad E495](lenovo/thinkpad/e495)                                      | `<nixos-hardware/lenovo/thinkpad/e495>`                 | `lenovo-thinkpad-e495`                 |
+| [Lenovo ThinkPad L13 Yoga](lenovo/thinkpad/l13/yoga)                              | `<nixos-hardware/lenovo/thinkpad/l13/yoga>`             | `lenovo-thinkpad-l13-yoga`             |
+| [Lenovo ThinkPad L13](lenovo/thinkpad/l13)                                        | `<nixos-hardware/lenovo/thinkpad/l13>`                  | `lenovo-thinkpad-l13`                  |
+| [Lenovo ThinkPad L14 (AMD)](lenovo/thinkpad/l14/amd)                              | `<nixos-hardware/lenovo/thinkpad/l14/amd>`              | `lenovo-thinkpad-l14-amd`              |
+| [Lenovo ThinkPad L14 (Intel)](lenovo/thinkpad/l14/intel)                          | `<nixos-hardware/lenovo/thinkpad/l14/intel>`            | `lenovo-thinkpad-l14-intel`            |
+| [Lenovo ThinkPad L480](lenovo/thinkpad/l480)                                      | `<nixos-hardware/lenovo/thinkpad/l480>`                 | `lenovo-thinkpad-l480`                 |
+| [Lenovo ThinkPad P1 Gen 3](lenovo/thinkpad/p1/3th-gen)                            | `<nixos-hardware/lenovo/thinkpad/p1/3th-gen>`           | `lenovo-thinkpad-p1-gen3`              |
+| [Lenovo ThinkPad P14s AMD Gen 1](lenovo/thinkpad/p14s/amd/gen1)                   | `<nixos-hardware/lenovo/thinkpad/p14s/amd/gen1>`        | `lenovo-thinkpad-p14s-amd-gen1`        |
+| [Lenovo ThinkPad P14s AMD Gen 2](lenovo/thinkpad/p14s/amd/gen2)                   | `<nixos-hardware/lenovo/thinkpad/p14s/amd/gen2>`        | `lenovo-thinkpad-p14s-amd-gen2`        |
+| [Lenovo ThinkPad P14s AMD Gen 3](lenovo/thinkpad/p14s/amd/gen3)                   | `<nixos-hardware/lenovo/thinkpad/p14s/amd/gen3>`        | `lenovo-thinkpad-p14s-amd-gen3`        |
+| [Lenovo ThinkPad P14s AMD Gen 4](lenovo/thinkpad/p14s/amd/gen4)                   | `<nixos-hardware/lenovo/thinkpad/p14s/amd/gen4>`        | `lenovo-thinkpad-p14s-amd-gen4`        |
+| [Lenovo ThinkPad P14s AMD Gen 5](lenovo/thinkpad/p14s/amd/gen5)                   | `<nixos-hardware/lenovo/thinkpad/p14s/amd/gen5>`        | `lenovo-thinkpad-p14s-amd-gen5`        |
+| [Lenovo ThinkPad P14s Intel Gen 2](lenovo/thinkpad/p14s/intel/gen2)               | `<nixos-hardware/lenovo/thinkpad/p14s/intel/gen2>`      | `lenovo-thinkpad-p14s-intel-gen2`      |
+| [Lenovo ThinkPad P14s Intel Gen 3](lenovo/thinkpad/p14s/intel/gen3)               | `<nixos-hardware/lenovo/thinkpad/p14s/intel/gen3>`      | `lenovo-thinkpad-p14s-intel-gen3`      |
+| [Lenovo ThinkPad P14s Intel Gen 5](lenovo/thinkpad/p14s/intel/gen5)               | `<nixos-hardware/lenovo/thinkpad/p14s/intel/gen5>`      | `lenovo-thinkpad-p14s-intel-gen5`      |
+| [Lenovo ThinkPad P16s AMD Gen 1](lenovo/thinkpad/p16s/amd/gen1)                   | `<nixos-hardware/lenovo/thinkpad/p16s/amd/gen1>`        | `lenovo-thinkpad-p16s-amd-gen1`        |
+| [Lenovo ThinkPad P16s AMD Gen 2](lenovo/thinkpad/p16s/amd/gen2)                   | `<nixos-hardware/lenovo/thinkpad/p16s/amd/gen2>`        | `lenovo-thinkpad-p16s-amd-gen2`        |
+| [Lenovo ThinkPad P16s AMD Gen 4](lenovo/thinkpad/p16s/amd/gen4)                   | `<nixos-hardware/lenovo/thinkpad/p16s/amd/gen4>`        | `lenovo-thinkpad-p16s-amd-gen4`        |
+| [Lenovo ThinkPad P16s Intel Gen 2](lenovo/thinkpad/p16s/intel/gen2)               | `<nixos-hardware/lenovo/thinkpad/p16s/intel/gen2>`      | `lenovo-thinkpad-p16s-intel-gen2`      |
+| [Lenovo ThinkPad P1](lenovo/thinkpad/p1)                                          | `<nixos-hardware/lenovo/thinkpad/p1>`                   | `lenovo-thinkpad-p1`                   |
+| [Lenovo ThinkPad P43s](lenovo/thinkpad/p43s)                                      | `<nixos-hardware/lenovo/thinkpad/p43s>`                 | `lenovo-thinkpad-p43s`                 |
+| [Lenovo ThinkPad P50](lenovo/thinkpad/p50)                                        | `<nixos-hardware/lenovo/thinkpad/p50>`                  | `lenovo-thinkpad-p50`                  |
+| [Lenovo ThinkPad P51](lenovo/thinkpad/p51)                                        | `<nixos-hardware/lenovo/thinkpad/p51>`                  | `lenovo-thinkpad-p51`                  |
+| [Lenovo ThinkPad P52](lenovo/thinkpad/p52)                                        | `<nixos-hardware/lenovo/thinkpad/p52>`                  | `lenovo-thinkpad-p52`                  |
+| [Lenovo ThinkPad P53](lenovo/thinkpad/p53)                                        | `<nixos-hardware/lenovo/thinkpad/p53>`                  | `lenovo-thinkpad-p53`                  |
+| [Lenovo ThinkPad T14 AMD Gen 1](lenovo/thinkpad/t14/amd/gen1)                     | `<nixos-hardware/lenovo/thinkpad/t14/amd/gen1>`         | `lenovo-thinkpad-t14-amd-gen1`         |
+| [Lenovo ThinkPad T14 AMD Gen 2](lenovo/thinkpad/t14/amd/gen2)                     | `<nixos-hardware/lenovo/thinkpad/t14/amd/gen2>`         | `lenovo-thinkpad-t14-amd-gen2`         |
+| [Lenovo ThinkPad T14 AMD Gen 3](lenovo/thinkpad/t14/amd/gen3)                     | `<nixos-hardware/lenovo/thinkpad/t14/amd/gen3>`         | `lenovo-thinkpad-t14-amd-gen3`         |
+| [Lenovo ThinkPad T14 AMD Gen 4](lenovo/thinkpad/t14/amd/gen4)                     | `<nixos-hardware/lenovo/thinkpad/t14/amd/gen4>`         | `lenovo-thinkpad-t14-amd-gen4`         |
+| [Lenovo ThinkPad T14 AMD Gen 5](lenovo/thinkpad/t14/amd/gen5)                     | `<nixos-hardware/lenovo/thinkpad/t14/amd/gen5>`         | `lenovo-thinkpad-t14-amd-gen5`         |
+| [Lenovo ThinkPad T14](lenovo/thinkpad/t14)                                        | `<nixos-hardware/lenovo/thinkpad/t14>`                  | `lenovo-thinkpad-t14`                  |
+| [Lenovo ThinkPad T14 Intel Gen 1](lenovo/thinkpad/t14/intel/gen1)                 | `<nixos-hardware/lenovo/thinkpad/t14/intel/gen1>`       | `lenovo-thinkpad-t14-intel-gen1`       |
+| [Lenovo ThinkPad T14 Intel Gen 1 (Nvidia)](lenovo/thinkpad/t14/intel/gen1/nvidia) | `<nixos-hardware/lenovo/thinkpad/t14/intel/gen1/nvidia>`| `lenovo-thinkpad-t14-intel-gen1-nvidia`|
+| [Lenovo ThinkPad T14 Intel Gen 6](lenovo/thinkpad/t14/intel/gen6)                 | `<nixos-hardware/lenovo/thinkpad/t14/intel/gen6>`       | `lenovo-thinkpad-t14-intel-gen6`       |
+| [Lenovo ThinkPad T14s AMD Gen 1](lenovo/thinkpad/t14s/amd/gen1)                   | `<nixos-hardware/lenovo/thinkpad/t14s/amd/gen1>`        | `lenovo-thinkpad-t14s-amd-gen1`        |
+| [Lenovo ThinkPad T14s AMD Gen 4](lenovo/thinkpad/t14s/amd/gen4)                   | `<nixos-hardware/lenovo/thinkpad/t14s/amd/gen4>`        | `lenovo-thinkpad-t14s-amd-gen4`        |
+| [Lenovo ThinkPad T14s](lenovo/thinkpad/t14s)                                      | `<nixos-hardware/lenovo/thinkpad/t14s>`                 | `lenovo-thinkpad-t14s`                 |
+| [Lenovo ThinkPad T410](lenovo/thinkpad/t410)                                      | `<nixos-hardware/lenovo/thinkpad/t410>`                 | `lenovo-thinkpad-t410`                 |
+| [Lenovo ThinkPad T420](lenovo/thinkpad/t420)                                      | `<nixos-hardware/lenovo/thinkpad/t420>`                 | `lenovo-thinkpad-t420`                 |
+| [Lenovo ThinkPad T430](lenovo/thinkpad/t430)                                      | `<nixos-hardware/lenovo/thinkpad/t430>`                 | `lenovo-thinkpad-t430`                 |
+| [Lenovo ThinkPad T440p](lenovo/thinkpad/t440p)                                    | `<nixos-hardware/lenovo/thinkpad/t440p>`                | `lenovo-thinkpad-t440p`                |
+| [Lenovo ThinkPad T440s](lenovo/thinkpad/t440s)                                    | `<nixos-hardware/lenovo/thinkpad/t440s>`                | `lenovo-thinkpad-t440s`                |
+| [Lenovo ThinkPad T450s](lenovo/thinkpad/t450s)                                    | `<nixos-hardware/lenovo/thinkpad/t450s>`                | `lenovo-thinkpad-t450s`                |
+| [Lenovo ThinkPad T460](lenovo/thinkpad/t460)                                      | `<nixos-hardware/lenovo/thinkpad/t460>`                 | `lenovo-thinkpad-t460`                 |
+| [Lenovo ThinkPad T460p](lenovo/thinkpad/t460p)                                    | `<nixos-hardware/lenovo/thinkpad/t460p>`                | `lenovo-thinkpad-t460p`                |
+| [Lenovo ThinkPad T460s](lenovo/thinkpad/t460s)                                    | `<nixos-hardware/lenovo/thinkpad/t460s>`                | `lenovo-thinkpad-t460s`                |
+| [Lenovo ThinkPad T470s](lenovo/thinkpad/t470s)                                    | `<nixos-hardware/lenovo/thinkpad/t470s>`                | `lenovo-thinkpad-t470s`                |
+| [Lenovo ThinkPad T480](lenovo/thinkpad/t480)                                      | `<nixos-hardware/lenovo/thinkpad/t480>`                 | `lenovo-thinkpad-t480`                 |
+| [Lenovo ThinkPad T480s](lenovo/thinkpad/t480s)                                    | `<nixos-hardware/lenovo/thinkpad/t480s>`                | `lenovo-thinkpad-t480s`                |
+| [Lenovo ThinkPad T490](lenovo/thinkpad/t490)                                      | `<nixos-hardware/lenovo/thinkpad/t490>`                 | `lenovo-thinkpad-t490`                 |
+| [Lenovo ThinkPad T490s](lenovo/thinkpad/t490s)                                    | `<nixos-hardware/lenovo/thinkpad/t490s>`                | `lenovo-thinkpad-t490s`                |
+| [Lenovo ThinkPad T495](lenovo/thinkpad/t495)                                      | `<nixos-hardware/lenovo/thinkpad/t495>`                 | `lenovo-thinkpad-t495`                 |
+| [Lenovo ThinkPad T520](lenovo/thinkpad/t520)                                      | `<nixos-hardware/lenovo/thinkpad/t520>`                 | `lenovo-thinkpad-t520`                 |
+| [Lenovo ThinkPad T550](lenovo/thinkpad/t550)                                      | `<nixos-hardware/lenovo/thinkpad/t550>`                 | `lenovo-thinkpad-t550`                 |
+| [Lenovo ThinkPad T590](lenovo/thinkpad/t590)                                      | `<nixos-hardware/lenovo/thinkpad/t590>`                 | `lenovo-thinkpad-t590`                 |
+| [Lenovo ThinkPad W520](lenovo/thinkpad/w520)                                      | `<nixos-hardware/lenovo/thinkpad/w520>`                 | `lenovo-thinkpad-w520`                 |
+| [Lenovo ThinkPad X1 Yoga](lenovo/thinkpad/x1/yoga)                                | `<nixos-hardware/lenovo/thinkpad/x1/yoga>`              | `lenovo-thinkpad-x1-yoga`              |
+| [Lenovo ThinkPad X1 Yoga Gen 7](lenovo/thinkpad/x1/yoga/7th-gen/)                 | `<nixos-hardware/lenovo/thinkpad/x1/yoga/7th-gen>`      | `lenovo-thinkpad-x1-yoga-7th-gen`      |
+| [Lenovo ThinkPad X1 Yoga Gen 8](lenovo/thinkpad/x1/yoga/8th-gen/)                 | `<nixos-hardware/lenovo/thinkpad/x1/yoga/8th-gen>`      | `lenovo-thinkpad-x1-yoga-8th-gen`      |
+| [Lenovo ThinkPad X1 (2nd Gen)](lenovo/thinkpad/x1/2nd-gen)                        | `<nixos-hardware/lenovo/thinkpad/x1/2nd-gen>`           | `lenovo-thinkpad-x1-2nd-gen`           |
+| [Lenovo ThinkPad X1 (6th Gen)](lenovo/thinkpad/x1/6th-gen)                        | `<nixos-hardware/lenovo/thinkpad/x1/6th-gen>`           | `lenovo-thinkpad-x1-6th-gen`           |
+| [Lenovo ThinkPad X1 (7th Gen)](lenovo/thinkpad/x1/7th-gen)                        | `<nixos-hardware/lenovo/thinkpad/x1/7th-gen>`           | `lenovo-thinkpad-x1-7th-gen`           |
+| [Lenovo ThinkPad X1 (9th Gen)](lenovo/thinkpad/x1/9th-gen)                        | `<nixos-hardware/lenovo/thinkpad/x1/9th-gen>`           | `lenovo-thinkpad-x1-9th-gen`           |
+| [Lenovo ThinkPad X1 (10th Gen)](lenovo/thinkpad/x1/10th-gen)                      | `<nixos-hardware/lenovo/thinkpad/x1/10th-gen>`          | `lenovo-thinkpad-x1-10th-gen`          |
+| [Lenovo ThinkPad X1 (11th Gen)](lenovo/thinkpad/x1/11th-gen)                      | `<nixos-hardware/lenovo/thinkpad/x1/11th-gen>`          | `lenovo-thinkpad-x1-11th-gen`          |
+| [Lenovo ThinkPad X1 (12th Gen)](lenovo/thinkpad/x1/12th-gen)                      | `<nixos-hardware/lenovo/thinkpad/x1/12th-gen>`          | `lenovo-thinkpad-x1-12th-gen`          |
+| [Lenovo ThinkPad X1 (13th Gen)](lenovo/thinkpad/x1/13th-gen)                      | `<nixos-hardware/lenovo/thinkpad/x1/13th-gen>`          | `lenovo-thinkpad-x1-13th-gen`          |
+| [Lenovo ThinkPad X1 Extreme Gen 2](lenovo/thinkpad/x1-extreme/gen2)               | `<nixos-hardware/lenovo/thinkpad/x1-extreme/gen2>`      | `lenovo-thinkpad-x1-extreme-gen2`      |
+| [Lenovo ThinkPad X1 Extreme Gen 3](lenovo/thinkpad/x1-extreme/gen3)               | `<nixos-hardware/lenovo/thinkpad/x1-extreme/gen3>`      | `lenovo-thinkpad-x1-extreme-gen3`      |
+| [Lenovo ThinkPad X1 Extreme Gen 4](lenovo/thinkpad/x1-extreme/gen4)               | `<nixos-hardware/lenovo/thinkpad/x1-extreme/gen4>`      | `lenovo-thinkpad-x1-extreme-gen4`      |
+| [Lenovo ThinkPad X1 Nano Gen 1](lenovo/thinkpad/x1-nano/gen1)                     | `<nixos-hardware/lenovo/thinkpad/x1-nano/gen1>`         | `lenovo-thinkpad-x1-nano-gen1`         |
+| [Lenovo ThinkPad X13s](lenovo/thinkpad/x13s)                                      | `<nixos-hardware/lenovo/thinkpad/x13s>`                 | `lenovo-thinkpad-x13s`                 |
+| [Lenovo ThinkPad X13 Yoga](lenovo/thinkpad/x13/yoga)                              | `<nixos-hardware/lenovo/thinkpad/x13/yoga>`             | `lenovo-thinkpad-x13-yoga`             |
+| [Lenovo ThinkPad X13 Yoga (3th Gen)](lenovo/thinkpad/x13/yoga/3th-gen)            | `<nixos-hardware/lenovo/thinkpad/x13/yoga/3th-gen>`     | `lenovo-thinkpad-x13-yoga-3th-gen`     |
+| [Lenovo ThinkPad X13 (Intel)](lenovo/thinkpad/x13/intel)                          | `<nixos-hardware/lenovo/thinkpad/x13/intel>`            | `lenovo-thinkpad-x13-intel`            |
+| [Lenovo ThinkPad X13 (AMD)](lenovo/thinkpad/x13/amd)                              | `<nixos-hardware/lenovo/thinkpad/x13/amd>`              | `lenovo-thinkpad-x13-amd`              |
+| [Lenovo ThinkPad X140e](lenovo/thinkpad/x140e)                                    | `<nixos-hardware/lenovo/thinkpad/x140e>`                | `lenovo-thinkpad-x140e`                |
+| [Lenovo ThinkPad X200s](lenovo/thinkpad/x200s)                                    | `<nixos-hardware/lenovo/thinkpad/x200s>`                | `lenovo-thinkpad-x200s`                |
+| [Lenovo ThinkPad X220](lenovo/thinkpad/x220)                                      | `<nixos-hardware/lenovo/thinkpad/x220>`                 | `lenovo-thinkpad-x220`                 |
+| [Lenovo ThinkPad X230](lenovo/thinkpad/x230)                                      | `<nixos-hardware/lenovo/thinkpad/x230>`                 | `lenovo-thinkpad-x230`                 |
+| [Lenovo ThinkPad X250](lenovo/thinkpad/x250)                                      | `<nixos-hardware/lenovo/thinkpad/x250>`                 | `lenovo-thinkpad-x250`                 |
+| [Lenovo ThinkPad X260](lenovo/thinkpad/x260)                                      | `<nixos-hardware/lenovo/thinkpad/x260>`                 | `lenovo-thinkpad-x260`                 |
+| [Lenovo ThinkPad X270](lenovo/thinkpad/x270)                                      | `<nixos-hardware/lenovo/thinkpad/x270>`                 | `lenovo-thinkpad-x270`                 |
+| [Lenovo ThinkPad X280](lenovo/thinkpad/x280)                                      | `<nixos-hardware/lenovo/thinkpad/x280>`                 | `lenovo-thinkpad-x280`                 |
+| [Lenovo ThinkPad X390](lenovo/thinkpad/x390)                                      | `<nixos-hardware/lenovo/thinkpad/x390>`                 | `lenovo-thinkpad-x390`                 |
+| [Lenovo ThinkPad Z Series](lenovo/thinkpad/z)                                     | `<nixos-hardware/lenovo/thinkpad/z>`                    | `lenovo-thinkpad-z`                    |
+| [Lenovo ThinkPad Z13 Gen 1](lenovo/thinkpad/z/gen1/z13)                           | `<nixos-hardware/lenovo/thinkpad/z/gen1/z13>`           | `lenovo-thinkpad-z13-gen1`             |
+| [Lenovo ThinkPad Z13 Gen 2](lenovo/thinkpad/z/gen2/z13)                           | `<nixos-hardware/lenovo/thinkpad/z/gen2/z13>`           | `lenovo-thinkpad-z13-gen2`             |
+| [Lenovo XiaoXin Pro 14imh9 2024](lenovo/ideapad/14imh9)                           | `<nixos-hardware/lenovo/ideapad/14imh9>`                | `lenovo-ideapad-14imh9`                |
+| [LENOVO Yoga 6 13ALC6 82ND](lenovo/yoga/6/13ALC6)                                 | `<nixos-hardware/lenovo/yoga/6/13ALC6>`                 | `lenovo-yoga-6-13ALC6`                 |
+| [LENOVO Yoga Slim 7 Pro-X 14ARH7 82ND](lenovo/yoga/7/14ARH7/amdgpu)               | `<nixos-hardware/lenovo/yoga/7/14ARH7/amdgpu>`          | `lenovo-yoga-7-14ARH7-amdgpu`          |
+| [LENOVO Yoga Slim 7 Pro-X 14ARH7 82ND](lenovo/yoga/7/14ARH7/nvidia)               | `<nixos-hardware/lenovo/yoga/7/14ARH7/nvidia>`          | `lenovo-yoga-7-14ARH7-nvidia`          |
+| [Lenovo Yoga Slim 7i Pro X 14IAH7 (Integrated)](lenovo/yoga/7/14IAH7/integrated)  | `<nixos-hardware/lenovo/yoga/7/14IAH7/integrated>`      | `lenovo-yoga-7-14IAH7-integrated`      |
+| [Lenovo Yoga Slim 7i Pro X 14IAH7 (Hybrid)](lenovo/yoga/7/14IAH7/hybrid)          | `<nixos-hardware/lenovo/yoga/7/14IAH7/hybrid>`          | `lenovo-yoga-7-14IAH7-hybrid`          |
+| [Lenovo Yoga Slim 7 14ILL10](lenovo/yoga/7/14ILL10)                               | `<nixos-hardware/lenovo/yoga/7/14ILL10>`                | `lenovo-yoga-7-14ILL10`                |
+| [LENOVO Yoga 7 Slim Gen8](lenovo/yoga/7/slim/gen8)                                | `<nixos-hardware/lenovo/yoga/7/slim/gen8>`              | `lenovo-yoga-7-slim-gen8`              |
+| [Linglong Nova Studio](linglong/nova-studio)                                      | `<nixos-hardware/linglong/nova-studio>`                 | `linglong-nova-studio`                 |
+| [MSI B550-A PRO](msi/b550-a-pro)                                                  | `<nixos-hardware/msi/b550-a-pro>`                       | `msi-b550-a-pro`                       |
+| [MSI B350 TOMAHAWK](msi/b350-tomahawk)                                            | `<nixos-hardware/msi/b350-tomahawk>`                    | `msi-b350-tomahawk`                    |
+| [MSI B550 TOMAHAWK](msi/b550-tomahawk)                                            | `<nixos-hardware/msi/b550-tomahawk>`                    | `msi-b550-tomahawk`                    |
+| [MSI GS60 2QE](msi/gs60)                                                          | `<nixos-hardware/msi/gs60>`                             | `msi-gs60`                             |
+| [MSI GL62/CX62](msi/gl62)                                                         | `<nixos-hardware/msi/gl62>`                             | `msi-gl62`                             |
+| [MSI GL65 10SDR-492](msi/gl65/10SDR-492)                                          | `<nixos-hardware/msi/gl65/10SDR-492>`                   | `msi-gl65-10SDR-492`                   |
+| [Malibal Aon S1](malibal/aon/s1)         |                                        | `<nixos-hardware/malibal/aon/s1>`                       | `malibal-aon-s1`                       |
+| [Microchip Icicle Kit](microchip/icicle-kit)                                      | `<nixos-hardware/microchip/icicle-kit>`                 | `microchip-icicle-kit`                 |
+| [Microsoft Surface Go](microsoft/surface/surface-go)                              | `<nixos-hardware/microsoft/surface/surface-go>`         | `microsoft-surface-go`                 |
+| [Microsoft Surface Pro (Intel)](microsoft/surface/surface-pro-intel)              | `<nixos-hardware/microsoft/surface/surface-pro-intel>`  | `microsoft-surface-pro-intel`          |
+| [Microsoft Surface Laptop (AMD)](microsoft/surface/surface-laptop-amd)            | `<nixos-hardware/microsoft/surface/surface-laptop-amd>` | `microsoft-surface-laptop-amd`         |
+| [Microsoft Surface Range (Common Modules)](microsoft/surface/common)              | `<nixos-hardware/microsoft/surface/common>`             | `microsoft-surface-common`             |
+| [Microsoft Surface Pro 3](microsoft/surface-pro/3)                                | `<nixos-hardware/microsoft/surface-pro/3>`              | `microsoft-surface-pro-3`              |
+| [Microsoft Surface Pro 9](microsoft/surface-pro/9)                                | `<nixos-hardware/microsoft/surface-pro/9>`              | `microsoft-surface-pro-9`              |
+| [Milk-V Pioneer](milkv/pioneer)                                                   | `<nixos-hardware/milkv/pioneer>`                        | `milkv-pioneer`                        |
+| [Morefine M600](morefine/m600)                                                    | `<nixos-hardware/morefine/m600>`                        | `morefine-m600`                        |
+| [Minisforum V3](minisforum/v3)                                                    | `<nixos-hardware/minisforum/v3>`                        | `minisforum-v3`                        |
+| [MNT Reform with RK3588 module](mnt/reform/rk3588)                                | `<nixos-hardware/mnt/reform/rk3588`                     | `mnt-reform-rk3588`                    |
+| [MECHREVO Yilong15Pro](mechrevo/GM5HG0A)                                          | `<nixos-hardware/mechrevo/GM5HG0A>`                     | `mechrevo-gm5hg0a`                     |
+| [NXP iMX8 MPlus Evaluation Kit](nxp/imx8mp-evk)                                   | `<nixos-hardware/nxp/imx8mp-evk>`                       | `nxp-imx8mp-evk`                       |
+| [NXP iMX8 MQuad Evaluation Kit](nxp/imx8mq-evk)                                   | `<nixos-hardware/nxp/imx8mq-evk>`                       | `nxp-imx8mq-evk`                       |
+| [Hardkernel Odroid HC4](hardkernel/odroid-hc4/default.nix)                        | `<nixos-hardware/hardkernel/odroid-hc4>`                | `hardkernel-odroid-hc4`                |
+| [Hardkernel Odroid H3](hardkernel/odroid-h3/default.nix)                          | `<nixos-hardware/hardkernel/odroid-h3>`                 | `hardkernel-odroid-h3`                 |
+| [Hardkernel Odroid H4](hardkernel/odroid-h4/default.nix)                          | `<nixos-hardware/hardkernel/odroid-h4>`                 | `hardkernel-odroid-h4`                 |
+| [Olimex TERES-I](olimex/teres_i)                                                  | `<nixos-hardware/olimex/teres_i>`                       | `olimex-teres_i`                       |
+| [Omen 14-fb0798ng](omen/14-fb0798ng)                                              | `<nixos-hardware/omen/14-fb0798ng>`                     | `omen-14-fb0798ng`                     |
+| [Omen 15-ce002ns](omen/15-ce002ns)                                                | `<nixos-hardware/omen/15-ce002ns>`                      | `omen-15-ce002ns`                      |
+| [Omen 15-en0010ca](omen/15-en0010ca)                                              | `<nixos-hardware/omen/15-en0010ca>`                     | `omen-15-en0010ca`                     |
+| [Omen 16-n0005ne](omen/16-n0005ne)                                                | `<nixos-hardware/omen/16-n0005ne>`                      | `omen-16-n0005ne`                      |
+| [Omen 16-n0280nd](/omen/16-n0280nd)                                               | `<nixos-hardware/omen/16-n0280nd>`                      | `omen-16-n0280nd`                      |
+| [Omen 15-en1007sa](omen/15-en1007sa)                                              | `<nixos-hardware/omen/15-en1007sa>`                     | `omen-15-en1007sa`                     |
+| [Omen 15-en0002np](omen/15-en0002np)                                              | `<nixos-hardware/omen/15-en0002np>`                     | `omen-15-en0002np`                     |
+| [One-Netbook OneNetbook 4](onenetbook/4)                                          | `<nixos-hardware/onenetbook/4>`                         | `onenetbook-4`                         |
+| [Panasonic Let's Note CF-LX3](panasonic/letsnote/cf-lx3)                          | `<nixos-hardware/panasonic/letsnote/cf-lx3>`            | `panasonic-letsnote-cf-lx3`            |
+| [Panasonic Let's Note CF-LX4](panasonic/letsnote/cf-lx4)                          | `<nixos-hardware/panasonic/letsnote/cf-lx4>`            | `letsnote-cf-lx4`                      |
+| [PC Engines APU](pcengines/apu)                                                   | `<nixos-hardware/pcengines/apu>`                        | `pcengines-apu`                        |
+| [PINE64 Pinebook Pro](pine64/pinebook-pro/)                                       | `<nixos-hardware/pine64/pinebook-pro>`                  | `pine64-pinebook-pro`                  |
+| [PINE64 RockPro64](pine64/rockpro64/)                                             | `<nixos-hardware/pine64/rockpro64>`                     | `pine64-rockpro64`                     |
+| [PINE64 STAR64](pine64/star64/)                                                   | `<nixos-hardware/pine64/star64>`                        | `pine64-star64`                        |
+| [Protectli VP4670](protectli/vp4670/)                                             | `<nixos-hardware/protectli/vp4670>`                     | `protectli-vp4670`                     |
+| [Purism Librem 13v3](purism/librem/13v3)                                          | `<nixos-hardware/purism/librem/13v3>`                   | `purism-librem-13v3`                   |
+| [Purism Librem 15v3](purism/librem/15v3)                                          | `<nixos-hardware/purism/librem/15v3>`                   | `purism-librem-15v3`                   |
+| [Purism Librem 5r4](purism/librem/5r4)                                            | `<nixos-hardware/purism/librem/5r4>`                    | `purism-librem-5r4`                    |
+| [Radxa ROCK 4C+](radxa/rock-4c-plus)                                              | `<nixos-hardware/radxa/rock-4c-plus>`                   | `rock-4c-plus`                         |
+| [Radxa ROCK 5 Model B](radxa/rock-5b)                                             | `<nixos-hardware/radxa/rock-5b>`                        | `rock-5b`                              |
+| [Radxa ROCK Pi 4](radxa/rock-pi-4)                                                | `<nixos-hardware/radxa/rock-pi-4>`                      | `rock-pi-4`                            |
+| [Radxa ROCK Pi E](radxa/rock-pi-e)                                                | `<nixos-hardware/radxa/rock-pi-e>`                      | `rock-pi-e`                            |
+| [Raspberry Pi 2](raspberry-pi/2)                                                  | `<nixos-hardware/raspberry-pi/2>`                       | `raspberry-pi-2`                       |
+| [Raspberry Pi 3](raspberry-pi/3)                                                  | `<nixos-hardware/raspberry-pi/3>`                       | `raspberry-pi-3`                       |
+| [Raspberry Pi 4](raspberry-pi/4)                                                  | `<nixos-hardware/raspberry-pi/4>`                       | `raspberry-pi-4`                       |
+| [Raspberry Pi 5](raspberry-pi/5)                                                  | `<nixos-hardware/raspberry-pi/5>`                       | `raspberry-pi-5`                       |
+| [Samsung Series 9 NP900X3C](samsung/np900x3c)                                     | `<nixos-hardware/samsung/np900x3c>`                     | `samsung-np900x3c`                     |
+| [Slimbook Hero RPL-RTX](slimbook/hero/rpl-rtx)                                    | `<nixos-hardware/slimbook/hero/rpl-rtx>`                | `slimbook-hero-rpl-rtx`                |
+| [StarFive VisionFive v1](starfive/visionfive/v1)                                  | `<nixos-hardware/starfive/visionfive/v1>`               | `starfive-visionfive-v1`               |
+| [StarFive VisionFive 2](starfive/visionfive/v2)                                   | `<nixos-hardware/starfive/visionfive/v2>`               | `starfive-visionfive-2`                |
+| [StarLabs StarLite 5 (I5)](starlabs/starlite/i5)                                  | `<nixos-hardware/starlabs/starlite/i5>`                 | `starlabs-starlite-i5`                 |
+| [Supermicro A1SRi-2758F](supermicro/a1sri-2758f)                                  | `<nixos-hardware/supermicro/a1sri-2758f>`               | `supermicro-a1sri-2758f`               |
+| [Supermicro M11SDV-8C-LN4F](supermicro/m11sdv-8c-ln4f)                            | `<nixos-hardware/supermicro/m11sdv-8c-ln4f>`            | `supermicro-m11sdv-8c-ln4f`            |
+| [Supermicro X10SLL-F](supermicro/x10sll-f)                                        | `<nixos-hardware/supermicro/x10sll-f>`                  | `supermicro-x10sll-f`                  |
+| [Supermicro X12SCZ-TLN4F](supermicro/x12scz-tln4f)                                | `<nixos-hardware/supermicro/x12scz-tln4f>`              | `supermicro-x12scz-tln4f`              |
+| [System76 (generic)](system76)                                                    | `<nixos-hardware/system76>`                             | `system76`                             |
+| [System76 Darter Pro 6](system76/darp6)                                           | `<nixos-hardware/system76/darp6>`                       | `system76-darp6`                       |
+| [System76 Gazelle 18](system76/gaze18)                                            | `<nixos-hardware/system76/gaze18>`                      | `system76-gaze18`                      |
+| [System76 Galago Pro 5](system76/galp5-1650)                                      | `<nixos-hardware/system76/galp5-1650>`                  | `system76-galp5-1650`                  |
+| [System76 Thelio Mega](system76/thelio-mega)                                      | `<nixos-hardware/system76/thelio-mega>`                 | `system76-thelio-mega`                 |
+| [Toshiba Chromebook 2 `swanky`](toshiba/swanky)                                   | `<nixos-hardware/toshiba/swanky>`                       | `toshiba-swanky`                       |
+| [Tuxedo InfinityBook v4](tuxedo/infinitybook/v4)                                  | `<nixos-hardware/tuxedo/infinitybook/v4>`               | `tuxedo-infinitybook-v4`               |
+| [TUXEDO Aura 15 - Gen1](tuxedo/aura/15/gen1)                                      | `<nixos-hardware/tuxedo/aura/15/gen1>`                  | `tuxedo-aura-15-gen1`                  |
+| [TUXEDO InfinityBook Pro 14 - Gen7](tuxedo/infinitybook/pro14/gen7)               | `<nixos-hardware/tuxedo/infinitybook/pro14/gen7>`       | `tuxedo-infinitybook-pro14-gen7`       |
+| [TUXEDO InfinityBook Pro 14 - Gen9 - AMD](tuxedo/infinitybook/pro14/gen9/amd)     | `<nixos-hardware/tuxedo/infinitybook/pro14/gen9/amd>`   | `tuxedo-infinitybook-pro14-gen9-amd`   |
+| [TUXEDO InfinityBook Pro 14 - Gen9 - INTEL](tuxedo/infinitybook/pro14/gen9/intel) | `<nixos-hardware/tuxedo/infinitybook/pro14/gen9/intel>` | `tuxedo-infinitybook-pro14-gen9-intel` |
+| [TUXEDO Pulse 14 - Gen3](tuxedo/pulse/14/gen3)                                    | `<nixos-hardware/tuxedo/pulse/14/gen3>`                 | `tuxedo-pulse-14-gen3`                 |
+| [TUXEDO Pulse 15 - Gen2](tuxedo/pulse/15/gen2)                                    | `<nixos-hardware/tuxedo/pulse/15/gen2>`                 | `tuxedo-pulse-15-gen2`                 |
+| [Xiaomi Redmibook 15 Pro 2021](xiaomi/redmibook/15-pro-2021)                      | `<nixos-hardware/xiaomi/redmibook/15-pro-2021>`         | `xiaomi-redmibook-15-pro-2021`         |
+| [Xiaomi Redmibook 16 Pro 2024](xiaomi/redmibook/16-pro-2024)                      | `<nixos-hardware/xiaomi/redmibook/16-pro-2024>`         | `xiaomi-redmibook-16-pro-2024`         |
--- a/acer/aspire/4810t/default.nix
+++ b/acer/aspire/4810t/default.nix
@ -19,9 +19,6 @@
    ];
  };

-  # TODO: reverse compat
-  hardware.opengl.driSupport = false;
-
  # TODO: reverse compat
  services.xserver = {
    defaultDepth = lib.mkDefault 24;
--- a/airis/n990/default.nix
+++ b/airis/n990/default.nix
@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:

 {
  imports = [ ../../common/pc/laptop ];
--- a/aoostar/r1/n100/default.nix
+++ b/aoostar/r1/n100/default.nix
@ -0,0 +1,12 @@
+{
+  imports = [
+    ../../../common/cpu/intel/alder-lake
+  ];
+
+  # lopter@(2025-02-06): according to sensors-detect this comes with an ITE
+  # IT8613E super io chip, which is not officialy supported yet. See also:
+  #
+  # - unofficial driver: https://github.com/frankcrawford/it87
+  # - reddit thread on with useful information to configure pwm from the bios:
+  #   https://www.reddit.com/r/MiniPCs/comments/1bnkg1u/aoostar_r1r7_question_does_the_fan_header_support/
+}
--- a/apple/default.nix
+++ b/apple/default.nix
@ -1,12 +1,7 @@
 { config, lib, ... }:

 {
-  boot.kernelParams = [
-    "hid_apple.iso_layout=0"
-  ];
-
-  hardware.facetimehd.enable = lib.mkDefault
-    (config.nixpkgs.config.allowUnfree or false);
+  hardware.facetimehd.enable = lib.mkDefault (config.nixpkgs.config.allowUnfree or false);

  services.mbpfan.enable = lib.mkDefault true;
 }
--- a/apple/imac/14-2/README.md
+++ b/apple/imac/14-2/README.md
@ -0,0 +1,61 @@
+# iMac 14,2, NixOS (nixos-unstable, September 2024)
+
+## Audio
+- [x] ok
+
+## Bluetooth
+- [x] ok
+
+## Thunderbolt
+- [x] ok
+
+## SATA
+- [x] ok
+
+## NVME
+- [x] ok
+
+## Suspend/Resumer
+- [x] ok
+
+## Wifi
+- [x] ok
+
+## Graphics
+- [x] Latest unsupported Nvidia drivers available are 390.157, working with Kernel 6.10.6.
+
+## LSPCI
+
+```
+❯ lspci
+00:00.0 Host bridge: Intel Corporation 4th Gen Core Processor DRAM Controller (rev 06)
+00:01.0 PCI bridge: Intel Corporation Xeon E3-1200 v3/4th Gen Core Processor PCI Express x16 Controller (rev 06)
+00:14.0 USB controller: Intel Corporation 8 Series/C220 Series Chipset Family USB xHCI (rev 05)
+00:16.0 Communication controller: Intel Corporation 8 Series/C220 Series Chipset Family MEI Controller #1 (rev 04)
+00:1b.0 Audio device: Intel Corporation 8 Series/C220 Series Chipset High Definition Audio Controller (rev 05)
+00:1c.0 PCI bridge: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express Root Port #1 (rev d5)
+00:1c.2 PCI bridge: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express Root Port #3 (rev d5)
+00:1c.3 PCI bridge: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express Root Port #4 (rev d5)
+00:1c.4 PCI bridge: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express Root Port #5 (rev d5)
+00:1f.0 ISA bridge: Intel Corporation Z87 Express LPC Controller (rev 05)
+00:1f.2 SATA controller: Intel Corporation 8 Series/C220 Series Chipset Family 6-port SATA Controller 1 [AHCI mode] (rev 05)
+00:1f.3 SMBus: Intel Corporation 8 Series/C220 Series Chipset Family SMBus Controller (rev 05)
+01:00.0 VGA compatible controller: NVIDIA Corporation GK104M [GeForce GTX 775M Mac Edition] (rev a1)
+01:00.1 Audio device: NVIDIA Corporation GK104 HDMI Audio Controller (rev a1)
+02:00.0 Non-Volatile memory controller: Samsung Electronics Co Ltd NVMe SSD Controller SM981/PM981/PM983
+03:00.0 Network controller: Broadcom Inc. and subsidiaries BCM4360 802.11ac Dual Band Wireless Network Adapter (rev 03)
+04:00.0 Ethernet controller: Broadcom Inc. and subsidiaries NetXtreme BCM57766 Gigabit Ethernet PCIe (rev 01)
+04:00.1 SD Host controller: Broadcom Inc. and subsidiaries BCM57765/57785 SDXC/MMC Card Reader (rev 01)
+05:00.0 PCI bridge: Intel Corporation DSL3510 Thunderbolt Controller [Cactus Ridge 4C 2012] (rev 03)
+06:00.0 PCI bridge: Intel Corporation DSL3510 Thunderbolt Controller [Cactus Ridge 4C 2012] (rev 03)
+06:03.0 PCI bridge: Intel Corporation DSL3510 Thunderbolt Controller [Cactus Ridge 4C 2012] (rev 03)
+06:04.0 PCI bridge: Intel Corporation DSL3510 Thunderbolt Controller [Cactus Ridge 4C 2012] (rev 03)
+06:05.0 PCI bridge: Intel Corporation DSL3510 Thunderbolt Controller [Cactus Ridge 4C 2012] (rev 03)
+06:06.0 PCI bridge: Intel Corporation DSL3510 Thunderbolt Controller [Cactus Ridge 4C 2012] (rev 03)
+07:00.0 System peripheral: Intel Corporation DSL3510 Thunderbolt Controller [Cactus Ridge 4C 2012] (rev 03)
+```
+
+## Links
+
+- https://support.apple.com/en-us/111970
+- https://everymac.com/ultimate-mac-lookup/?search_keywords=iMac14,2
--- a/apple/imac/14-2/default.nix
+++ b/apple/imac/14-2/default.nix
@ -0,0 +1,37 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  imports = [
+    ../.
+    ../../../common/cpu/intel
+    ../../../common/gpu/nvidia
+    ../../../common/gpu/nvidia/kepler
+    ../../../common/hidpi.nix
+  ];
+
+  boot = {
+    initrd.kernelModules = [
+      "applesmc"
+      "applespi"
+      "intel_lpss_pci"
+      "spi_pxa2xx_platform"
+      "kvm-intel"
+    ];
+    blacklistedKernelModules = [
+      "b43"
+      "ssb"
+      "brcmfmac"
+      "brcmsmac"
+      "bcma"
+    ];
+    kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.0") pkgs.linuxPackages_latest;
+  };
+
+  hardware = {
+    bluetooth.enable = lib.mkDefault true;
+  };
+}
--- a/apple/imac/18-2/README.md
+++ b/apple/imac/18-2/README.md
@ -0,0 +1,26 @@
+# iMac 18,2, NixOS 24.05 (2024)
+
+## Audio
+- [ ] broken until https://github.com/NixOS/nixpkgs/pull/322968 lands in master
+
+## Bluetooth
+- [ ] broken until https://github.com/NixOS/nixpkgs/pull/322964 lands in master
+
+## Thunderbolt
+- [x] ok
+
+## SATA
+- [x] ok
+
+## NVME
+- [x] ok, older NVME / Controller may need workaround for resume
+
+## Suspend/Resumer
+- [ ] Thunderbolt, WIFI, NVME may still need reboot (sometimes).
+
+## Wifi
+- [x] Working (2,4Ghz & 5Ghz supported), WEP3 broken -> brcm fw blob (2015) 
+
+## Resources (Intel iMac/MacBook share similar custom hardware)
+- https://github.com/Dunedan/mbp-2016-linux?tab=readme-ov-file
+- https://gist.github.com/roadrunner2/1289542a748d9a104e7baec6a92f9cd7
--- a/apple/imac/18-2/default.nix
+++ b/apple/imac/18-2/default.nix
@ -0,0 +1,34 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  imports = [
+    ../.
+    ../../../common/cpu/intel/kaby-lake
+    ../../../common/gpu/amd
+    ../../../common/hidpi.nix
+    ../../../common/pc/ssd
+  ];
+
+  # apple smc (TODO: check spi)
+  boot = {
+    initrd.kernelModules = [
+      "applespi"
+      "spi_pxa2xx_platform"
+      "intel_lpss_pci"
+      "applesmc"
+    ];
+    kernelParams = [ "intel_iommu=on" ];
+    kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.0") pkgs.linuxPackages_latest;
+  };
+
+  # Wifi, CPU Microcode FW updates
+  networking.enableB43Firmware = lib.mkDefault true;
+  hardware = {
+    enableRedistributableFirmware = lib.mkDefault true;
+    cpu.intel.updateMicrocode = lib.mkDefault true;
+  };
+}
--- a/apple/imac/default.nix
+++ b/apple/imac/default.nix
@ -0,0 +1,8 @@
+{
+  imports = [
+    ../.
+    ../../common/cpu/intel
+    ../../common/pc/laptop
+    ../../common/pc/ssd
+  ];
+}
--- a/apple/macbook-air/3/default.nix
+++ b/apple/macbook-air/3/default.nix
@ -3,13 +3,11 @@
 {
  imports = [
    ../../.
+    ../../../common/cpu/intel
    ../../../common/pc/laptop
    ../../../common/pc/ssd
  ];

  # Built-in iSight is recognized by the generic uvcvideo kernel module
  hardware.facetimehd.enable = false;
-
-  hardware.cpu.intel.updateMicrocode =
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
--- a/apple/macbook-air/5/default.nix
+++ b/apple/macbook-air/5/default.nix
@ -0,0 +1,9 @@
+{
+  ...
+}:
+
+{
+  imports = [
+    ../.
+  ];
+}
--- a/apple/macbook-air/6/default.nix
+++ b/apple/macbook-air/6/default.nix
@ -3,16 +3,14 @@
 {
  imports = [ ../. ];

-  boot = {
-    extraModulePackages = with config.boot.kernelPackages; [ mba6x_bl ];
-    kernelModules = [ "mba6x_bl" ];
+  boot.blacklistedKernelModules = [ "bcma" ];

+  boot = {
    # Divides power consumption by two.
    kernelParams = [ "acpi_osi=" ];
  };

  services.xserver.deviceSection = lib.mkDefault ''
-    Option "Backlight" "mba6x_backlight"
    Option "TearFree" "true"
  '';
 }
--- a/apple/macbook-air/7/README.md
+++ b/apple/macbook-air/7/README.md
@ -0,0 +1,5 @@
+# MacBook Air 7,X
+
+### For wifi driver
+broadcomt_sta was the best working driver I could find, however on the normal kernel, you need to `sudo modprobe -r wl` and `sudo modprobe wl`, however it was fully working on the zen kernel.
+
--- a/apple/macbook-air/7/default.nix
+++ b/apple/macbook-air/7/default.nix
@ -0,0 +1,12 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [
+    ../.
+  ];
+}
--- a/apple/macbook-air/default.nix
+++ b/apple/macbook-air/default.nix
@ -3,6 +3,6 @@
    ../.
    ../../common/cpu/intel
    ../../common/pc/laptop
-    ../../common/pc/laptop/ssd
+    ../../common/pc/ssd
  ];
 }
--- a/apple/macbook-pro/10-1/default.nix
+++ b/apple/macbook-pro/10-1/default.nix
@ -1,17 +1,15 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:

 {
  imports = [
    ../.
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
+    ../../../common/gpu/24.05-compat.nix
+    ../../../common/gpu/nvidia/kepler
  ];

-  # TODO: boot loader
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
  # TODO: reverse compat
-  hardware.opengl.driSupport32Bit = true;
+  hardware.graphics.enable32Bit = lib.mkDefault true;

  services.xserver = {
    # TODO: we should not enable unfree drivers
--- a/apple/macbook-pro/11-1/README.md
+++ b/apple/macbook-pro/11-1/README.md
@ -0,0 +1,12 @@
+# Apple MacBook Pro 11,1
+
+This configuration is tested on my 13" *MacBook Pro (Retina, 13-inch, Late 2013),* model number `A1502`.
+
+The 6.11.5 kernel appears to work well with only minor adjustments on this notebook. Note that my machine has a BCM4360 wireless card (PCI-ID `14e4:43a0`) which appears to only work with the nonfree `wl` driver.
+
+## Additional resources
+
+* Linux Wireless Documentation: [List of hardware](https://wireless.docs.kernel.org/en/latest/en/users/drivers/b43.html#list-of-hardware)
+* Arch linux wiki: [MacBookPro11,x](https://wiki.archlinux.org/index.php/MacBookPro11,x)
+* Kernel patches: [MacBookPro11,x](https://bugzilla.kernel.org/buglist.cgi?quicksearch=macbookpro11)
+
--- a/apple/macbook-pro/11-1/default.nix
+++ b/apple/macbook-pro/11-1/default.nix
@ -0,0 +1,10 @@
+{ lib, config, ... }:
+{
+  imports = [
+    ../.
+    ../../../common/pc/ssd
+    ../../../common/cpu/intel/haswell
+  ];
+
+  hardware.enableRedistributableFirmware = lib.mkDefault true;
+}
--- a/apple/macbook-pro/11-4/README.md
+++ b/apple/macbook-pro/11-4/README.md
@ -0,0 +1,42 @@
+# Apple MacBookPro11,4
+
+[Product page](https://support.apple.com/en-us/111955)
+
+
+## Tested Hardware
+```console
+foo@bar:~$ lspci -nn
+00:00.0 Host bridge [0600]: Intel Corporation Crystal Well DRAM Controller [8086:0d04] (rev 08)
+00:01.0 PCI bridge [0604]: Intel Corporation Crystal Well PCI Express x16 Controller [8086:0d01] (rev 08)
+00:01.1 PCI bridge [0604]: Intel Corporation Crystal Well PCI Express x8 Controller [8086:0d05] (rev 08)
+00:02.0 VGA compatible controller [0300]: Intel Corporation Crystal Well Integrated Graphics Controller [8086:0d26] (rev 08)
+00:03.0 Audio device [0403]: Intel Corporation Crystal Well HD Audio Controller [8086:0d0c] (rev 08)
+00:14.0 USB controller [0c03]: Intel Corporation 8 Series/C220 Series Chipset Family USB xHCI [8086:8c31] (rev 05)
+00:16.0 Communication controller [0780]: Intel Corporation 8 Series/C220 Series Chipset Family MEI Controller #1 [8086:8c3a] (rev 04)
+00:1b.0 Audio device [0403]: Intel Corporation 8 Series/C220 Series Chipset High Definition Audio Controller [8086:8c20] (rev 05)
+00:1c.0 PCI bridge [0604]: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express Root Port #1 [8086:8c10] (rev d5)
+00:1c.2 PCI bridge [0604]: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express Root Port #3 [8086:8c14] (rev d5)
+00:1c.3 PCI bridge [0604]: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express Root Port #4 [8086:8c16] (rev d5)
+00:1f.0 ISA bridge [0601]: Intel Corporation HM87 Express LPC Controller [8086:8c4b] (rev 05)
+00:1f.3 SMBus [0c05]: Intel Corporation 8 Series/C220 Series Chipset Family SMBus Controller [8086:8c22] (rev 05)
+00:1f.6 Signal processing controller [1180]: Intel Corporation 8 Series Chipset Family Thermal Management Controller [8086:8c24] (rev 05)
+01:00.0 SATA controller [0106]: Samsung Electronics Co Ltd S4LN058A01[SSUBX] AHCI SSD Controller (Apple slot) [144d:a801] (rev 01)
+03:00.0 Network controller [0280]: Broadcom Inc. and subsidiaries BCM43602 802.11ac Wireless LAN SoC [14e4:43ba] (rev 01)
+04:00.0 Multimedia controller [0480]: Broadcom Inc. and subsidiaries 720p FaceTime HD Camera [14e4:1570]
+05:00.0 PCI bridge [0604]: Intel Corporation DSL5520 Thunderbolt 2 Bridge [Falcon Ridge 4C 2013] [8086:156d]
+06:00.0 PCI bridge [0604]: Intel Corporation DSL5520 Thunderbolt 2 Bridge [Falcon Ridge 4C 2013] [8086:156d]
+06:03.0 PCI bridge [0604]: Intel Corporation DSL5520 Thunderbolt 2 Bridge [Falcon Ridge 4C 2013] [8086:156d]
+06:04.0 PCI bridge [0604]: Intel Corporation DSL5520 Thunderbolt 2 Bridge [Falcon Ridge 4C 2013] [8086:156d]
+06:05.0 PCI bridge [0604]: Intel Corporation DSL5520 Thunderbolt 2 Bridge [Falcon Ridge 4C 2013] [8086:156d]
+06:06.0 PCI bridge [0604]: Intel Corporation DSL5520 Thunderbolt 2 Bridge [Falcon Ridge 4C 2013] [8086:156d]
+07:00.0 System peripheral [0880]: Intel Corporation DSL5520 Thunderbolt 2 NHI [Falcon Ridge 4C 2013] [8086:156c]
+```
+
+## Tested Nix Configuration
+ - system: `"x86_64-linux"`
+ - host os: `Linux 6.12.36, NixOS, 25.11 (Xantusia), 25.11.20250708.9807714`
+ - multi-user?: `yes`
+ - sandbox: `yes`
+ - version: `nix-env (Nix) 2.28.4`
+ - channels(root): `"nixos"`
+ - nixpkgs: `/nix/store/bgl6ldj5ihbwcq8p42z3a0qzgqafgk2b-source`
--- a/apple/macbook-pro/11-4/default.nix
+++ b/apple/macbook-pro/11-4/default.nix
@ -0,0 +1,17 @@
+{
+  lib,
+  config,
+  pkgs,
+  modulesPath,
+  ...
+}:
+{
+  imports = [
+    ../.
+    ../../../common/cpu/intel/haswell
+    ../../../common/pc/ssd
+    "${modulesPath}/hardware/network/broadcom-43xx.nix"
+  ];
+
+  hardware.graphics.enable = lib.mkDefault true;
+}
--- a/apple/macbook-pro/11-5/README.md
+++ b/apple/macbook-pro/11-5/README.md
@ -22,11 +22,49 @@ This configuration will **not** work with MacBook Pro 11,2 or 11,3 models.

 ## Graphics

-The [MacBookPro11,4 and MacBookPro11,5](https://support.apple.com/kb/SP719) models ship with a discrete ATI graphics card (whereas MacBookPro11,2 and MacBookPro11,3 ship with NVidia cards). This is alongside the usual integrated Intel GPU.
+The [MacBookPro11,4 and MacBookPro11,5](https://support.apple.com/kb/SP719) models ship with a discrete ATI/AMD graphics card (whereas MacBookPro11,2 and MacBookPro11,3 ship with NVidia cards). This is alongside the usual integrated Intel GPU.

-You may wish to look into dynamic switching between integrated and discrete graphics, but this config doesn't attempt it.
+To switch from the older `radeon` driver to the newer `amdgpu` driver (via experimental `si_support`), include `nixos-hardware.nixosModules.common-gpu-amd-southern-islands` (or `${nixos-hardware}/common/gpu/amd/southern-islands`) in your configuration. This will get you vulkan support among other benefits.
+
+For example, in your `flake.nix`:
+
+```nix
+nixosConfigurations = {
+  macbook-pro-11-5 = lib.nixosSystem {
+    system = "x86_64-linux";
+    modules = [
+      nixos-hardware.nixosModules.apple-macbook-pro-11-5
+      nixos-hardware.nixosModules.common-gpu-amd-southern-islands
+      {
+        # Your personal configuration
+      }
+    ];
+  };
+};
+```
+
+## Power management
+
+You may also wish to look into dynamic switching between integrated and discrete graphics, but this config doesn't currently attempt it.
+See the removed [hardware.amdHybridGraphics.disable](https://github.com/NixOS/nixpkgs/pull/33915) option for an entry point.
+
+## Hardware probes
+
+Hardware probes generated with `nix run nixpkgs#hw-probe -- -all -upload`:
+
+* Probe [#305905e674](https://linux-hardware.org/?probe=305905e674) of Apple MacBookPro11,5 (with `amdgpu` driver)
+
+DRM (Direct Rendering Manager) snapshots generated with `drm_info -j | curl -d @- https://drmdb.emersion.fr/submit`:
+
+* Snapshot [#e8f8076f1f1b](https://drmdb.emersion.fr/snapshots/e8f8076f1f1b) (with `amdgpu` driver)

 ## Additional resources

 * Arch linux wiki: [MacBookPro11,x](https://wiki.archlinux.org/index.php/MacBookPro11,x)
 * Kernel patches: [MacBookPro11,x](https://bugzilla.kernel.org/buglist.cgi?quicksearch=macbookpro11)
+
+For more context about experimental `amdgpu` support, see:
+
+* [Enabling AMDGPU by default for SI & CIK (November 2021)](https://gitlab.freedesktop.org/drm/amd/-/issues/1776)
+* [Enabling AMDGPU by default for SI & CIK (August 2020))](https://lists.freedesktop.org/archives/amd-gfx/2020-August/052243.html)
+* [Feature support matrix](https://wiki.gentoo.org/wiki/AMDGPU#Feature_support)
--- a/apple/macbook-pro/11-5/default.nix
+++ b/apple/macbook-pro/11-5/default.nix
@ -1,27 +1,23 @@
-{ lib, config, pkgs, ... }:
+{ lib, config, ... }:

 let

-  kernelPackages = config.boot.kernelPackages;
+  inherit (config.boot) kernelPackages;

 in

 {
  imports = [
    ../.
-    ../../../common/pc/laptop/ssd
-    <nixpkgs/nixos/modules/hardware/network/broadcom-43xx.nix>
+    ../../../common/pc/ssd
  ];

-  # Apparently this is currently only supported by ati_unfree drivers, not ati
-  hardware.opengl.driSupport32Bit = false;
-
-  services.xserver.videoDrivers = [ "ati" ];
+  # Enable broadcom-43xx firmware
+  hardware.enableRedistributableFirmware = lib.mkDefault true;

  services.udev.extraRules =
    # Disable XHC1 wakeup signal to avoid resume getting triggered some time
    # after suspend. Reboot required for this to take effect.
-    lib.optionalString
-      (lib.versionAtLeast kernelPackages.kernel.version "3.13")
+    lib.optionalString (lib.versionAtLeast kernelPackages.kernel.version "3.13")
      ''SUBSYSTEM=="pci", KERNEL=="0000:00:14.0", ATTR{power/wakeup}="disabled"'';
 }
--- a/apple/macbook-pro/12-1/README.md
+++ b/apple/macbook-pro/12-1/README.md
@ -9,7 +9,6 @@ This means it might be required to restart your wifi deamon i.e. wpa_supplicant:
 powerManagement.powerUpCommands = ''
  ${pkgs.systemd}/bin/systemctl restart wpa_supplicant.service
 '';
-};
 ```

 You can apply this to your network management software of choice.
--- a/apple/macbook-pro/12-1/default.nix
+++ b/apple/macbook-pro/12-1/default.nix
@ -1,9 +1,14 @@
-{ lib, pkgs, modulesPath, ... }:
+{
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:

 {
  imports = [
    ../.
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
    "${modulesPath}/hardware/network/broadcom-43xx.nix"
  ];

@ -16,7 +21,10 @@
    # https://bugzilla.kernel.org/show_bug.cgi?id=101681#c116.
    # Also brcmfmac could randomly crash on resume from sleep.
    powerUpCommands = lib.mkBefore "${pkgs.kmod}/bin/modprobe brcmfmac";
-    powerDownCommands = lib.mkBefore "${pkgs.kmod}/bin/rmmod brcmfmac";
+    powerDownCommands = lib.mkBefore ''
+      ${pkgs.kmod}/bin/rmmod -f -v brcmfmac_wcc 2>/dev/null || true
+      ${pkgs.kmod}/bin/rmmod brcmfmac
+    '';
  };

  # USB subsystem wakes up MBP right after suspend unless we disable it.
--- a/apple/macbook-pro/14-1/README.md
+++ b/apple/macbook-pro/14-1/README.md
@ -0,0 +1,26 @@
+# MacBook Pro 14,1, NixOS 24.05 (2024)
+
+## Audio
+ - [ ] broken until https://github.com/NixOS/nixpkgs/pull/322968 lands in master
+
+## Bluetooth
+ - [ ] broken lands https://github.com/NixOS/nixpkgs/pull/322964 in master
+
+## Touchpad 
+ - [x] Working, including 'disable while typing' usable quirk
+
+## Thunderbolt
+ - [x] Working
+
+## NVME
+ - [x] Working, older NVME / Controller may need workaround for resume
+
+## Suspend/Resume
+ - [ ] Thunderbolt, WIFI, NVME may still need reboot (sometimes).
+
+## Wifi
+ - [x] Working (2,4Ghz & 5Ghz supported), WEP3 broken -> brcm fw blob (2015) 
+
+## Resources
+- https://github.com/Dunedan/mbp-2016-linux?tab=readme-ov-file
+- https://gist.github.com/roadrunner2/1289542a748d9a104e7baec6a92f9cd7
--- a/apple/macbook-pro/14-1/default.nix
+++ b/apple/macbook-pro/14-1/default.nix
@ -0,0 +1,69 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  imports = [
+    ../.
+    ../../../common/cpu/intel/kaby-lake
+    ../../../common/hidpi.nix
+    ../../../common/pc/ssd
+  ];
+
+  # Make the keyboard work in stage1, enable iommu
+  # https://www.kernelconfig.io/config_keyboard_applespi
+
+  boot = {
+    initrd.kernelModules = [
+      "applespi"
+      "spi_pxa2xx_platform"
+      "intel_lpss_pci"
+      "applesmc"
+    ];
+    kernelParams = [ "intel_iommu=on" ];
+    kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.0") pkgs.linuxPackages_latest;
+  };
+
+  # Touchpad quirks to make "disable-while-typing" actually work
+  services.libinput.enable = true;
+  environment.etc."libinput/local-overrides.quirks".text = ''
+    [MacBook(Pro) SPI Touchpads]
+    MatchName=*Apple SPI Touchpad*
+    ModelAppleTouchpad=1
+    AttrTouchSizeRange=200:150
+    AttrPalmSizeThreshold=1100
+
+    [MacBook(Pro) SPI Keyboards]
+    MatchName=*Apple SPI Keyboard*
+    AttrKeyboardIntegration=internal
+
+    [MacBookPro Touchbar]
+    MatchBus=usb
+    MatchVendor=0x05AC
+    MatchProduct=0x8600
+    AttrKeyboardIntegration=internal
+  '';
+
+  # Wifi, CPU Microcode FW updates
+  networking.enableB43Firmware = lib.mkDefault true;
+  hardware = {
+    enableRedistributableFirmware = lib.mkDefault true;
+    cpu.intel.updateMicrocode = lib.mkDefault true;
+  };
+
+  # [Enable only if needed!]
+  # Disable d3cold on older NVME controller, only if needed
+  # https://github.com/Dunedan/mbp-2016-linux
+  #
+  #systemd.services.disable-nvme-d3cold = {
+  #  description = "Disables d3cold on the NVME controller";
+  #  before      = [ "suspend.target" ];
+  #  path        = [ pkgs.bash pkgs.coreutils ];
+  #  serviceConfig.Type = "oneshot";
+  #  serviceConfig.ExecStart = "${./disable-nvme-d3cold.sh}";
+  #  serviceConfig.TimeoutSec = 0;
+  #  wantedBy = [ "multi-user.target" "suspend.target" ];
+  #};
+}
--- a/apple/macbook-pro/14-1/disable-nvme-d3cold.sh
+++ b/apple/macbook-pro/14-1/disable-nvme-d3cold.sh
@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+driver_path=/sys/bus/pci/devices/0000:01:00.0
+
+if [[ ! -e "$driver_path" ]]; then
+    echo "$driver_path does not exist, exiting..."
+    exit 1
+fi
+
+driver=$(basename $(readlink "$driver_path/driver"))
+
+if [[ "$driver" -ne "nvme" ]]; then
+    echo "$driver_path is not an NVME device, got $driver, exiting..."
+    exit 1
+fi
+
+echo 0 > "$driver_path/d3cold_allowed"
+
--- a/apple/macbook-pro/8-1/README.md
+++ b/apple/macbook-pro/8-1/README.md
@ -0,0 +1,23 @@
+# MacBook Pro 8,1
+
+## Enable unfree packages in your nix config for b43-firmware (wifi driver) to work
+
+### For b43-firmware only (Ideal)
+
+```nix
+{lib, ...}:
+
+{
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    "b43-firmware"
+  ];
+}
+```
+
+### For all packages
+
+```nix
+{
+  nixpkgs.config.allowUnfree = true;
+}
+```
--- a/apple/macbook-pro/8-1/default.nix
+++ b/apple/macbook-pro/8-1/default.nix
@ -0,0 +1,16 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [
+    ../.
+    ../../../common/cpu/intel/sandy-bridge
+    ../../../common/pc/ssd
+  ];
+
+  networking.enableB43Firmware = lib.mkDefault true;
+}
--- a/apple/macmini/4/default.nix
+++ b/apple/macmini/4/default.nix
@ -0,0 +1,30 @@
+{
+  lib,
+  ...
+}:
+let
+  inherit (lib) mkDefault;
+in
+{
+  imports = [
+    ../.
+    ../../../common/gpu/24.05-compat.nix
+  ];
+
+  services.xserver.videoDrivers = mkDefault [ "nvidiaLegacy340" ];
+
+  hardware = {
+    graphics = {
+      enable = mkDefault true;
+      enable32Bit = mkDefault true;
+    };
+
+    nvidia = {
+      modesetting.enable = mkDefault true;
+      powerManagement.enable = mkDefault false;
+      powerManagement.finegrained = mkDefault false;
+      open = mkDefault false;
+      nvidiaSettings = mkDefault true;
+    };
+  };
+}
--- a/apple/macmini/default.nix
+++ b/apple/macmini/default.nix
@ -0,0 +1,6 @@
+{
+  imports = [
+    ../.
+    ../../common/cpu/intel
+  ];
+}
--- a/apple/t2/README.md
+++ b/apple/t2/README.md
@ -0,0 +1,12 @@
+# NixOS on T2 Macs
+
+This is the `nixos-hardware` module of the [T2 Linux Project](https://t2linux.org).
+
+Overall, most features (WiFi, bluetooth, audio, touchbar, ...) of Macs are supported, [see this page](https://wiki.t2linux.org/state/) for a detailed list of things that work and things that don't/partially work.
+
+Following [this guide](https://wiki.t2linux.org/distributions/nixos/installation/) is the recommended way to install, as it incudes the extra things you have to do on a T2 Mac.
+
+You can consult the [wiki](https://wiki.t2linux.org/) for information specific to T2 Macs.
+
+> [!warning]
+> Always ensure compatibility and make backups of your data before making any system changes.
--- a/apple/t2/default.nix
+++ b/apple/t2/default.nix
@ -0,0 +1,133 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  inherit (lib) types;
+  nixosVersion = lib.versions.majorMinor lib.version;
+
+  audioFiles = pkgs.fetchFromGitHub {
+    owner = "kekrby";
+    repo = "t2-better-audio";
+    rev = "e46839a28963e2f7d364020518b9dac98236bcae";
+    hash = "sha256-x7K0qa++P1e1vuCGxnsFxL1d9+nwMtZUJ6Kd9e27TFs=";
+  };
+
+  audioFilesUdevRules = pkgs.runCommand "audio-files-udev-rules" { } ''
+    mkdir -p $out/lib/udev/rules.d
+    cp ${audioFiles}/files/*.rules $out/lib/udev/rules.d
+    substituteInPlace $out/lib/udev/rules.d/*.rules --replace "/usr/bin/sed" "${pkgs.gnused}/bin/sed"
+  '';
+
+  overrideAudioFiles =
+    package: pluginsPath:
+    package.overrideAttrs (
+      _new: old: {
+        preConfigurePhases = old.preConfigurePhases or [ ] ++ [ "postPatchPhase" ];
+        postPatchPhase = ''
+          cp -r ${audioFiles}/files/{profile-sets,paths} ${pluginsPath}/alsa/mixer/
+        '';
+      }
+    );
+
+  pipewirePackage = overrideAudioFiles pkgs.pipewire "spa/plugins/";
+
+  t2Cfg = config.hardware.apple-t2;
+
+in
+{
+  imports = [
+    (lib.mkRemovedOptionModule [ "hardware" "apple-t2" "enableTinyDfr" ] ''
+      The hardware.apple-t2.enableTinyDfr option was deprecated and removed since upstream Nixpkgs now has an identical module.
+      Please migrate to hardware.apple.touchBar.
+    '')
+
+    (lib.mkRemovedOptionModule [ "hardware" "apple-t2" "enableAppleSetOsLoader" ] ''
+      The hardware.apple-t2.enableAppleSetOsLoader option was removed as the apple_set_os functionality was integrated into the kernel.
+      Please uninstall the loader by replacing /esp/EFI/BOOTX64.EFI with /esp/EFI/BOOTX64_original.EFI, where esp is the EFI partition mount point.
+
+      If you have a device with an AMD dGPU and would like to keep using the iGPU, please set hardware.apple-t2.enableIGPU to true.
+    '')
+  ];
+  options.hardware.apple-t2 = {
+    enableIGPU = lib.mkEnableOption "the usage of the iGPU on specific Apple devices with an AMD dGPU";
+    kernelChannel = lib.mkOption {
+      type = types.enum [
+        "stable"
+        "latest"
+      ];
+      default = "stable";
+      example = "latest";
+      description = "The kernel release stream to use.";
+    };
+    firmware = {
+      enable = lib.mkEnableOption "automatic and declarative Wi-Fi and Bluetooth firmware configuration";
+      version = lib.mkOption {
+        type = types.enum [
+          "monterey"
+          "ventura"
+          "sonoma"
+        ];
+        default = "sonoma";
+        example = "ventura";
+        description = "The macOS version to use.";
+      };
+    };
+  };
+
+  config = lib.mkMerge [
+    {
+      # Specialized kernel for keyboard, touchpad, touchbar and audio.
+      boot.kernelPackages = pkgs.linuxPackagesFor (
+        pkgs.callPackage (
+          if t2Cfg.kernelChannel == "stable" then ./pkgs/linux-t2 else ./pkgs/linux-t2/latest.nix
+        ) { }
+      );
+      boot.initrd.kernelModules = [ "apple-bce" ];
+
+      services.udev.packages = [ audioFilesUdevRules ];
+
+      # For audio
+      boot.kernelParams = [
+        "pcie_ports=compat"
+        "intel_iommu=on"
+        "iommu=pt"
+      ];
+
+      services.pipewire.package = pipewirePackage;
+      services.pipewire.wireplumber.package = pkgs.wireplumber.override {
+        pipewire = pipewirePackage;
+      };
+
+      # Make sure post-resume.service exists
+      powerManagement.enable = true;
+    }
+
+    (
+      if lib.versionAtLeast nixosVersion "25.05" then
+        {
+          services.pulseaudio.package = overrideAudioFiles pkgs.pulseaudio "src/modules/";
+        }
+      else
+        {
+          hardware.pulseaudio.package = overrideAudioFiles pkgs.pulseaudio "src/modules/";
+        }
+    )
+
+    (lib.mkIf t2Cfg.enableIGPU {
+      # Enable the iGPU by default if present
+      environment.etc."modprobe.d/apple-gmux.conf".text = ''
+        options apple-gmux force_igd=y
+      '';
+    })
+    (lib.mkIf t2Cfg.firmware.enable {
+      # Configure Wi-Fi and Bluetooth firmware
+      hardware.firmware = [
+        (pkgs.callPackage ./pkgs/brcm-firmware { version = t2Cfg.firmware.version; })
+      ];
+    })
+  ];
+}
--- a/apple/t2/pkgs/brcm-firmware/default.nix
+++ b/apple/t2/pkgs/brcm-firmware/default.nix
@ -0,0 +1,89 @@
+{
+  lib,
+  stdenvNoCC,
+  callPackage,
+  vmTools,
+  util-linux,
+  linux,
+  kmod,
+  version,
+}:
+
+let
+  get-firmware = callPackage ./get-firmware.nix { };
+  fetchmacos = callPackage ./fetchmacos.nix { };
+
+  # See https://github.com/kholia/OSX-KVM/blob/master/fetch-macOS-v2.py#L534-L546.
+  # Versions before macOS Monterey don't have Bluetooth firmware.
+  # Whereas macOS Sequoia doesn't have firmware for MacBook Air 2018 and 2019.
+  boards = {
+    monterey = {
+      boardId = "Mac-B809C3757DA9BB8D";
+      mlb = "00000000000000000";
+      osType = "latest";
+      hash = "sha256-My8FLnqHZn+THfGPIhTSApW/kIWM0ZZhjBxWujhhWPM=";
+    };
+    ventura = {
+      boardId = "Mac-4B682C642B45593E";
+      mlb = "00000000000000000";
+      osType = "latest";
+      hash = "sha256-Qy9Whu8pqHo+m6wHnCIqURAR53LYQKc0r87g9eHgnS4=";
+    };
+    sonoma = {
+      boardId = "Mac-827FAC58A8FDFA22";
+      mlb = "00000000000000000";
+      osType = "default";
+      hash = "sha256-phlpwNTYhugqX2KGljqxpbfGtCFDgggQPzB7U29XSmM=";
+    };
+  };
+in
+
+vmTools.runInLinuxVM (
+  stdenvNoCC.mkDerivation {
+    pname = "brcm-firmware";
+    inherit version;
+
+    src = fetchmacos {
+      name = version;
+      inherit (boards.${version})
+        boardId
+        mlb
+        osType
+        hash
+        ;
+    };
+    dontUnpack = true;
+
+    nativeBuildInputs = [
+      util-linux
+      get-firmware
+    ];
+    buildPhase = ''
+      ln -s ${linux}/lib /lib
+      ${kmod}/bin/modprobe loop
+      ${kmod}/bin/modprobe hfsplus
+
+      imgdir=$(mktemp -d)
+      loopdev=$(losetup -f | cut -d "/" -f 3)
+      losetup -P $loopdev $src
+      loopdev_partition=/dev/$(lsblk -o KNAME,TYPE,MOUNTPOINT -n | grep $loopdev | tail -1 | awk '{print $1}')
+      mount $loopdev_partition $imgdir
+
+      get-bluetooth $imgdir/usr/share/firmware/bluetooth bluetooth/
+      get-wifi $imgdir/usr/share/firmware/wifi wifi/
+    '';
+
+    installPhase = ''
+      mkdir -p $out/lib/firmware/brcm
+      cp bluetooth/brcm/* $out/lib/firmware/brcm/
+      cp wifi/brcm/* $out/lib/firmware/brcm/
+    '';
+
+    meta = with lib; {
+      description = "Wi-Fi and Bluetooth firmware for T2 Macs";
+      license = licenses.unfree;
+      maintainers = with maintainers; [ mkorje ];
+      platforms = platforms.linux;
+    };
+  }
+)
--- a/apple/t2/pkgs/brcm-firmware/fetchmacos.nix
+++ b/apple/t2/pkgs/brcm-firmware/fetchmacos.nix
@ -0,0 +1,42 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  callPackage,
+  dmg2img,
+}:
+
+let
+  macrecovery = callPackage ./macrecovery.nix { };
+in
+
+{
+  name,
+  boardId,
+  mlb,
+  osType,
+  hash,
+}:
+
+stdenvNoCC.mkDerivation {
+  name = name;
+
+  dontUnpack = true;
+
+  nativeBuildInputs = [
+    macrecovery
+    dmg2img
+  ];
+  buildPhase = ''
+    macrecovery download -o . -b ${boardId} -m ${mlb} -os ${osType}
+    dmg2img -s BaseSystem.dmg fw.img
+  '';
+
+  installPhase = ''
+    cp fw.img $out
+  '';
+
+  outputHashMode = "recursive";
+  outputHashAlgo = "sha256";
+  outputHash = hash;
+}
--- a/apple/t2/pkgs/brcm-firmware/get-firmware-standalone.patch
+++ b/apple/t2/pkgs/brcm-firmware/get-firmware-standalone.patch
@ -0,0 +1,133 @@
+diff --git a/asahi_firmware/bluetooth.py b/asahi_firmware/bluetooth.py
+index 0934225..3eaa442 100644
+--- a/asahi_firmware/bluetooth.py
+++ b/asahi_firmware/bluetooth.py
+@@ -1,8 +1,25 @@
+#!/usr/bin/env python3
+ # SPDX-License-Identifier: MIT
+ import logging, os, os.path, re, sys
+ from collections import namedtuple, defaultdict
+from hashlib import sha256
+ 
+-from .core import FWFile
+class FWFile(object):
+    def __init__(self, name, data):
+        self.name = name
+        self.data = data
+        self.sha = sha256(data).hexdigest()
+
+    def __repr__(self):
+        return f"FWFile({self.name!r}, <{self.sha[:16]}>)"
+
+    def __eq__(self, other):
+        if other is None:
+            return False
+        return self.sha == other.sha
+
+    def __hash__(self):
+        return hash(self.sha)
+ 
+ log = logging.getLogger("asahi_firmware.bluetooth")
+ 
+@@ -127,16 +144,16 @@ class BluetoothFWCollection(object):
+ 
+ if __name__ == "__main__":
+     col = BluetoothFWCollection(sys.argv[1])
+-
+-    if len(sys.argv) > 2:
+-        from . import FWPackage
+-
+-        pkg = FWPackage(sys.argv[2])
+-        pkg.add_files(sorted(col.files()))
+-        pkg.close()
+-
+-        for i in pkg.manifest:
+-            print(i)
+-    else:
+-        for name, fwfile in col.files():
+-            print(name, f"{fwfile.name} ({len(fwfile.data)} bytes)")
+    
+    dir = os.path.join(sys.argv[2], "brcm")
+    os.makedirs(dir)
+
+    hashes = {}
+    for name, data in sorted(col.files()):
+        path = os.path.join(sys.argv[2], name)
+        if data.sha in hashes:
+            os.link(hashes[data.sha], path)
+        else:
+            with open(path, "wb") as f:
+                f.write(data.data)
+            hashes[data.sha] = path
+diff --git a/asahi_firmware/wifi.py b/asahi_firmware/wifi.py
+index 346965c..261aa32 100644
+--- a/asahi_firmware/wifi.py
+++ b/asahi_firmware/wifi.py
+@@ -1,6 +1,24 @@
+#!/usr/bin/env python3
+ # SPDX-License-Identifier: MIT
+ import sys, os, os.path, pprint, statistics, logging
+-from .core import FWFile
+from hashlib import sha256
+
+class FWFile(object):
+    def __init__(self, name, data):
+        self.name = name
+        self.data = data
+        self.sha = sha256(data).hexdigest()
+
+    def __repr__(self):
+        return f"FWFile({self.name!r}, <{self.sha[:16]}>)"
+
+    def __eq__(self, other):
+        if other is None:
+            return False
+        return self.sha == other.sha
+
+    def __hash__(self):
+        return hash(self.sha)
+ 
+ log = logging.getLogger("asahi_firmware.wifi")
+ 
+@@ -40,7 +58,9 @@ class WiFiFWCollection(object):
+         self.prune()
+ 
+     def load(self, source_path):
+        included_folders = ["C-4355__s-C1", "C-4364__s-B2", "C-4364__s-B3", "C-4377__s-B3"]
+         for dirpath, dirnames, filenames in os.walk(source_path):
+            dirnames[:] = [d for d in dirnames if d in included_folders]
+             if "perf" in dirnames:
+                 dirnames.remove("perf")
+             if "assert" in dirnames:
+@@ -141,18 +161,16 @@ class WiFiFWCollection(object):
+ 
+ if __name__ == "__main__":
+     col = WiFiFWCollection(sys.argv[1])
+-    if len(sys.argv) > 2:
+-        from .core import FWPackage
+-
+-        pkg = FWPackage(sys.argv[2])
+-        pkg.add_files(sorted(col.files()))
+-        pkg.close()
+-
+-        for i in pkg.manifest:
+-            print(i)
+-    else:
+-        for name, fwfile in col.files():
+-            if isinstance(fwfile, str):
+-                print(name, "->", fwfile)
+-            else:
+-                print(name, f"({len(fwfile.data)} bytes)")
+
+    dir = os.path.join(sys.argv[2], "brcm")
+    os.makedirs(dir)
+
+    hashes = {}
+    for name, data in sorted(col.files()):
+        path = os.path.join(sys.argv[2], name)
+        if data.sha in hashes:
+            os.link(hashes[data.sha], path)
+        else:
+            with open(path, "wb") as f:
+                f.write(data.data)
+            hashes[data.sha] = path
--- a/apple/t2/pkgs/brcm-firmware/get-firmware.nix
+++ b/apple/t2/pkgs/brcm-firmware/get-firmware.nix
@ -0,0 +1,35 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  python3,
+}:
+
+stdenvNoCC.mkDerivation {
+  name = "get-firmware";
+
+  src = fetchFromGitHub {
+    owner = "AsahiLinux";
+    repo = "asahi-installer";
+    rev = "v0.7.9";
+    hash = "sha256-vbhepoZ52k5tW2Gd7tfQTZ5CLqzhV7dUcVh6+AYwECk=";
+  };
+
+  patches = [ ./get-firmware-standalone.patch ];
+
+  buildInputs = [ python3 ];
+
+  installPhase = ''
+    cd asahi_firmware
+    install -Dm755 bluetooth.py $out/bin/get-bluetooth
+    install -Dm755 wifi.py $out/bin/get-wifi
+  '';
+
+  meta = with lib; {
+    description = "Patched Asahi Linux Installer scripts to get brcm firmware";
+    homepage = "https://github.com/AsahiLinux/asahi-installer";
+    license = licenses.mit;
+    maintainers = with maintainers; [ mkorje ];
+    platforms = platforms.all;
+  };
+}
--- a/apple/t2/pkgs/brcm-firmware/macrecovery.nix
+++ b/apple/t2/pkgs/brcm-firmware/macrecovery.nix
@ -0,0 +1,36 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  python3,
+}:
+
+stdenvNoCC.mkDerivation {
+  name = "macrecovery";
+
+  src = fetchFromGitHub {
+    owner = "acidanthera";
+    repo = "OpenCorePkg";
+    rev = "1.0.4";
+    hash = "sha256-5Eypza9teSJSulHaK7Sxh562cTKedXKn3y+Z3+fC6sM=";
+  };
+
+  buildInputs = [ python3 ];
+
+  installPhase = ''
+    cd Utilities/macrecovery
+    install -Dm755 macrecovery.py $out/opt/macrecovery
+    cp boards.json $out/opt/boards.json
+    mkdir $out/bin
+    ln -s $out/opt/macrecovery $out/bin/macrecovery
+  '';
+
+  meta = with lib; {
+    description = "A tool that helps to automate recovery interaction";
+    homepage = "https://github.com/acidanthera/OpenCorePkg";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ mkorje ];
+    mainProgram = "macrecovery";
+    platforms = platforms.all;
+  };
+}
--- a/apple/t2/pkgs/linux-t2/default.nix
+++ b/apple/t2/pkgs/linux-t2/default.nix
@ -0,0 +1,6 @@
+{ callPackage, linux_6_12, ... }@args:
+
+callPackage ./generic.nix args {
+  kernel = linux_6_12;
+  patchesFile = ./stable.json;
+}
--- a/apple/t2/pkgs/linux-t2/generic.nix
+++ b/apple/t2/pkgs/linux-t2/generic.nix
@ -0,0 +1,60 @@
+{
+  lib,
+  fetchurl, # fetchpatch does unnecessary normalization
+  ...
+}@args:
+
+{
+  kernel,
+  patchesFile,
+}:
+let
+  inherit (builtins) readFile fromJSON;
+
+  patchset = fromJSON (readFile patchesFile);
+  t2-patches = map (
+    { name, hash }:
+    {
+      inherit name;
+      patch = fetchurl {
+        inherit name hash;
+        url = patchset.base_url + name;
+      };
+    }
+  ) patchset.patches;
+in
+kernel.override (
+  args
+  // {
+    pname = "linux-t2";
+
+    structuredExtraConfig = with lib.kernel; {
+      APPLE_BCE = module;
+      APPLE_GMUX = module;
+      APFS_FS = module;
+      BRCMFMAC = module;
+      BT_BCM = module;
+      BT_HCIBCM4377 = module;
+      BT_HCIUART_BCM = yes;
+      BT_HCIUART = module;
+      HID_APPLETB_BL = module;
+      HID_APPLETB_KBD = module;
+      HID_APPLE = module;
+      HID_MAGICMOUSE = module;
+      DRM_APPLETBDRM = module;
+      HID_SENSOR_ALS = module;
+      SND_PCM = module;
+      STAGING = yes;
+    };
+
+    kernelPatches = t2-patches ++ (args.kernelPatches or [ ]);
+
+    argsOverride.extraMeta = {
+      description = "The Linux kernel (with patches from the T2 Linux project)";
+
+      # take responsibility for the downstream kernel
+      maintainers = with lib.maintainers; [ soopyc ];
+    };
+  }
+  // (args.argsOverride or { })
+)
--- a/apple/t2/pkgs/linux-t2/latest.json
+++ b/apple/t2/pkgs/linux-t2/latest.json
@ -0,0 +1,121 @@
+{
+  "base_url": "https://raw.githubusercontent.com/t2linux/linux-t2-patches/6b41c3fd65913e0fa3592ad16ff4a3a5b01efc7a/",
+  "patches": [
+    {
+      "name": "1001-Add-apple-bce-driver.patch",
+      "hash": "sha256-00K3LmId2Ag6s5K76p7mB2a0oEXp815yRd+U5wxWPMc="
+    },
+    {
+      "name": "1002-Put-apple-bce-in-drivers-staging.patch",
+      "hash": "sha256-wkveNo1qwAwXWDGTFed4ZDbuBnJbwKgWLmTHK9qq0oM="
+    },
+    {
+      "name": "1003-Fix-sparse-errors.patch",
+      "hash": "sha256-nuCOPWa4Hp+HCCBe6Y++M4g1k4plOWzy2hqHXlJbp9g="
+    },
+    {
+      "name": "1004-Fix-freezing-on-turning-off-camera.patch",
+      "hash": "sha256-rFrSUhiNXgQbfgKjryJktYxYcchXE1PI49Q1gW001+0="
+    },
+    {
+      "name": "1007-HID-multitouch-Get-the-contact-ID-from-HID_DG_TRANSD.patch",
+      "hash": "sha256-JF5PjByo4S1Rd/B5luAzOXDv+iakCnJfmujIQuUiT1A="
+    },
+    {
+      "name": "1008-HID-multitouch-support-getting-the-tip-state-from-HI.patch",
+      "hash": "sha256-m/NAKoHRC/HwxG5fFZxFl6DtY4Xv8kPBWvdKdtadrrk="
+    },
+    {
+      "name": "1009-HID-multitouch-take-cls-maxcontacts-into-account-for.patch",
+      "hash": "sha256-h6jk9yw/4txd8PATpMxB9mIzik9+X1zP6p4K35AqdXw="
+    },
+    {
+      "name": "1010-HID-multitouch-specify-that-Apple-Touch-Bar-is-direc.patch",
+      "hash": "sha256-5PbLynVnQqlJKPTWhcmwXCkYDEopLBQWnxWvZUt0EN4="
+    },
+    {
+      "name": "1011-HID-multitouch-add-device-ID-for-Apple-Touch-Bar.patch",
+      "hash": "sha256-dIzEOj89D2rIEc2/mjq3TkIfI3ZHzu0VRDQQOzp+Snc="
+    },
+    {
+      "name": "2008-i915-4-lane-quirk-for-mbp15-1.patch",
+      "hash": "sha256-PjMVt4u505PXnKFpojov0Uwhj0KxZas1E4NYJGI6lQ4="
+    },
+    {
+      "name": "2009-apple-gmux-allow-switching-to-igpu-at-probe.patch",
+      "hash": "sha256-aE+MEu/jRrZBa+3Q03quOHUsIseRED6A7N/K9kEVtbM="
+    },
+    {
+      "name": "3001-applesmc-convert-static-structures-to-drvdata.patch",
+      "hash": "sha256-7KGC0pCos351wKNhwJI/Qoc7w+orOPpiTkdCN50G8nI="
+    },
+    {
+      "name": "3002-applesmc-make-io-port-base-addr-dynamic.patch",
+      "hash": "sha256-1fnmMP/3WSy2JqjdCvxu8tWoshCPr8eiG6ttYK/N9WA="
+    },
+    {
+      "name": "3003-applesmc-switch-to-acpi_device-from-platform.patch",
+      "hash": "sha256-3S6BzyoPLoirfyAu4yDyE9aYjUYr/7etmAvN3uKSDLE="
+    },
+    {
+      "name": "3004-applesmc-key-interface-wrappers.patch",
+      "hash": "sha256-9Bq28WcqiOnef0br6bATOudr1ViSpajQs7fv7o8Tg0I="
+    },
+    {
+      "name": "3005-applesmc-basic-mmio-interface-implementation.patch",
+      "hash": "sha256-Hh9DymQ+Y74oSs1zv9F0lTU3jfAenKTM+cmFH9tmN9Q="
+    },
+    {
+      "name": "3006-applesmc-fan-support-on-T2-Macs.patch",
+      "hash": "sha256-D5IQHE8QFo49mnUawSau7xUsMFkHKayyhnHW4hi+fWE="
+    },
+    {
+      "name": "3007-applesmc-Add-iMacPro-to-applesmc_whitelist.patch",
+      "hash": "sha256-rLDuyQYzAaWuu/u6nRRVvGdwyfpLvkGPu1OoD8KS0os="
+    },
+    {
+      "name": "3008-applesmc-make-applesmc_remove-void.patch",
+      "hash": "sha256-j2Rj1PW/bFEYh9IkGkkG9b+G27IAPCInyd828z4WE1s="
+    },
+    {
+      "name": "3009-applesmc-battery-charge-limiter.patch",
+      "hash": "sha256-skYKmLsJ6O42/wINLccZWoKS0XhVlC1Nfxi1Ekloxns="
+    },
+    {
+      "name": "4001-asahi-trackpad.patch",
+      "hash": "sha256-nOpQ3t+QQXco6p7C03fM5EZ3ZfnzwC6UCFwHQd1EnGE="
+    },
+    {
+      "name": "4002-HID-quirks-remove-T2-devices-from-hid_mouse_ignore_l.patch",
+      "hash": "sha256-0PMCE3IWHekir5YV1BD6Jakc7dOV6Fj2HfIGWZnXZV0="
+    },
+    {
+      "name": "4003-HID-apple-ignore-the-trackpad-on-T2-Macs.patch",
+      "hash": "sha256-JTeYtaBqMyTu5IdGb8x7wbP9ZE1rXT4lpEjudR1ySFI="
+    },
+    {
+      "name": "4004-HID-magicmouse-Add-support-for-trackpads-found-on-T2.patch",
+      "hash": "sha256-dNrpDlIE9SaQUOntVQHMOyj7T/dsuRemN56yskKWue0="
+    },
+    {
+      "name": "4005-HID-apple-Add-necessary-IDs-and-support-for-replacem.patch",
+      "hash": "sha256-SRKESCbpxSYm7U0VyCmvkmT/er6/GEHhwo8tgJDO6mQ="
+    },
+    {
+      "name": "4006-HID-magicmouse-Add-MacBookPro15-1-replacement-trackp.patch",
+      "hash": "sha256-mMqHhxig+Z9eVPaa1qfcNVCRX16B6/KuEd1KnSZMLLk="
+    },
+    {
+      "name": "7001-drm-i915-fbdev-Discard-BIOS-framebuffers-exceeding-h.patch",
+      "hash": "sha256-/EKN7JsAxcpAgfJFtPp2NLYaGqQ0kl8wjJEXifSzJpY="
+    },
+    {
+      "name": "8001-Add-APFS-driver.patch",
+      "hash": "sha256-uR5hg75SFFWzfrKyU5UnzPL4U7LkjqGs44rkxM7ur8o="
+    },
+    {
+      "name": "8002-Necessary-modifications-to-build-APFS-with-the-kerne.patch",
+      "hash": "sha256-n1SH5vC//LRJdWOavH9/BHqBTjkUj5f+dFGitSeHksw="
+    }
+  ]
+}
--- a/apple/t2/pkgs/linux-t2/latest.nix
+++ b/apple/t2/pkgs/linux-t2/latest.nix
@ -0,0 +1,6 @@
+{ callPackage, linux_6_16, ... }@args:
+
+callPackage ./generic.nix args {
+  kernel = linux_6_16;
+  patchesFile = ./latest.json;
+}
--- a/apple/t2/pkgs/linux-t2/stable.json
+++ b/apple/t2/pkgs/linux-t2/stable.json
@ -0,0 +1,137 @@
+{
+  "base_url": "https://raw.githubusercontent.com/t2linux/linux-t2-patches/5eaf1261d069bbc67aba7fe2737a5fe981e05a9e/",
+  "patches": [
+    {
+      "name": "1001-Add-apple-bce-driver.patch",
+      "hash": "sha256-e3RPvWPj2QASGOS4kieO8YFekrXsBCJtfF82OPlOn2E="
+    },
+    {
+      "name": "1002-Put-apple-bce-in-drivers-staging.patch",
+      "hash": "sha256-DXj4CmE7TKMGrAhQDOR5RVw9YHmyQMiXZsmxYfkKAEA="
+    },
+    {
+      "name": "1003-Fix-sparse-errors.patch",
+      "hash": "sha256-nuCOPWa4Hp+HCCBe6Y++M4g1k4plOWzy2hqHXlJbp9g="
+    },
+    {
+      "name": "1004-Fix-freezing-on-turning-off-camera.patch",
+      "hash": "sha256-rFrSUhiNXgQbfgKjryJktYxYcchXE1PI49Q1gW001+0="
+    },
+    {
+      "name": "1005-HID-hid-appletb-bl-add-driver-for-the-backlight-of-A.patch",
+      "hash": "sha256-kEscS1FAyDxLZPOPInYTXFEf4fouBEa4zGctX14hSu8="
+    },
+    {
+      "name": "1006-HID-hid-appletb-kbd-add-driver-for-the-keyboard-mode.patch",
+      "hash": "sha256-eVEuvnoRItaDjwWu41nn9bTkgHgY+1SL/hFAvUR2IlY="
+    },
+    {
+      "name": "1007-HID-multitouch-Get-the-contact-ID-from-HID_DG_TRANSD.patch",
+      "hash": "sha256-JF5PjByo4S1Rd/B5luAzOXDv+iakCnJfmujIQuUiT1A="
+    },
+    {
+      "name": "1008-HID-multitouch-support-getting-the-tip-state-from-HI.patch",
+      "hash": "sha256-m/NAKoHRC/HwxG5fFZxFl6DtY4Xv8kPBWvdKdtadrrk="
+    },
+    {
+      "name": "1009-HID-multitouch-take-cls-maxcontacts-into-account-for.patch",
+      "hash": "sha256-h6jk9yw/4txd8PATpMxB9mIzik9+X1zP6p4K35AqdXw="
+    },
+    {
+      "name": "1010-HID-multitouch-specify-that-Apple-Touch-Bar-is-direc.patch",
+      "hash": "sha256-5PbLynVnQqlJKPTWhcmwXCkYDEopLBQWnxWvZUt0EN4="
+    },
+    {
+      "name": "1011-HID-multitouch-add-device-ID-for-Apple-Touch-Bar.patch",
+      "hash": "sha256-dIzEOj89D2rIEc2/mjq3TkIfI3ZHzu0VRDQQOzp+Snc="
+    },
+    {
+      "name": "1013-lib-vsprintf-Add-support-for-generic-FourCCs-by-exte.patch",
+      "hash": "sha256-h3gxaKtvdm/GSd+AP1sPC9avWHOsceUxTmoua/3rIf4="
+    },
+    {
+      "name": "1015-drm-tiny-add-driver-for-Apple-Touch-Bars-in-x86-Macs.patch",
+      "hash": "sha256-tDjK/VipVQbuNOURW38gssqeRLy3s8I+DVq0+4zGnHs="
+    },
+    {
+      "name": "2008-i915-4-lane-quirk-for-mbp15-1.patch",
+      "hash": "sha256-lZ7MWXZubmAlJCqBmuzueg7agENJbikxP1SE46SmwNw="
+    },
+    {
+      "name": "2009-apple-gmux-allow-switching-to-igpu-at-probe.patch",
+      "hash": "sha256-XKwlyJZjJLQz39mc0/S7sPnRnwrqMsq9OKy+QCO+oho="
+    },
+    {
+      "name": "3001-applesmc-convert-static-structures-to-drvdata.patch",
+      "hash": "sha256-7KGC0pCos351wKNhwJI/Qoc7w+orOPpiTkdCN50G8nI="
+    },
+    {
+      "name": "3002-applesmc-make-io-port-base-addr-dynamic.patch",
+      "hash": "sha256-1fnmMP/3WSy2JqjdCvxu8tWoshCPr8eiG6ttYK/N9WA="
+    },
+    {
+      "name": "3003-applesmc-switch-to-acpi_device-from-platform.patch",
+      "hash": "sha256-3S6BzyoPLoirfyAu4yDyE9aYjUYr/7etmAvN3uKSDLE="
+    },
+    {
+      "name": "3004-applesmc-key-interface-wrappers.patch",
+      "hash": "sha256-9Bq28WcqiOnef0br6bATOudr1ViSpajQs7fv7o8Tg0I="
+    },
+    {
+      "name": "3005-applesmc-basic-mmio-interface-implementation.patch",
+      "hash": "sha256-Hh9DymQ+Y74oSs1zv9F0lTU3jfAenKTM+cmFH9tmN9Q="
+    },
+    {
+      "name": "3006-applesmc-fan-support-on-T2-Macs.patch",
+      "hash": "sha256-D5IQHE8QFo49mnUawSau7xUsMFkHKayyhnHW4hi+fWE="
+    },
+    {
+      "name": "3007-applesmc-Add-iMacPro-to-applesmc_whitelist.patch",
+      "hash": "sha256-rLDuyQYzAaWuu/u6nRRVvGdwyfpLvkGPu1OoD8KS0os="
+    },
+    {
+      "name": "3008-applesmc-make-applesmc_remove-void.patch",
+      "hash": "sha256-j2Rj1PW/bFEYh9IkGkkG9b+G27IAPCInyd828z4WE1s="
+    },
+    {
+      "name": "3009-applesmc-battery-charge-limiter.patch",
+      "hash": "sha256-skYKmLsJ6O42/wINLccZWoKS0XhVlC1Nfxi1Ekloxns="
+    },
+    {
+      "name": "4001-asahi-trackpad.patch",
+      "hash": "sha256-kfAYVovukZLD5ocHQxhoHJSa9c5XAJ1GhH1RlzGkS+k="
+    },
+    {
+      "name": "4002-HID-quirks-remove-T2-devices-from-hid_mouse_ignore_l.patch",
+      "hash": "sha256-0PMCE3IWHekir5YV1BD6Jakc7dOV6Fj2HfIGWZnXZV0="
+    },
+    {
+      "name": "4003-HID-apple-ignore-the-trackpad-on-T2-Macs.patch",
+      "hash": "sha256-JTeYtaBqMyTu5IdGb8x7wbP9ZE1rXT4lpEjudR1ySFI="
+    },
+    {
+      "name": "4004-HID-magicmouse-Add-support-for-trackpads-found-on-T2.patch",
+      "hash": "sha256-HcPX7gY3hnlwM/tY06pbtXnch04AqwHgC596E8ZqGY8="
+    },
+    {
+      "name": "4005-HID-apple-Add-necessary-IDs-and-support-for-replacem.patch",
+      "hash": "sha256-SRKESCbpxSYm7U0VyCmvkmT/er6/GEHhwo8tgJDO6mQ="
+    },
+    {
+      "name": "4006-HID-magicmouse-Add-MacBookPro15-1-replacement-trackp.patch",
+      "hash": "sha256-uAlT/4ADwYyKvbuPQaGwqCjZ2/myruC63etVV6cfFLk="
+    },
+    {
+      "name": "7001-drm-i915-fbdev-Discard-BIOS-framebuffers-exceeding-h.patch",
+      "hash": "sha256-O6RHFxmKZn7aCq1D+r5z2T3jLt0r5+01EABD9rs0E5M="
+    },
+    {
+      "name": "8001-Add-APFS-driver.patch",
+      "hash": "sha256-QpIPsMjWNPOkw6rSKn7rW0Fmx9HUwJaiGy3pZeT5Fd0="
+    },
+    {
+      "name": "8002-Necessary-modifications-to-build-APFS-with-the-kerne.patch",
+      "hash": "sha256-n1SH5vC//LRJdWOavH9/BHqBTjkUj5f+dFGitSeHksw="
+    }
+  ]
+}
--- a/apple/t2/pkgs/linux-t2/update-patches.py
+++ b/apple/t2/pkgs/linux-t2/update-patches.py
@ -0,0 +1,99 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i python -p nix -p "python3.withPackages (p: [p.requests])"
+
+import argparse
+import json
+import re
+import subprocess
+import sys
+from tempfile import NamedTemporaryFile
+from concurrent.futures import ThreadPoolExecutor, as_completed
+
+import requests
+
+API_BASE = "https://api.github.com"
+PATCH_PATTERN = re.compile(r"^\d{4}-.*\.patch$")
+
+parser = argparse.ArgumentParser(
+    description="Update linux-t2 patches from a GitHub repository."
+)
+parser.add_argument("filename", help="the output filename")
+parser.add_argument(
+    "--repository",
+    help="the source github repository",
+    default="t2linux/linux-t2-patches",
+    nargs="?",
+)
+ref_group = parser.add_mutually_exclusive_group()
+ref_group.add_argument(
+    "--reference", help="the git reference for the patches", default=None, nargs="?"
+)
+ref_group.add_argument(
+    "--branch", help="the git branch to fetch", default=None, nargs="?"
+)
+
+
+def get_api(endpoint, *args, **kwargs):
+    kwargs["headers"] = {"X-GitHub-Api-Version": "2022-11-28"}
+    response = requests.get(API_BASE + endpoint, *args, **kwargs)
+    response.raise_for_status()
+    return response.json()
+
+
+def get_sri_hash(data: bytes):
+    with NamedTemporaryFile() as tmpfile:
+        tmpfile.write(data)
+        tmpfile.flush()
+        proc = subprocess.run(
+            ["nix-hash", "--sri", "--flat", "--type", "sha256", tmpfile.name],
+            check=True,
+            capture_output=True,
+        )
+        return proc.stdout.decode("utf8").strip()
+
+def download_task(patch: dict):
+    patch_content = requests.get(patch["download_url"])
+    patch_hash = get_sri_hash(patch_content.content)
+    print(f"{patch['name']}: {patch_hash}")
+    return {"name": patch["name"], "hash": patch_hash}
+
+def main():
+    args = parser.parse_args()
+    reference = args.reference
+    branch = args.branch
+
+    if reference is None:
+        if branch is None:
+            print("Branch and reference not provided, fetching default branch")
+            branch = get_api(f"/repos/{args.repository}")["default_branch"]
+
+        print(f"Reference not provided, fetching from branch {branch}")
+        branch_data = get_api(f"/repos/{args.repository}/branches/{branch}")
+        reference = branch_data["commit"]["sha"]
+
+    print(f"Repository: {args.repository}")
+    print(f" Reference: {reference}")
+
+    base_url = f"https://raw.githubusercontent.com/{args.repository}/{reference}/"
+    contents = get_api(f"/repos/{args.repository}/contents", {"ref": reference})
+    patches = filter(lambda e: PATCH_PATTERN.match(e.get("name")), contents)
+
+    patches_with_hash = []
+    with ThreadPoolExecutor() as executor:
+        futures = {executor.submit(download_task, patch) for patch in patches}
+
+        for future in as_completed(futures):
+            patches_with_hash.append(future.result())
+
+    result = {"base_url": base_url, "patches": sorted(patches_with_hash, key=lambda p: p["name"])}
+
+    with open(args.filename, "w+") as f:
+        json.dump(result, f, indent=2)
+        f.write("\n")  # write final newline
+        print(f"Wrote to {args.filename}")
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
--- a/asus/ally/rc71l/README.md
+++ b/asus/ally/rc71l/README.md
@ -0,0 +1,10 @@
+# [ROG Ally (2023)](https://rog.asus.com/gaming-handhelds/rog-ally/rog-ally-2023/)
+
+## BIOS
+
+The ROG Ally has a troublesome history with different BIOS versions creating different issues.
+At the time of writing, the current BIOS version 330 allows for working audio without further kernel patches.
+
+## Further resources
+
+- The steam module from https://github.com/Jovian-Experiments/Jovian-NixOS can be used to boot into the Steam Deck UI
--- a/asus/ally/rc71l/default.nix
+++ b/asus/ally/rc71l/default.nix
@ -0,0 +1,17 @@
+{ pkgs, lib, ... }:
+{
+  imports = [
+    ../../../common/cpu/amd
+    ../../../common/cpu/amd/pstate.nix
+    ../../../common/gpu/amd
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+    ../../battery.nix
+  ];
+
+  # 6.5 adds many fixes and improvements for the Ally
+  # This includes for example performance, audio and bluetooth
+  boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.5") (
+    lib.mkDefault pkgs.linuxPackages_latest
+  );
+}
--- a/asus/battery.nix
+++ b/asus/battery.nix
@ -0,0 +1,53 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  p = pkgs.writeScriptBin "charge-upto" ''
+    #!${pkgs.bash}/bin/bash
+    echo ''${1:-100} > /sys/class/power_supply/BAT?/charge_control_end_threshold
+  '';
+  cfg = config.hardware.asus.battery;
+in
+
+{
+  options.hardware.asus.battery = {
+    chargeUpto = lib.mkOption {
+      description = "Maximum level of charge for your battery, as a percentage.";
+      default = 100;
+      type = lib.types.int;
+    };
+    enableChargeUptoScript = lib.mkOption {
+      description = "Whether to add charge-upto to environment.systemPackages. `charge-upto 75` temporarily sets the charge limit to 75%.";
+      default = true;
+      type = lib.types.bool;
+    };
+  };
+  config = {
+    environment.systemPackages = lib.mkIf cfg.enableChargeUptoScript [ p ];
+    systemd.services.battery-charge-threshold = {
+      wantedBy = [
+        "local-fs.target"
+        "suspend.target"
+        "suspend-then-hibernate.target"
+        "hibernate.target"
+      ];
+      after = [
+        "local-fs.target"
+        "suspend.target"
+        "suspend-then-hibernate.target"
+        "hibernate.target"
+      ];
+      description = "Set the battery charge threshold to ${toString cfg.chargeUpto}%";
+      startLimitBurst = 5;
+      startLimitIntervalSec = 1;
+      serviceConfig = {
+        Type = "oneshot";
+        Restart = "on-failure";
+        ExecStart = "${pkgs.runtimeShell} -c 'echo ${toString cfg.chargeUpto} > /sys/class/power_supply/BAT?/charge_control_end_threshold'";
+      };
+    };
+  };
+}
--- a/asus/fa506ic/default.nix
+++ b/asus/fa506ic/default.nix
@ -0,0 +1,33 @@
+{ lib, ... }:
+
+{
+  imports = [
+    ../../common/cpu/amd
+    ../../common/cpu/amd/pstate.nix
+    ../../common/gpu/amd
+    ../../common/gpu/nvidia/prime.nix
+    ../../common/gpu/nvidia/ampere
+    ../../common/pc/laptop
+    ../../common/pc/ssd
+  ];
+
+  hardware.nvidia = {
+    modesetting.enable = lib.mkDefault true;
+    open = lib.mkDefault false;
+    nvidiaSettings = lib.mkDefault true;
+    dynamicBoost.enable = lib.mkDefault true;
+
+    prime = {
+      amdgpuBusId = "PCI:0:6:0";
+      nvidiaBusId = "PCI:0:1:0";
+    };
+  };
+
+  services = {
+    asusd = {
+      enable = lib.mkDefault true;
+      enableUserService = lib.mkDefault true;
+    };
+    supergfxd.enable = lib.mkDefault true;
+  };
+}
--- a/asus/fa507nv/README.md
+++ b/asus/fa507nv/README.md
@ -0,0 +1,2 @@
+# ASUS TUF A15 FA507NV
+As Nvidia offload is not available for AMD CPU, nvidia prime is using sync. Additionally the kernel is set to the latest stable release(using boot.kernelPackages = pkgs.linuxPackages_latest) as the keyboard and wireless drivers does not work in the default NixOS kernel which is the LTS kernel.
--- a/asus/fa507nv/default.nix
+++ b/asus/fa507nv/default.nix
@ -0,0 +1,51 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+{
+  imports = [
+    ../../common/cpu/amd
+    ../../common/cpu/amd/raphael/igpu.nix
+    ../../common/cpu/amd/pstate.nix
+    ../../common/gpu/nvidia
+    ../../common/gpu/nvidia/prime.nix
+    ../../common/hidpi.nix
+    ../../common/pc/laptop
+    ../../common/pc/ssd
+    ../battery.nix
+  ];
+
+  boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.6") pkgs.linuxPackages_latest;
+
+  # The bottom 2 parts are taken from the framework 16-inch laptops configurations.
+  # 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;
+
+  # Adds the missing asus functionality to Linux.
+  # https://asus-linux.org/manual/asusctl-manual/
+  services = {
+    asusd = {
+      enable = lib.mkDefault true;
+      enableUserService = lib.mkDefault true;
+    };
+  };
+
+  hardware.nvidia = {
+    powerManagement.enable = lib.mkDefault true;
+    modesetting.enable = lib.mkDefault true;
+    open = lib.mkDefault false;
+    nvidiaSettings = lib.mkDefault true;
+    prime = {
+      amdgpuBusId = "PCI:54:0:0";
+      nvidiaBusId = "PCI:1:0:0";
+    };
+  };
+}
--- a/asus/fa507rm/default.nix
+++ b/asus/fa507rm/default.nix
@ -0,0 +1,16 @@
+{ ... }:
+
+{
+  imports = [
+    ../../common/cpu/amd
+    ../../common/gpu/nvidia/prime.nix
+    ../../common/gpu/nvidia/ampere
+    ../../common/pc/laptop
+    ../../common/pc/ssd
+  ];
+
+  hardware.nvidia.prime = {
+    amdgpuBusId = "PCI:5:0:0";
+    nvidiaBusId = "PCI:1:0:0";
+  };
+}
--- a/asus/flow/gv302x/amdgpu/default.nix
+++ b/asus/flow/gv302x/amdgpu/default.nix
@ -0,0 +1,52 @@
+{
+  config,
+  lib,
+  ...
+}:
+
+let
+  inherit (lib) mkEnableOption mkIf mkMerge;
+  cfg = config.hardware.asus.flow.gv302x;
+
+in
+{
+  imports = [
+    ../shared.nix
+  ];
+
+  options.hardware.asus.flow.gv302x.amdgpu = {
+    recovery.enable = (mkEnableOption "Enable amdgpu.gpu_recovery kernel boot param") // {
+      default = false;
+    };
+    sg_display.enable = (mkEnableOption "Enable amdgpu.gpu_recovery kernel boot param") // {
+      default = true;
+    };
+    psr.enable = (mkEnableOption "Enable amdgpu.dcdebugmask=0x10 kernel boot param") // {
+      default = true;
+    };
+  };
+
+  config = mkMerge [
+    (mkIf cfg.amdgpu.recovery.enable {
+      # Hopefully fixes for where the kernel sometimes hangs when suspending or hibernating
+      #  (Though, I'm very suspicious of the Mediatek Wifi...)
+      boot.kernelParams = [
+        "amdgpu.gpu_recovery=1"
+      ];
+    })
+
+    (mkIf (!cfg.amdgpu.sg_display.enable) {
+      # Can help solve flickering/glitching display issues since Scatter/Gather code was reenabled
+      boot.kernelParams = [
+        "amdgpu.sg_display=0"
+      ];
+    })
+
+    (mkIf (!cfg.amdgpu.psr.enable) {
+      # Can help solve flickering/glitching display issues since Scatter/Gather code was reenabled
+      boot.kernelParams = [
+        "amdgpu.dcdebugmask=0x10"
+      ];
+    })
+  ];
+}
--- a/asus/flow/gv302x/nvidia/default.nix
+++ b/asus/flow/gv302x/nvidia/default.nix
@ -0,0 +1,55 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+
+let
+  inherit (lib) mkDefault;
+
+in
+{
+  imports = [
+    ../shared.nix
+    ## "prime.nix" loads this, aleady:
+    # ../../../common/gpu/nvidia
+    ../../../../common/gpu/nvidia/prime.nix
+    ../../../../common/gpu/nvidia/ada-lovelace
+
+  ];
+
+  # NVIDIA GeForce RTX 4070 Mobile
+
+  boot = {
+    blacklistedKernelModules = [ "nouveau" ];
+  };
+
+  hardware = {
+    ## Enable the Nvidia card, as well as Prime and Offload:
+    amdgpu.initrd.enable = mkDefault true;
+
+    nvidia = {
+
+      modesetting.enable = true;
+      nvidiaSettings = mkDefault true;
+
+      prime = {
+        offload = {
+          enable = mkDefault true;
+          enableOffloadCmd = mkDefault true;
+        };
+        amdgpuBusId = "PCI:69:0:0";
+        nvidiaBusId = "PCI:1:0:0";
+      };
+
+      powerManagement = {
+        enable = mkDefault true;
+        finegrained = mkDefault true;
+      };
+
+      dynamicBoost.enable = mkDefault true;
+
+    };
+  };
+}
--- a/asus/flow/gv302x/shared.nix
+++ b/asus/flow/gv302x/shared.nix
@ -0,0 +1,114 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  inherit (lib)
+    mkDefault
+    mkEnableOption
+    mkIf
+    mkMerge
+    versionAtLeast
+    ;
+
+  cfg = config.hardware.asus.flow.gv302x;
+in
+{
+
+  imports = [
+    ../../../common/cpu/amd
+    # Better power-savings from AMD PState:
+    ../../../common/cpu/amd/pstate.nix
+    ../../../common/gpu/amd
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+  ];
+
+  options.hardware.asus.flow.gv302x = {
+    # Kernels earlier than 6.9 (possibly even earlier) tend to take 1-2 key-presses
+    # to wake-up the internal keyboard after the device is suspended.
+    # Therefore, this option disables auto-suspend for the keyboard by default, but
+    # enables it for kernel 6.9.x onwards.
+    #
+    # Note: the device name is "ASUS N-KEY Device".
+    keyboard.autosuspend.enable =
+      (mkEnableOption "Enable auto-suspend on the internal USB keyboard (ASUS N-KEY Device) on Flow GV302X")
+      // {
+        default = versionAtLeast config.boot.kernelPackages.kernel.version "6.9";
+        defaultText = lib.literalExpression "lib.versionAtLeast config.boot.kernelPackages.kernel.version \"6.9\"";
+      };
+    # The ASUS 8295 ITE device will cause an immediate wake-up when trying to suspend the laptop.
+    # After the first successful hibernate, it will work as expected, however.
+    # NOTE: I'm not actually sure what this device, as neither the touchpad nor the M1-M4 keys cause a wake-up.
+    ite-device.wakeup.enable = mkEnableOption "Enable power wakeup on the internal USB keyboard-like device (8295 ITE Device) on Flow GV302X";
+  };
+
+  config = mkMerge [
+    {
+      # Configure basic system settings:
+      boot = {
+        kernelModules = [ "kvm-amd" ];
+        kernelParams = [
+          "mem_sleep_default=deep"
+          "pcie_aspm.policy=powersupersave"
+        ];
+      };
+
+      services = {
+        asusd = {
+          enable = mkDefault true;
+          enableUserService = mkDefault true;
+        };
+
+        supergfxd.enable = mkDefault true;
+
+        udev = {
+          extraHwdb = ''
+            # Fixes mic mute button
+            evdev:name:*:dmi:bvn*:bvr*:bd*:svnASUS*:pn*:*
+            KEYBOARD_KEY_ff31007c=f20
+          '';
+        };
+      };
+
+      #flow devices are 2 in 1 laptops
+      hardware.sensor.iio.enable = mkDefault true;
+
+    }
+
+    (mkIf (!cfg.keyboard.autosuspend.enable) {
+      services.udev.extraRules = ''
+        # Disable power auto-suspend for the ASUS N-KEY device, i.e. USB Keyboard.
+        # Otherwise on certain kernel-versions, it will tend to take 1-2 key-presses to wake-up after the device suspends.
+        ACTION=="add", SUBSYSTEM=="usb", TEST=="power/autosuspend", ATTR{idVendor}=="0b05", ATTR{idProduct}=="19b6", ATTR{power/autosuspend}="-1"
+      '';
+    })
+
+    (mkIf (!cfg.ite-device.wakeup.enable) {
+      services.udev.extraRules = ''
+        # Disable power wakeup for the 8295 ITE device.
+        # Otherwise on certain kernel-versions, it will tend to cause the laptop to immediately wake-up when suspending.
+        # ACTION=="add|change", SUBSYSTEM=="usb", DRIVER="usb", TEST="power/wakeup", ATTR{idVendor}=="0b05", ATTR{idProduct}=="193b", ATTR{power/wakeup}="disabled"
+        ACTION=="add|change", SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", ATTR{idProduct}=="193b", ATTR{power/wakeup}="disabled"
+      '';
+    })
+
+    (mkIf (config.networking.wireless.iwd.enable && config.networking.wireless.scanOnLowSignal) {
+      # Meditek doesn't seem to be quite sensitive enough on the default roaming settings:
+      #   https://wiki.archlinux.org/title/Wpa_supplicant#Roaming
+      #   https://wiki.archlinux.org/title/Iwd#iwd_keeps_roaming
+      #
+      # But NixOS doesn't have the tweaks for IWD, yet.
+      networking.wireless.iwd.settings = {
+        General = {
+          RoamThreshold = -75;
+          RoamThreshold5G = -80;
+          RoamRetryInterval = 20;
+        };
+      };
+    })
+  ];
+}
--- a/asus/fx506hm/README.md
+++ b/asus/fx506hm/README.md
@ -0,0 +1,28 @@
+<!-- vim: set fenc=utf-8 ts=2 sw=2 sts=-1 sr et si tw=0 fdm=marker fmr={{{,}}}: -->
+# [ASUS TUF Gaming F15 FX506HM (2021)](https://www.asus.com/laptops/for-gaming/tuf-gaming/2021-asus-tuf-gaming-f15/)
+
+This imports common modules for the Intel CPU and iGPU, Nvidia and PRIME render offloading, basic laptop configs, basic SSD configs and configs for ASUS batteries.
+
+On top of that, it sets the right PCI bus IDs for the iGPU and dGPU to make PRIME work well and enables modesetting.
+
+## Useful other things to consider in your configuration
+### Battery charging limit
+Due to the common module for ASUS batteries, you can make your battery only charge up to a certain percentage to improve its life. You can place something similar to the following in your configuration to enable it:
+
+```nix
+hardware.asus.battery =
+{
+  chargeUpto             = 85;   # Maximum level of charge for your battery, as a percentage.
+  enableChargeUptoScript = true; # Whether to add charge-upto to environment.systemPackages. `charge-upto 85` temporarily sets the charge limit to 85%.
+};
+```
+
+### OpenRGB
+You can use OpenRGB to control the RGB keyboard on this laptop. There's also plugins for it to get some extra RGB lighting modes if you wish. You can place the following in your configuration to enable it:
+
+```nix
+boot.kernelModules               = [ "i2c-dev" ];
+hardware.i2c.enable              = true;
+services.udev.packages           = [ pkgs.openrgb ];
+services.hardware.openrgb.enable = true;
+```
--- a/asus/fx506hm/default.nix
+++ b/asus/fx506hm/default.nix
@ -0,0 +1,22 @@
+{ config, lib, ... }:
+
+{
+  imports = [
+    ../../common/cpu/intel
+    ../../common/gpu/nvidia
+    ../../common/gpu/nvidia/prime.nix
+    ../../common/pc/laptop
+    ../../common/pc/ssd
+    ../battery.nix
+  ];
+
+  hardware.nvidia = {
+    modesetting.enable = lib.mkDefault true;
+    open = lib.mkIf (lib.versionAtLeast config.hardware.nvidia.package.version "555") true;
+
+    prime = {
+      intelBusId = "PCI:0:2:0";
+      nvidiaBusId = "PCI:1:0:0";
+    };
+  };
+}
--- a/asus/pro-ws-x570-ace/README.wiki
+++ b/asus/pro-ws-x570-ace/README.wiki
@ -0,0 +1,29 @@
+= ASUS Pro WS X570-ACE =
+
+== Firmware issues ==
+
+=== BIOS ===
+
+BIOS version 4805 (and possibly older) has broken <code>X2APIC</code> mode, which in turn breaks <code>amd-pstate</code> support.
+Other possible config values for <code>APIC</code> are <code>Compatibility</code>, <code>Auto</code> and <code>XAPIC</code>; best results were observed with <code>XAPIC</code>.
+
+This is the error in dmesg when <code>X2APIC</code> is enabled:
+
+<code>
+amd_pstate: the _CPC object is not present in SBIOS or ACPI disabled
+</code>
+
+=== IPMI ===
+
+The IPMI is half-baked and for the most part unusable in a pure Linux environment, see https://forum.level1techs.com/t/remote-management-on-the-asus-pro-ws-x570-ace-under-linux
+
+== Firmware features ==
+
+=== IOMMU ===
+
+The groups are great, it's a good board for VFIO.
+
+=== ECC Memory ===
+
+As stated on the product page, it works; explicitly enabling in BIOS might be required.
+Tested with <code>M391A2K43BB1-CTD</code>.
--- a/asus/pro-ws-x570-ace/default.nix
+++ b/asus/pro-ws-x570-ace/default.nix
@ -0,0 +1,19 @@
+{
+  imports = [
+    ../../common/pc
+    ../../common/pc/ssd
+    ../../common/cpu/amd/pstate.nix
+  ];
+
+  boot.kernelModules = [
+    # Nuvoton NCT6798D - temperature, voltage and RPM
+    "nct6775"
+
+    # a single "temp1" sensor, always at "+31.9°C"
+    # commented because it's not useful, but left here for reference
+    # Bus `SMBus PIIX4 adapter port 1 at 0b20'
+    # Busdriver `i2c_piix4', I2C address 0x4f
+    # Chip `ds75'
+    # "lm75"
+  ];
+}
--- a/asus/rog-gl552vw/default.nix
+++ b/asus/rog-gl552vw/default.nix
@ -0,0 +1,16 @@
+{ ... }:
+
+{
+  imports = [
+    ../../common/cpu/intel/skylake
+    ../../common/gpu/nvidia/maxwell
+    ../../common/gpu/nvidia/prime.nix
+    ../../common/pc/laptop
+    ../../common/pc/ssd
+  ];
+
+  hardware.nvidia.prime = {
+    intelBusId = "PCI:0:2:0";
+    nvidiaBusId = "PCI:1:0:0";
+  };
+}
--- a/asus/rog-strix/g513im/default.nix
+++ b/asus/rog-strix/g513im/default.nix
@ -0,0 +1,17 @@
+{
+  imports = [
+    ../../../common/cpu/amd
+    ../../../common/cpu/amd/pstate.nix
+    ../../../common/gpu/nvidia
+    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/ampere
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+    ../../battery.nix
+  ];
+
+  hardware.nvidia.prime = {
+    amdgpuBusId = "PCI:05:00:0";
+    nvidiaBusId = "PCI:01:00:0";
+  };
+}
--- a/asus/rog-strix/g533q/default.nix
+++ b/asus/rog-strix/g533q/default.nix
@ -0,0 +1,18 @@
+{ ... }:
+
+{
+  imports = [
+    ../../../common/cpu/amd
+    ../../../common/cpu/amd/pstate.nix
+    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/ampere
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+    ../../battery.nix
+  ];
+
+  hardware.nvidia.prime = {
+    amdgpuBusId = "PCI:6:0:0";
+    nvidiaBusId = "PCI:1:0:0";
+  };
+}
--- a/asus/rog-strix/g533zw/default.nix
+++ b/asus/rog-strix/g533zw/default.nix
@ -0,0 +1,17 @@
+{ ... }:
+
+{
+  imports = [
+    ../../../common/cpu/intel
+    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/ampere
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+    ../../battery.nix
+  ];
+
+  hardware.nvidia.prime = {
+    intelBusId = "PCI:0:2:0";
+    nvidiaBusId = "PCI:1:0:0";
+  };
+}
--- a/asus/rog-strix/g713ie/default.nix
+++ b/asus/rog-strix/g713ie/default.nix
@ -0,0 +1,17 @@
+{
+  imports = [
+    ../../../common/cpu/amd
+    ../../../common/cpu/amd/pstate.nix
+    ../../../common/gpu/nvidia
+    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/ampere
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+    ../../battery.nix
+  ];
+
+  hardware.nvidia.prime = {
+    amdgpuBusId = "PCI:5:0:0";
+    nvidiaBusId = "PCI:1:0:0";
+  };
+}
--- a/asus/rog-strix/g733qs/default.nix
+++ b/asus/rog-strix/g733qs/default.nix
@ -0,0 +1,31 @@
+{ pkgs, lib, ... }:
+{
+  imports = [
+    ../../../common/cpu/amd/pstate.nix
+    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/ampere
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+    ../../battery.nix
+  ];
+
+  # fixing audio by overriding pins as suggested in
+  # https://www.reddit.com/r/ASUS/comments/mfokva/asus_strix_scar_17_g733qs_and_linux/
+  hardware.firmware = [
+    (pkgs.runCommand "jack-retask" { } ''
+      install -D ${./hda-jack-retask.fw} $out/lib/firmware/hda-jack-retask.fw
+    '')
+  ];
+  boot.extraModprobeConfig = ''
+    options snd-hda-intel patch=hda-jack-retask.fw
+  '';
+  # before 5.12 it would interpret every keystroke as the power button
+  boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.12") (
+    lib.mkDefault pkgs.linuxPackages_latest
+  );
+
+  hardware.nvidia.prime = {
+    amdgpuBusId = "PCI:5:0:0";
+    nvidiaBusId = "PCI:1:0:1";
+  };
+}
--- a/asus/rog-strix/g733qs/hda-jack-retask.fw
+++ b/asus/rog-strix/g733qs/hda-jack-retask.fw
@ -0,0 +1,16 @@
+[codec]
+0x10ec0285 0x10431e6e 0
+
+[pincfg]
+0x12 0x90a60140
+0x13 0x40000000
+0x14 0x90170152
+0x16 0x411111f0
+0x17 0x90170110
+0x18 0x411111f0
+0x19 0x03a19020
+0x1a 0x411111f0
+0x1b 0x411111f0
+0x1d 0x40663a45
+0x1e 0x90170151
+0x21 0x03211020
--- a/asus/rog-strix/x570e/default.nix
+++ b/asus/rog-strix/x570e/default.nix
@ -0,0 +1,26 @@
+# Motherboard: ROG STRIX X570-E GAMING
+{ ... }:
+
+{
+  imports = [
+    ../../../common/cpu/amd
+    ../../../common/cpu/amd/pstate.nix
+    ../../../common/cpu/amd/zenpower.nix
+    ../../../common/pc/ssd
+  ];
+
+  boot.kernelModules = [
+    "btintel" # Bluetooth driver for Intel AX200 802.11ax
+    "nct6775" # Temperature and Fan Sensor for Nuvoton NCT6798D-R
+  ];
+}
+
+# Troubleshooting: Bluetooth device missing
+#   There is a known electrical design problem in ROG Strix X570-E Gaming motherboard:
+#   https://www.reddit.com/r/ASUS/comments/romkqq/bluetooth_and_wifi_stopped_working_rog_strix/
+#   Whenever Bluetooth device fails to list (sudo dmesg | grep Bluetooth; hciconfig).
+#   Consider:
+#     1. Turning off computer.
+#     2. Unplugging computer's power supply.
+#     3. Holding down power button for 15s.
+#     4. Bluetooth device should list then.
--- a/asus/zenbook/um6702/default.nix
+++ b/asus/zenbook/um6702/default.nix
@ -0,0 +1,36 @@
+{ lib, ... }:
+let
+  inherit (lib) mkDefault;
+in
+{
+  imports = [
+    ../../../common/cpu/amd
+    ../../../common/cpu/amd/pstate.nix
+
+    # iGPU
+    ../../../common/gpu/amd
+
+    # dGPU
+    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/ampere
+
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+
+    ../../battery.nix
+  ];
+
+  hardware.nvidia = {
+    dynamicBoost.enable = mkDefault true;
+
+    powerManagement = {
+      enable = mkDefault true;
+      finegrained = mkDefault true;
+    };
+
+    prime = {
+      amdgpuBusId = "PCI:1:0:0";
+      nvidiaBusId = "PCI:101:0:0";
+    };
+  };
+}
--- a/asus/zenbook/ux371/README.md
+++ b/asus/zenbook/ux371/README.md
@ -0,0 +1,47 @@
+# Asus Zenbook Flip S13
+
+This is tested on an [UX371](https://www.asus.com/laptops/for-home/zenbook/zenbook-flip-s-ux371-11th-gen-intel/).
+
+## Tested Hardware
+
+```bash
+lspci -nn
+0000:00:00.0 Host bridge [0600]: Intel Corporation 11th Gen Core Processor Host Bridge/DRAM Registers [8086:9a14] (rev 01)
+0000:00:02.0 VGA compatible controller [0300]: Intel Corporation TigerLake-LP GT2 [Iris Xe Graphics] [8086:9a49] (rev 01)
+0000:00:04.0 Signal processing controller [1180]: Intel Corporation TigerLake-LP Dynamic Tuning Processor Participant [8086:9a03] (rev 01)
+0000:00:07.0 PCI bridge [0604]: Intel Corporation Tiger Lake-LP Thunderbolt 4 PCI Express Root Port #0 [8086:9a23] (rev 01)
+0000:00:07.1 PCI bridge [0604]: Intel Corporation Tiger Lake-LP Thunderbolt 4 PCI Express Root Port #1 [8086:9a25] (rev 01)
+0000:00:08.0 System peripheral [0880]: Intel Corporation GNA Scoring Accelerator module [8086:9a11] (rev 01)
+0000:00:0a.0 Signal processing controller [1180]: Intel Corporation Tigerlake Telemetry Aggregator Driver [8086:9a0d] (rev 01)
+0000:00:0d.0 USB controller [0c03]: Intel Corporation Tiger Lake-LP Thunderbolt 4 USB Controller [8086:9a13] (rev 01)
+0000:00:0d.2 USB controller [0c03]: Intel Corporation Tiger Lake-LP Thunderbolt 4 NHI #0 [8086:9a1b] (rev 01)
+0000:00:0e.0 RAID bus controller [0104]: Intel Corporation Volume Management Device NVMe RAID Controller [8086:9a0b]
+0000:00:12.0 Serial controller [0700]: Intel Corporation Tiger Lake-LP Integrated Sensor Hub [8086:a0fc] (rev 20)
+0000:00:14.0 USB controller [0c03]: Intel Corporation Tiger Lake-LP USB 3.2 Gen 2x1 xHCI Host Controller [8086:a0ed] (rev 20)
+0000:00:14.2 RAM memory [0500]: Intel Corporation Tiger Lake-LP Shared SRAM [8086:a0ef] (rev 20)
+0000:00:14.3 Network controller [0280]: Intel Corporation Wi-Fi 6 AX201 [8086:a0f0] (rev 20)
+0000:00:15.0 Serial bus controller [0c80]: Intel Corporation Tiger Lake-LP Serial IO I2C Controller #0 [8086:a0e8] (rev 20)
+0000:00:15.1 Serial bus controller [0c80]: Intel Corporation Tiger Lake-LP Serial IO I2C Controller #1 [8086:a0e9] (rev 20)
+0000:00:16.0 Communication controller [0780]: Intel Corporation Tiger Lake-LP Management Engine Interface [8086:a0e0] (rev 20)
+0000:00:1d.0 System peripheral [0880]: Intel Corporation RST VMD Managed Controller [8086:09ab]
+0000:00:1f.0 ISA bridge [0601]: Intel Corporation Tiger Lake-LP LPC Controller [8086:a082] (rev 20)
+0000:00:1f.3 Multimedia audio controller [0401]: Intel Corporation Tiger Lake-LP Smart Sound Technology Audio Controller [8086:a0c8] (rev 20)
+0000:00:1f.4 SMBus [0c05]: Intel Corporation Tiger Lake-LP SMBus Controller [8086:a0a3] (rev 20)
+0000:00:1f.5 Serial bus controller [0c80]: Intel Corporation Tiger Lake-LP SPI Controller [8086:a0a4] (rev 20)
+10000:e0:1d.0 PCI bridge [0604]: Intel Corporation Tiger Lake-LP PCI Express Root Port #9 [8086:a0b0] (rev 20)
+10000:e1:00.0 Non-Volatile memory controller [0108]: Sandisk Corp WD Black SN750 / PC SN730 / Red SN700 NVMe SSD [15b7:5006]
+```
+
+## Updating Firmware
+
+First enable `fwupd` in your config
+
+```nix
+services.fwupd.enable = true;
+```
+
+Then run
+
+```bash
+ $ fwupdmgr update
+```
--- a/asus/zenbook/ux371/default.nix
+++ b/asus/zenbook/ux371/default.nix
@ -0,0 +1,25 @@
+{
+  config,
+  lib,
+  ...
+}:
+{
+  imports = [
+    ../../../common/cpu/intel/tiger-lake
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+    ../../battery.nix
+  ];
+
+  # while tiger-lake in general not supported by xe, some chipsets like this one are.
+  hardware.intelgpu.driver = lib.mkIf (lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.8") "xe";
+
+  boot.kernelParams = lib.mkIf (config.hardware.intelgpu.driver == "xe") [
+    "i915.force_probe=!9a49"
+    "xe.force_probe=9a49"
+  ];
+
+  hardware.enableRedistributableFirmware = lib.mkDefault true;
+  services.thermald.enable = lib.mkDefault true;
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+}
--- a/asus/zenbook/ux481/README.md
+++ b/asus/zenbook/ux481/README.md
@ -0,0 +1,53 @@
+# Asus Zenbook Duo 14 UX481
+
+These profiles has been tested on a slightly modified device as I have swapped the Intel Optane NVME for a Kingston NVME with a higher capacity.
+
+# GPU
+
+You need to pick between running only Intel iGPU or running both Intel iGPU and NVIDIA dGPU. By only running iGPU the battery life is a bit better as the dGPU is turned off. You can offload applications if running on NVIDIA dGPU using
+
+```bash
+nvidia-offload
+```
+
+## Battery charging limit:
+
+Using the ASUS module you can limit the charging percentage. This can be done as follows:
+
+```nix
+hardware.asus.battery =
+{
+  chargeUpto = 90;   # Maximum level of charge for your battery, as a percentage.
+  enableChargeUptoScript = true; # Whether to add charge-upto to environment.systemPackages. `charge-upto 100` temporarily sets the charge limit to 100%, useful if you're going to need the extra battery on a longer journey.
+};
+```
+
+## Hardware:
+
+```bash
+$ lspci -nn
+00:00.0 Host bridge [0600]: Intel Corporation Comet Lake-U v1 4c Host Bridge/DRAM Controller [8086:9b61] (rev 0c)
+00:02.0 VGA compatible controller [0300]: Intel Corporation CometLake-U GT2 [UHD Graphics] [8086:9b41] (rev 02)
+00:04.0 Signal processing controller [1180]: Intel Corporation Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Thermal Subsystem [8086:1903] (rev 0c)
+00:08.0 System peripheral [0880]: Intel Corporation Xeon E3-1200 v5/v6 / E3-1500 v5 / 6th/7th/8th Gen Core Processor Gaussian Mixture Model [8086:1911]
+00:12.0 Signal processing controller [1180]: Intel Corporation Comet Lake Thermal Subsytem [8086:02f9]
+00:14.0 USB controller [0c03]: Intel Corporation Comet Lake PCH-LP USB 3.1 xHCI Host Controller [8086:02ed]
+00:14.2 RAM memory [0500]: Intel Corporation Comet Lake PCH-LP Shared SRAM [8086:02ef]
+00:14.3 Network controller [0280]: Intel Corporation Comet Lake PCH-LP CNVi WiFi [8086:02f0]
+00:15.0 Serial bus controller [0c80]: Intel Corporation Serial IO I2C Host Controller [8086:02e8]
+00:15.1 Serial bus controller [0c80]: Intel Corporation Comet Lake Serial IO I2C Host Controller [8086:02e9]
+00:15.2 Serial bus controller [0c80]: Intel Corporation Comet Lake PCH-LP LPSS: I2C Controller #2 [8086:02ea]
+00:15.3 Serial bus controller [0c80]: Intel Corporation Device [8086:02eb]
+00:16.0 Communication controller [0780]: Intel Corporation Comet Lake Management Engine Interface [8086:02e0]
+00:1c.0 PCI bridge [0604]: Intel Corporation Comet Lake PCI Express Root Port #1 [8086:02b8] (rev f0)
+00:1c.4 PCI bridge [0604]: Intel Corporation Comet Lake PCI Express Root Port #5 [8086:02bc] (rev f0)
+00:1d.0 PCI bridge [0604]: Intel Corporation Comet Lake PCI Express Root Port #9 [8086:02b0] (rev f0)
+00:1d.4 PCI bridge [0604]: Intel Corporation Comet Lake PCI Express Root Port #13 [8086:02b4] (rev f0)
+00:1f.0 ISA bridge [0601]: Intel Corporation Comet Lake PCH-LP LPC Premium Controller/eSPI Controller [8086:0284]
+00:1f.3 Audio device [0403]: Intel Corporation Comet Lake PCH-LP cAVS [8086:02c8]
+00:1f.4 SMBus [0c05]: Intel Corporation Comet Lake PCH-LP SMBus Host Controller [8086:02a3]
+00:1f.5 Serial bus controller [0c80]: Intel Corporation Comet Lake SPI (flash) Controller [8086:02a4]
+02:00.0 3D controller [0302]: NVIDIA Corporation GP108BM [GeForce MX250] [10de:1d52] (rev a1)
+03:00.0 Unassigned class [ff00]: Realtek Semiconductor Co., Ltd. RTS522A PCI Express Card Reader [10ec:522a] (rev 01)
+04:00.0 Non-Volatile memory controller [0108]: Kingston Technology Company, Inc. NV2 NVMe SSD [TC2200] (DRAM-less) [2646:501d]
+```
--- a/asus/zenbook/ux481/intelgpu/default.nix
+++ b/asus/zenbook/ux481/intelgpu/default.nix
@ -0,0 +1,8 @@
+{ lib, ... }:
+{
+  imports = [
+    ../shared.nix
+    ../../../../common/gpu/intel/comet-lake
+    ../../../../common/gpu/nvidia/disable.nix # Disabling nvidia
+  ];
+}
--- a/asus/zenbook/ux481/nvidia/default.nix
+++ b/asus/zenbook/ux481/nvidia/default.nix
@ -0,0 +1,17 @@
+{ lib, ... }:
+{
+  imports = [
+    ../shared.nix
+    ../../../../common/gpu/nvidia/pascal
+    ../../../../common/gpu/nvidia/prime.nix
+  ];
+
+  hardware.nvidia = {
+    prime = {
+      intelBusId = "PCI:0:2:0";
+      nvidiaBusId = "PCI:2:0:0";
+    };
+
+    dynamicBoost.enable = lib.mkForce false; # Dynamic boost is not supported on Pascal architeture
+  };
+}
--- a/asus/zenbook/ux481/shared.nix
+++ b/asus/zenbook/ux481/shared.nix
@ -0,0 +1,25 @@
+{
+  config,
+  lib,
+  ...
+}:
+{
+  imports = [
+    ../../../common/cpu/intel/comet-lake/cpu-only.nix
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+    ../../battery.nix
+  ];
+
+  boot.kernelParams = [
+    # These options are needed for suspend to work,
+    # otherwise the nvme will be mounted read-only on resume
+    "pcie_aspm=off"
+    "pcie_port_pm=off"
+    "nvme_core.default_ps_max_latency_us=0"
+    "mem_sleep_default=deep"
+  ];
+
+  services.thermald.enable = lib.mkDefault true;
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+}
--- a/asus/zenbook/ux535/README.md
+++ b/asus/zenbook/ux535/README.md
@ -0,0 +1,105 @@
+# Asus Zenbook Pro UX535
+
+Tested on a slightly modified device - the Intel Optane combination SSD was replaced with a higher capacity Sabrent Drive. From Using the Optane Drive without Optane Mode in Windows, I hypothesise that the drive should work assuming the BIOS Settings are Correct - I believe there was a RAID mode I turned off? In Windows, the Optane blocks appeared as a separate drive, I'd suggest maybe use this as Swap?
+
+## ScreenPad:
+
+Configuration for the ScreenPad is unable to be provided here at this time, due to reliance on Additional Modules not included in Nixpkgs. If you want to install the [ScreenPad Kernel Module](https://github.com/Plippo/asus-wmi-screenpad), I recommend using the packaging of it for nix created by [MatthewCash](https://github.com/MatthewCash/asus-wmi-screenpad-module). It can be installed as below:
+
+```nix
+# flake.nix
+{
+  inputs = {
+
+    nixpkgs = {
+      url = "github:NixOS/nixpkgs/nixos-unstable";
+    };
+
+    screenpad-driver={
+        url = "github:MatthewCash/asus-wmi-screenpad-module";
+        inputs.nixpkgs.follows="nixpkgs";
+      };
+
+  };
+  outputs = inputs@{nixpkgs, screenpad-driver, ...}:{
+
+    # Replace hostname with your hostname
+    nixosConfigurations.hostname=inputs.nixpkgs.lib.nixosSystem{
+      modules = [
+        ./configuration.nix
+        {
+          boot.extraModulePackages = let
+            screenpad-driver-package = (kernelPackage:
+              let
+              asus-wmi-screenpad = screenpad-driver.defaultPackage.${system}.override{kernel=kernelPackage;};
+              in [
+                asus-wmi-screenpad
+              ]
+            );
+            in (screenpad-driver-package ${yourKernelPackages}.kernel); # Replace ${yourKernelPackages} with the value of your config.boot.kernelPackages, for me, this would be pkgs.kernelPackages_latest
+          boot.kernelModules = [
+            "asus-wmi-screenpad"
+          ];
+        }
+      ];
+    };
+
+  };
+}
+
+```
+
+I also recommend writing some kind of script to be able to turn the screenpad On and Off with the correct positioning. If you're using KDE Plasma, feel free to use [mine](https://github.com/Green-D-683/Asus-ScreenPad-Linux). You may also want a script to be able to turn on the main display, as it has an irritating habit of turning itself off, making the screenpad the primary display whenever you plug in a new monitor configuration.
+
+## Battery charging limit:
+
+Due to the common module for ASUS batteries, you can make your battery only charge up to a certain percentage to improve its life. You can place something similar to the following in your configuration to enable it.
+
+```nix
+hardware.asus.battery =
+{
+  chargeUpto = 90;   # Maximum level of charge for your battery, as a percentage.
+  enableChargeUptoScript = true; # Whether to add charge-upto to environment.systemPackages. `charge-upto 100` temporarily sets the charge limit to 100%, useful if you're going to need the extra battery on a longer journey.
+};
+```
+
+## Thunderbolt:
+
+I don't own any Thunderbolt devices to be able to test transfer speeds or PCIe Tunnelling, but I've tested both USB Monitors and Display-Out though the Thunderbolt 3 port and both seem to work well.
+
+## Hardware Lists:
+
+```bash
+$ lspci -nn
+00:00.0 Host bridge [0600]: Intel Corporation 10th Gen Core Processor Host Bridge/DRAM Registers [8086:9b44] (rev 02)
+00:01.0 PCI bridge [0604]: Intel Corporation 6th-10th Gen Core Processor PCIe Controller (x16) [8086:1901] (rev 02)
+00:02.0 VGA compatible controller [0300]: Intel Corporation CometLake-H GT2 [UHD Graphics] [8086:9bc4] (rev 05)
+00:04.0 Signal processing controller [1180]: Intel Corporation Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Thermal Subsystem [8086:1903] (rev 02)
+00:08.0 System peripheral [0880]: Intel Corporation Xeon E3-1200 v5/v6 / E3-1500 v5 / 6th/7th/8th Gen Core Processor Gaussian Mixture Model [8086:1911]
+00:12.0 Signal processing controller [1180]: Intel Corporation Comet Lake PCH Thermal Controller [8086:06f9]
+00:14.0 USB controller [0c03]: Intel Corporation Comet Lake USB 3.1 xHCI Host Controller [8086:06ed]
+00:14.2 RAM memory [0500]: Intel Corporation Comet Lake PCH Shared SRAM [8086:06ef]
+00:14.3 Network controller [0280]: Intel Corporation Comet Lake PCH CNVi WiFi [8086:06f0]
+00:15.0 Serial bus controller [0c80]: Intel Corporation Comet Lake PCH Serial IO I2C Controller #0 [8086:06e8]
+00:15.1 Serial bus controller [0c80]: Intel Corporation Comet Lake PCH Serial IO I2C Controller #1 [8086:06e9]
+00:15.2 Serial bus controller [0c80]: Intel Corporation Comet Lake PCH Serial IO I2C Controller #2 [8086:06ea]
+00:16.0 Communication controller [0780]: Intel Corporation Comet Lake HECI Controller [8086:06e0]
+00:17.0 SATA controller [0106]: Intel Corporation Device [8086:06d3]
+00:1b.0 PCI bridge [0604]: Intel Corporation Comet Lake PCI Express Root Port #21 [8086:06ac] (rev f0)
+00:1d.0 PCI bridge [0604]: Intel Corporation Comet Lake PCI Express Root Port #9 [8086:06b0] (rev f0)
+00:1d.5 PCI bridge [0604]: Intel Corporation Device [8086:06b5] (rev f0)
+00:1f.0 ISA bridge [0601]: Intel Corporation Comet Lake LPC Controller [8086:068d]
+00:1f.3 Audio device [0403]: Intel Corporation Comet Lake PCH cAVS [8086:06c8]
+00:1f.4 SMBus [0c05]: Intel Corporation Comet Lake PCH SMBus Controller [8086:06a3]
+00:1f.5 Serial bus controller [0c80]: Intel Corporation Comet Lake PCH SPI Controller [8086:06a4]
+01:00.0 VGA compatible controller [0300]: NVIDIA Corporation TU117M [GeForce GTX 1650 Ti Mobile] [10de:1f95] (rev a1)
+01:00.1 Audio device [0403]: NVIDIA Corporation Device [10de:10fa] (rev a1)
+02:00.0 PCI bridge [0604]: Intel Corporation JHL7540 Thunderbolt 3 Bridge [Titan Ridge 2C 2018] [8086:15e7] (rev 06)
+03:00.0 PCI bridge [0604]: Intel Corporation JHL7540 Thunderbolt 3 Bridge [Titan Ridge 2C 2018] [8086:15e7] (rev 06)
+03:01.0 PCI bridge [0604]: Intel Corporation JHL7540 Thunderbolt 3 Bridge [Titan Ridge 2C 2018] [8086:15e7] (rev 06)
+03:02.0 PCI bridge [0604]: Intel Corporation JHL7540 Thunderbolt 3 Bridge [Titan Ridge 2C 2018] [8086:15e7] (rev 06)
+04:00.0 System peripheral [0880]: Intel Corporation JHL7540 Thunderbolt 3 NHI [Titan Ridge 2C 2018] [8086:15e8] (rev 06)
+6c:00.0 USB controller [0c03]: Intel Corporation JHL7540 Thunderbolt 3 USB Controller [Titan Ridge 2C 2018] [8086:15e9] (rev 06)
+6d:00.0 Non-Volatile memory controller [0108]: Phison Electronics Corporation E18 PCIe4 NVMe Controller [1987:5018] (rev 01)
+6e:00.0 Unassigned class [ff00]: Realtek Semiconductor Co., Ltd. RTS522A PCI Express Card Reader [10ec:522a] (rev 01)
+```
--- a/asus/zenbook/ux535/default.nix
+++ b/asus/zenbook/ux535/default.nix
@ -0,0 +1,31 @@
+{
+  lib,
+  ...
+}:
+{
+  imports = [
+    ../../../common/gpu/nvidia/turing
+    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/cpu/intel
+    ../../../common/gpu/intel/comet-lake
+    ../../../common/pc/ssd
+    ../../../common/hidpi.nix # 4K screen is HiDPI
+    ../../battery.nix
+  ];
+
+  config = {
+    hardware.nvidia = {
+      prime = {
+        intelBusId = "PCI:0:2:0"; # Intel UHD Graphics Comet Lake
+        nvidiaBusId = "PCI:1:0:0"; # Nvidia GTX 1650 Ti Max-Q
+
+        reverseSync.enable = lib.mkDefault true; # Turning this on meant the Thunderbolt port was able to be used for video
+      };
+      dynamicBoost.enable = false; # Doesn't work on this GPU - causes error rebuilding
+    };
+
+    powerManagement.powertop.enable = lib.mkDefault false; # This caused issues with USB ports losing power while the device was on
+
+    services.hardware.bolt.enable = lib.mkDefault true; # Thunderbolt
+  };
+}
--- a/asus/zephyrus/ga401/default.nix
+++ b/asus/zephyrus/ga401/default.nix
@ -0,0 +1,37 @@
+{ lib, ... }:
+
+{
+  imports = [
+    ../../../common/cpu/amd
+    ../../../common/cpu/amd/pstate.nix
+    ../../../common/gpu/amd
+    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/ampere
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+  ];
+
+  hardware.nvidia = {
+    # Enable DRM kernel mode setting
+    # This will also cause "PCI-Express Runtime D3 Power Management" to be enabled by default
+    modesetting.enable = lib.mkDefault true;
+
+    dynamicBoost.enable = lib.mkDefault true;
+
+    prime = {
+      amdgpuBusId = "PCI:4:0:0";
+      nvidiaBusId = "PCI:1:0:0";
+    };
+  };
+
+  services = {
+    asusd.enable = lib.mkDefault true;
+
+    udev.extraHwdb = ''
+      evdev:name:*:dmi:bvn*:bvr*:bd*:svnASUS*:pn*:*
+       KEYBOARD_KEY_ff31007c=f20    # fixes mic mute button
+       KEYBOARD_KEY_ff3100b2=home   # Set fn+LeftArrow as Home
+       KEYBOARD_KEY_ff3100b3=end    # Set fn+RightArrow as End
+    '';
+  };
+}
--- a/asus/zephyrus/ga401iv/default.nix
+++ b/asus/zephyrus/ga401iv/default.nix
@ -0,0 +1,38 @@
+{ lib, ... }:
+
+{
+  imports = [
+    ../../../common/cpu/amd
+    ../../../common/cpu/amd/pstate.nix
+    ../../../common/gpu/amd
+    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/turing
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+  ];
+
+  hardware.nvidia = {
+    # Enable DRM kernel mode setting
+    # This will also cause "PCI-Express Runtime D3 Power Management" to be enabled by default
+    modesetting.enable = lib.mkDefault true;
+
+    # Dynamic boost is available on ampere GPUs and newer, not this laptop
+    dynamicBoost.enable = lib.mkDefault false;
+
+    prime = {
+      amdgpuBusId = "PCI:4:0:0";
+      nvidiaBusId = "PCI:1:0:0";
+    };
+  };
+
+  services = {
+    asusd.enable = lib.mkDefault true;
+
+    udev.extraHwdb = ''
+      evdev:name:*:dmi:bvn*:bvr*:bd*:svnASUS*:pn*:*
+       KEYBOARD_KEY_ff31007c=f20    # fixes mic mute button
+       KEYBOARD_KEY_ff3100b2=home   # Set fn+LeftArrow as Home
+       KEYBOARD_KEY_ff3100b3=end    # Set fn+RightArrow as End
+    '';
+  };
+}
--- a/asus/zephyrus/ga402/default.nix
+++ b/asus/zephyrus/ga402/default.nix
@ -0,0 +1,32 @@
+{ lib, config, ... }:
+
+{
+  imports = [
+    ../../../common/cpu/amd
+    ../../../common/cpu/amd/pstate.nix
+    ../../../common/gpu/amd
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+  ];
+
+  services = {
+    asusd.enable = lib.mkDefault true;
+
+    # fixes mic mute button
+    udev.extraHwdb = ''
+      evdev:name:*:dmi:bvn*:bvr*:bd*:svnASUS*:pn*:*
+       KEYBOARD_KEY_ff31007c=f20
+    '';
+  };
+
+  boot = {
+    kernelParams = [ "pcie_aspm.policy=powersupersave" ];
+  };
+
+  assertions = [
+    {
+      assertion = (lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.2");
+      message = "The ga402 requires kernel version >=6.2 to ensure that fans are correctly managed. Please upgrade nixpkgs for this system.";
+    }
+  ];
+}
--- a/asus/zephyrus/ga402x/ATTR-SET-DEPRECATION.md
+++ b/asus/zephyrus/ga402x/ATTR-SET-DEPRECATION.md
@ -0,0 +1,16 @@
+# Deprecation of //asus/zephyrus/ga402x/default.nix
+
+Background:
+The `asus-zephyrus-ga402x` provides an attr-set with `amdgpu` and `nvidia` entries, to allow users
+to choose whether to enable only the AMD-GPU driver, or also enable the NVidia driver with (by
+default) Prime enabled.
+
+However, this attr-set style seems to be broken by [PR #1046](https://github.com/NixOS/nixos-hardware/pull/1046),
+which exports modules as paths, instead.
+That change seems to cause an error of "value is a path while a set was expected".
+
+[PR #1053](https://github.com/NixOS/nixos-hardware/pull/1053):
+- Replaced `asus-zephyrus-ga402x.amdgpu` with a `asus-zephyrus-ga402x-amdgpu` entry.
+- Replaced `asus-zephyrus-ga402x.nvidia` with a `asus-zephyrus-ga402x-nvidia` entry.
+- Made `asus-zephyrus-ga402x` throw a deprecation error.
+- [FIXES: #1052](https://github.com/NixOS/nixos-hardware/issues/1052)
--- a/asus/zephyrus/ga402x/amdgpu/default.nix
+++ b/asus/zephyrus/ga402x/amdgpu/default.nix
@ -0,0 +1,52 @@
+{
+  config,
+  lib,
+  ...
+}:
+
+let
+  inherit (lib) mkEnableOption mkIf mkMerge;
+  cfg = config.hardware.asus.zephyrus.ga402x;
+
+in
+{
+  imports = [
+    ../shared.nix
+  ];
+
+  options.hardware.asus.zephyrus.ga402x.amdgpu = {
+    recovery.enable = (mkEnableOption "Enable amdgpu.gpu_recovery kernel boot param") // {
+      default = false;
+    };
+    sg_display.enable = (mkEnableOption "Enable amdgpu.gpu_recovery kernel boot param") // {
+      default = true;
+    };
+    psr.enable = (mkEnableOption "Enable amdgpu.dcdebugmask=0x10 kernel boot param") // {
+      default = true;
+    };
+  };
+
+  config = mkMerge [
+    (mkIf cfg.amdgpu.recovery.enable {
+      # Hopefully fixes for where the kernel sometimes hangs when suspending or hibernating
+      #  (Though, I'm very suspicious of the Mediatek Wifi...)
+      boot.kernelParams = [
+        "amdgpu.gpu_recovery=1"
+      ];
+    })
+
+    (mkIf (!cfg.amdgpu.sg_display.enable) {
+      # Can help solve flickering/glitching display issues since Scatter/Gather code was reenabled
+      boot.kernelParams = [
+        "amdgpu.sg_display=0"
+      ];
+    })
+
+    (mkIf (!cfg.amdgpu.psr.enable) {
+      # Can help solve flickering/glitching display issues since Scatter/Gather code was reenabled
+      boot.kernelParams = [
+        "amdgpu.dcdebugmask=0x10"
+      ];
+    })
+  ];
+}
--- a/asus/zephyrus/ga402x/default.nix
+++ b/asus/zephyrus/ga402x/default.nix
@ -0,0 +1,10 @@
+{ ... }:
+
+{
+  assertions = [
+    {
+      assertion = false;
+      message = "Importing asus/zephyrus/ga402x/ (default.nix) directly is deprecated! See https://github.com/NixOS/nixos-hardware/blob/master/asus/zephyrus/ga402x/ATTR-SET-DEPRECATION.md for more details";
+    }
+  ];
+}
--- a/asus/zephyrus/ga402x/nvidia/default.nix
+++ b/asus/zephyrus/ga402x/nvidia/default.nix
@ -0,0 +1,54 @@
+{
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  inherit (lib) mkDefault;
+
+in
+{
+  imports = [
+    ../shared.nix
+    ## "prime.nix" loads this, aleady:
+    # ../../../common/gpu/nvidia
+    ../../../../common/gpu/nvidia/prime.nix
+    ../../../../common/gpu/nvidia/ada-lovelace
+
+  ];
+
+  # NVIDIA GeForce RTX 4060 Mobile
+
+  boot = {
+    blacklistedKernelModules = [ "nouveau" ];
+  };
+
+  # Also in nvidia/default.nix
+  services.xserver.videoDrivers = mkDefault [ "nvidia" ];
+
+  hardware = {
+    ## Enable the Nvidia card, as well as Prime and Offload:
+    amdgpu.initrd.enable = mkDefault true;
+
+    nvidia = {
+      modesetting.enable = true;
+      nvidiaSettings = mkDefault true;
+
+      prime = {
+        offload = {
+          enable = mkDefault true;
+          enableOffloadCmd = mkDefault true;
+        };
+        amdgpuBusId = "PCI:101:0:0";
+        nvidiaBusId = "PCI:1:0:0";
+      };
+
+      powerManagement = {
+        # This is unreliable on the 4060;  works a few times, then hangs:
+        # enable = true;
+        # finegrained = true
+      };
+    };
+  };
+}
--- a/asus/zephyrus/ga402x/shared.nix
+++ b/asus/zephyrus/ga402x/shared.nix
@ -0,0 +1,118 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  inherit (lib)
+    mkDefault
+    mkEnableOption
+    mkIf
+    mkMerge
+    version
+    versionAtLeast
+    versionOlder
+    ;
+
+  cfg = config.hardware.asus.zephyrus.ga402x;
+in
+{
+
+  imports = [
+    ../../../common/cpu/amd
+    # Better power-savings from AMD PState:
+    ../../../common/cpu/amd/pstate.nix
+    ../../../common/gpu/amd
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+  ];
+
+  options.hardware.asus.zephyrus.ga402x = {
+    # Kernels earlier than 6.9 (possibly even earlier) tend to take 1-2 key-presses
+    # to wake-up the internal keyboard after the device is suspended.
+    # Therefore, this option disables auto-suspend for the keyboard by default, but
+    # enables it for kernel 6.9.x onwards.
+    #
+    # Note: the device name is "ASUS N-KEY Device".
+    keyboard.autosuspend.enable =
+      (mkEnableOption "Enable auto-suspend on the internal USB keyboard (ASUS N-KEY Device) on Zephyrus GA402X")
+      // {
+        default = versionAtLeast config.boot.kernelPackages.kernel.version "6.9";
+        defaultText = lib.literalExpression "lib.versionAtLeast config.boot.kernelPackages.kernel.version \"6.9\"";
+      };
+    # The ASUS 8295 ITE device will cause an immediate wake-up when trying to suspend the laptop.
+    # After the first successful hibernate, it will work as expected, however.
+    # NOTE: I'm not actually sure what this device, as neither the touchpad nor the M1-M4 keys cause a wake-up.
+    ite-device.wakeup.enable = mkEnableOption "Enable power wakeup on the internal USB keyboard-like device (8295 ITE Device) on Zephyrus GA402X";
+  };
+
+  config = mkMerge [
+    {
+      # Configure basic system settings:
+      boot = {
+        kernelModules = [ "kvm-amd" ];
+        kernelParams = [
+          "mem_sleep_default=deep"
+          "pcie_aspm.policy=powersupersave"
+        ];
+      };
+
+      services = {
+        asusd = {
+          enable = mkDefault true;
+          enableUserService = mkDefault true;
+        };
+
+        supergfxd.enable = mkDefault true;
+
+        udev = {
+          extraHwdb = ''
+            # Fixes mic mute button
+            evdev:name:*:dmi:bvn*:bvr*:bd*:svnASUS*:pn*:*
+            KEYBOARD_KEY_ff31007c=f20
+          '';
+        };
+      };
+    }
+
+    (mkIf (!cfg.keyboard.autosuspend.enable) {
+      services.udev.extraRules = ''
+        # Disable power auto-suspend for the ASUS N-KEY device, i.e. USB Keyboard.
+        # Otherwise on certain kernel-versions, it will tend to take 1-2 key-presses to wake-up after the device suspends.
+        ACTION=="add", SUBSYSTEM=="usb", TEST=="power/autosuspend", ATTR{idVendor}=="0b05", ATTR{idProduct}=="19b6", ATTR{power/autosuspend}="-1"
+      '';
+    })
+
+    (mkIf (!cfg.ite-device.wakeup.enable) {
+      services.udev.extraRules = ''
+        # Disable power wakeup for the 8295 ITE device.
+        # Otherwise on certain kernel-versions, it will tend to cause the laptop to immediately wake-up when suspending.
+        # ACTION=="add|change", SUBSYSTEM=="usb", DRIVER="usb", TEST="power/wakeup", ATTR{idVendor}=="0b05", ATTR{idProduct}=="193b", ATTR{power/wakeup}="disabled"
+        ACTION=="add|change", SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", ATTR{idProduct}=="193b", ATTR{power/wakeup}="disabled"
+      '';
+    })
+
+    (mkIf (versionOlder version "23.11") {
+      # See https://asus-linux.org/wiki/nixos/ for info about some problems
+      # detecting the dGPU:
+      systemd.services.supergfxd.path = [ pkgs.pciutils ];
+    })
+
+    (mkIf (config.networking.wireless.iwd.enable && config.networking.wireless.scanOnLowSignal) {
+      # Meditek doesn't seem to be quite sensitive enough on the default roaming settings:
+      #   https://wiki.archlinux.org/title/Wpa_supplicant#Roaming
+      #   https://wiki.archlinux.org/title/Iwd#iwd_keeps_roaming
+      #
+      # But NixOS doesn't have the tweaks for IWD, yet.
+      networking.wireless.iwd.settings = {
+        General = {
+          RoamThreshold = -75;
+          RoamThreshold5G = -80;
+          RoamRetryInterval = 20;
+        };
+      };
+    })
+  ];
+}
--- a/asus/zephyrus/ga502/default.nix
+++ b/asus/zephyrus/ga502/default.nix
@ -0,0 +1,22 @@
+{ ... }:
+
+{
+  imports = [
+    ../../../common/cpu/amd
+    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/turing
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+  ];
+
+  hardware.nvidia.prime = {
+    amdgpuBusId = "PCI:6:0:0";
+    nvidiaBusId = "PCI:1:0:0";
+  };
+
+  # fixes mic mute button
+  services.udev.extraHwdb = ''
+    evdev:name:*:dmi:bvn*:bvr*:bd*:svnASUS*:pn*:*
+     KEYBOARD_KEY_ff31007c=f20
+  '';
+}
--- a/asus/zephyrus/ga503/default.nix
+++ b/asus/zephyrus/ga503/default.nix
@ -0,0 +1,22 @@
+{ ... }:
+
+{
+  imports = [
+    ../../../common/cpu/amd
+    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/ampere
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+  ];
+
+  hardware.nvidia.prime = {
+    amdgpuBusId = "PCI:7:0:0";
+    nvidiaBusId = "PCI:1:0:0";
+  };
+
+  # fixes mic mute button
+  services.udev.extraHwdb = ''
+    evdev:name:*:dmi:bvn*:bvr*:bd*:svnASUS*:pn*:*
+     KEYBOARD_KEY_ff31007c=f20
+  '';
+}
--- a/asus/zephyrus/gu603h/default.nix
+++ b/asus/zephyrus/gu603h/default.nix
@ -0,0 +1,16 @@
+{ ... }:
+
+{
+  imports = [
+    ../../../common/cpu/intel
+    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/ampere
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+  ];
+
+  hardware.nvidia.prime = {
+    intelBusId = "PCI:0:2:0";
+    nvidiaBusId = "PCI:1:0:0";
+  };
+}
--- a/asus/zephyrus/gu605my/default.nix
+++ b/asus/zephyrus/gu605my/default.nix
@ -0,0 +1,33 @@
+{ lib, ... }:
+
+{
+  imports = [
+    ../../../common/cpu/intel
+    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/ada-lovelace
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+    ../shared/backlight.nix
+  ];
+
+  hardware.nvidia = {
+    prime = {
+      intelBusId = "PCI:0:2:0";
+      nvidiaBusId = "PCI:1:0:0";
+    };
+
+    modesetting.enable = lib.mkDefault true;
+    dynamicBoost.enable = lib.mkDefault true;
+  };
+
+  services = {
+    asusd.enable = lib.mkDefault true;
+
+    udev.extraHwdb = ''
+      evdev:name:*:dmi:bvn*:bvr*:bd*:svnASUS*:pn*:*
+        KEYBOARD_KEY_ff31007c=f20    # fixes mic mute button
+        KEYBOARD_KEY_ff3100b2=home   # Set fn+LeftArrow as Home
+        KEYBOARD_KEY_ff3100b3=end    # Set fn+RightArrow as End
+    '';
+  };
+}
--- a/asus/zephyrus/shared/backlight.nix
+++ b/asus/zephyrus/shared/backlight.nix
@ -0,0 +1,9 @@
+{ ... }:
+{
+  # These flags are used to enable backlight control when the dGPU is working in hybrid mode
+  boot.kernelParams = [
+    "i915.enable_dpcd_backlight=1"
+    "nvidia.NVreg_EnableBacklightHandler=0"
+    "nvidia.NVReg_RegistryDwords=EnableBrightnessControl=0"
+  ];
+}
--- a/chuwi/minibook-x/default.nix
+++ b/chuwi/minibook-x/default.nix
@ -0,0 +1,14 @@
+{ ... }:
+{
+  imports = [
+    ../../common/cpu/intel
+    ../../common/pc/laptop
+    ../../common/pc/ssd
+    ../../common/hidpi.nix
+  ];
+  # Fixes the display being rotated 90 degrees.
+  boot.kernelParams = [
+    "fbcon=rotate:1"
+    "video=DSI-1:panel_orientation=right_side_up"
+  ];
+}
--- a/common/cpu/amd/default.nix
+++ b/common/cpu/amd/default.nix
@ -1,6 +1,5 @@
 { config, lib, ... }:

 {
-  hardware.cpu.amd.updateMicrocode =
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
--- a/common/cpu/amd/pstate.nix
+++ b/common/cpu/amd/pstate.nix
@ -0,0 +1,22 @@
+{ lib, config, ... }:
+let
+  kver = config.boot.kernelPackages.kernel.version;
+in
+{
+  # Enables the amd cpu scaling https://www.kernel.org/doc/html/latest/admin-guide/pm/amd-pstate.html
+  # On recent AMD CPUs this can be more energy efficient.
+
+  imports = [ ./. ];
+  boot = lib.mkMerge [
+    (lib.mkIf ((lib.versionAtLeast kver "5.17") && (lib.versionOlder kver "6.1")) {
+      kernelParams = [ "initcall_blacklist=acpi_cpufreq_init" ];
+      kernelModules = [ "amd-pstate" ];
+    })
+    (lib.mkIf ((lib.versionAtLeast kver "6.1") && (lib.versionOlder kver "6.3")) {
+      kernelParams = [ "amd_pstate=passive" ];
+    })
+    (lib.mkIf (lib.versionAtLeast kver "6.3") {
+      kernelParams = [ "amd_pstate=active" ];
+    })
+  ];
+}
--- a/common/cpu/amd/raphael/igpu.nix
+++ b/common/cpu/amd/raphael/igpu.nix
@ -0,0 +1,26 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+
+{
+  # Sets the kernel version to the latest kernel to make the usage of the iGPU possible if your kernel version is too old
+  # Disables scatter/gather which was introduced with kernel version 6.2
+  # It produces completely white or flashing screens when enabled while using the iGPU of Ryzen 7000-series CPUs (Raphael)
+  # This issue is not seen in kernel 6.6 or newer versions
+
+  imports = [ ../. ];
+
+  boot = lib.mkMerge [
+    (lib.mkIf (lib.versionOlder pkgs.linux.version "6.1") {
+      kernelPackages = pkgs.linuxPackages_latest;
+    })
+
+    (lib.mkIf (
+      (lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.2")
+      && (lib.versionOlder config.boot.kernelPackages.kernel.version "6.6")
+    ) { kernelParams = [ "amdgpu.sg_display=0" ]; })
+  ];
+}
--- a/Show more
+++ b/Show more