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.

Sign up for GitHub

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

Jump to bottom

Add Asus TUF FX504GD #183

Closed
wants to merge 1 commit into from
Closed

Add Asus TUF FX504GD #183

wants to merge 1 commit into from

Conversation

ImExtends
Copy link
Contributor

Request to add Asus TUF FX504GD to nixos-hardware channel.
Nouveau doesn't work at all on this laptop, so I add nouveau.modeset=0 as a kernel param.

@jonringer
Copy link

I would squash the commits

@ImExtends
Copy link
Contributor Author

I would squash the commits

How do you do that ? Kind of new to git and I didn't fully understand how can I squash multiple commits on a PR, thanks.

@jonringer
Copy link

@ImExtends

to squash the last 3 commits into the 4th, you can do:

git reset HEAD^^^
git add .
git commit --amend --no-edit
git push ... ... --force

This will make your changes appear as 1 commit, instead of 4

@ImExtends
Copy link
Contributor Author

@ImExtends

to squash the last 3 commits into the 4th, you can do:

git reset HEAD^^^
git add .
git commit --amend --no-edit
git push ... ... --force

This will make your changes appear as 1 commit, instead of 4

Thanks a lot, better now ?

@jonringer
Copy link

yea, a lot cleaner, thanks :)

Mic92
Mic92 approved these changes Aug 13, 2020
View reviewed changes
Copy link
Member

@Mic92 Mic92 left a comment

Choose a reason for hiding this comment

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

CI should be fine again.

Mic92
Mic92 reviewed Aug 13, 2020
View reviewed changes
README.md
@@ -128,6 +129,7 @@ See code for all available configurations.
| [Tuxedo InfinityBook v4][] | `<nixos-hardware/tuxedo/infinitybook/v4>` |

[Acer Aspire 4810T]: acer/aspire/4810t
[Asus TUF FX504GD]: asus/fx504gd
Copy link
Member

Choose a reason for hiding this comment

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

It's not yet documented but can you also add it here? https://github.com/NixOS/nixos-hardware/blob/master/flake.nix

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is it good ? I kind of think I messed up a little bit by trying to commit and squash, tell me if I need to change something.

Copy link
Member

Choose a reason for hiding this comment

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

I can squash on merge.

Mic92
Mic92 reviewed Aug 13, 2020
View reviewed changes
flake.nix
@@ -0,0 +1,66 @@
{
Copy link
Member

Choose a reason for hiding this comment

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

This looks indeed weird. I have a look later.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, send a message here if I need to do something.

@Mic92
Copy link
Member

Mic92 commented Aug 13, 2020

merged in #185

@Mic92 Mic92 closed this Aug 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 approved these changes

@ehmry ehmry ehmry approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ImExtends @jonringer @Mic92 @ehmry