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

gpd/win-mini/2024: add initial configuration #1099

Merged
merged 2 commits into from
Sep 4, 2024
Merged

Conversation

Jdogzz
Copy link
Contributor

@Jdogzz Jdogzz commented Sep 3, 2024

Description of changes

Adding support for GPD Win Mini 2024.

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

@Mic92
Copy link
Member

Mic92 commented Sep 3, 2024

@mergify rebase

Copy link
Contributor

mergify bot commented Sep 3, 2024

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/2)
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git rebase --skip'
interactive rebase in progress; onto f7e31ff
Last command done (1 command done):
   pick ab82b0a lenovo: fix unstable wifi on Yoga laptops
Next command to do (1 remaining command):
   pick d4d2d40 Add basic GPD Mini configuration.
  (use "git rebase --edit-todo" to view and edit)
You are currently rebasing branch 'master' on 'f7e31ff'.
  (all conflicts fixed: run "git rebase --continue")

nothing to commit, working tree clean
Could not apply ab82b0a... lenovo: fix unstable wifi on Yoga laptops

@Mic92
Copy link
Member

Mic92 commented Sep 3, 2024

@mergify squash

Copy link
Contributor

mergify bot commented Sep 3, 2024

squash

✅ Pull request squashed successfully

Mic92 added a commit to Jdogzz/nixos-hardware that referenced this pull request Sep 3, 2024
lenovo: fix unstable wifi on Yoga laptops

Add extra modprobe options to fix unstable wifi on Yoga laptops.

* Merge branch 'NixOS:master' into master

* Add basic GPD Mini configuration.

* Merge branch 'NixOS:master' into master
flake.nix Outdated
import = path: path; # let the module system know what we are exporting
in
{
acer-aspire-4810t = import ./acer/aspire/4810t;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happend in this file?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Mic92 Oops, looks like my formatter from Doom Emacs did that. Since I'm not seeing any formatting guidelines in the contributers file, is it okay to leave it the way it is in the commit or would you like me to switch it back to the way it is in master?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you want to reformat this with nixfmt, than please do so in a different commit to make it easier to filter it out in git blame.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good, I just switched back to the nixos-hardware master format for flake.nix in the latest commit.

@Mic92
Copy link
Member

Mic92 commented Sep 3, 2024

@mergify squash

Add GPD Win Mini 2024 to the configuration list. (NixOS#1099)
lenovo: fix unstable wifi on Yoga laptops

Add extra modprobe options to fix unstable wifi on Yoga laptops.

* Merge branch 'NixOS:master' into master

* Add basic GPD Mini configuration.

* Merge branch 'NixOS:master' into master

* flake: Restore flake.nix to original format

Restore the flake.nix file to the original format from nixos-hardware master.
Copy link
Contributor

mergify bot commented Sep 3, 2024

squash

✅ Pull request squashed successfully

@Mic92 Mic92 changed the title Add GPD Win Mini 2024 to the configuration list. gpd/win-mini/2024: add initial configuration Sep 4, 2024
@Mic92 Mic92 merged commit ba7bb37 into NixOS:master Sep 4, 2024
1 of 2 checks passed
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.

2 participants