Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

asus/zenbook/ux371: init #944

Merged
merged 1 commit into from
May 26, 2024
Merged

Conversation

fidgetingbits
Copy link
Contributor

Description of changes

This laptop uses the tiger-lake chipset which didn't have a chipset folder, so I added it and added handling for loading the new Intel Iris Xe graphics driver over i915 if the kernel is new enough.

Things done
  • 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

common/gpu/intel/default.nix Outdated Show resolved Hide resolved
common/gpu/intel/default.nix Outdated Show resolved Hide resolved
@fidgetingbits fidgetingbits force-pushed the asus-zenbook-ux371 branch 2 times, most recently from 021b43f to 2c5444a Compare May 19, 2024 01:39
common/gpu/intel/default.nix Outdated Show resolved Hide resolved
@Mic92
Copy link
Member

Mic92 commented May 19, 2024

@mergify squash

Copy link
Contributor

mergify bot commented May 19, 2024

squash

✅ Pull request squashed successfully

Mic92 added a commit to fidgetingbits/nixos-hardware that referenced this pull request May 19, 2024
asus/zenbook/ux371: init

* asus/zenbook/ux371: drop kernel module configuration

* address review feedback

* common/gpu/intel/default.nix: simplify xe assertion
@Mic92 Mic92 force-pushed the asus-zenbook-ux371 branch 2 times, most recently from 18deae7 to f124c47 Compare May 19, 2024 17:11
flake.nix Show resolved Hide resolved
@fidgetingbits fidgetingbits force-pushed the asus-zenbook-ux371 branch 2 times, most recently from 0d0e3b6 to 2d3a56b Compare May 20, 2024 02:07
@fidgetingbits
Copy link
Contributor Author

Fixed a merge conflict with f0cf568, but should be good now.

@Mic92
Copy link
Member

Mic92 commented May 26, 2024

@mergify queue

Copy link
Contributor

mergify bot commented May 26, 2024

queue

🛑 The pull request has been removed from the queue default

The pull request can't be updated.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

@Mic92
Copy link
Member

Mic92 commented May 26, 2024

@mergify rebase

Copy link
Contributor

mergify bot commented May 26, 2024

rebase

✅ Branch has been successfully rebased

@Mic92
Copy link
Member

Mic92 commented May 26, 2024

@mergify queue

Copy link
Contributor

mergify bot commented May 26, 2024

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 2e7d6c5

@mergify mergify bot merged commit 2e7d6c5 into NixOS:master May 26, 2024
3 checks passed
@fidgetingbits fidgetingbits deleted the asus-zenbook-ux371 branch May 26, 2024 11:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants