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

Dell XPS 15 9530 #881

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions dell/xps/15-9530/README.wiki
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
= Dell XPS 15 9530 =

== Tested Hardware ==

* CPU: 13th Gen Intel(R) Core(TM) i9-13900H
* RAM: 32 GB
* HDD: 1 TiB SSD (NVME)
* Screen: 15" 4k (3456 x 2160)
* Graphics: NVIDIA GeForce RTX 4070 Laptop GPU, with Intel Graphics too.
* Input: Touchscreen and trackpad.
* Fingerprint Reader: Goodix

== Notes ==

== NVIDIA Offload ==

In order to run a program on the NVIDIA gpu, you can use the `nvidia-offload` function, for example:
```
nvidia-offload `nix-shell -p glxinfo --run 'glxgears'`
```
This is a short bash script that sets the proper environment variables and calls your command.

== Fingerprint Reader ==

I have added support for the fingerprint reader. It has however been tested on Gnome only.

- After Installation, I had to reboot once before the fingerprint options would showin the Users module in Gnome Settings
- You will need to register your fingerprints in the Users module in Gnome Settings
- When logging in I suggest using your password otherwise the keyring is not unlocked at login. You can use the fingerprint reader at all other times.

== Touchpad ==

This is a matter of preference, but I do recommend disabling the Touchpad while typing. I hit it with my palm all the time.

Since I am using Gnome, I have done this through Home-Manager using `dconf`.

```
"org/gnome/desktop/peripherals/touchpad" = {
disable-while-typing = true;
};
```
30 changes: 30 additions & 0 deletions dell/xps/15-9530/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{ lib, ... }:
{
imports = [
../../../common/cpu/intel
../../../common/pc/laptop
../../../common/pc/laptop/ssd
./fingerprint
];

# This will save you money and possibly your life!
services.thermald.enable = lib.mkDefault true;

# 9530 wifi is:
# > lspci | grep i Network
# - 00:14.3 Network controller: Intel Corporation Raptor Lake PCH CNVi WiFi (rev 01)
# > sudo lspci -vv -s 00:14.3
# 00:14.3 Network controller: Intel Corporation Raptor Lake PCH CNVi WiFi (rev 01)
# Subsystem: Intel Corporation Wi-Fi 6E AX211 160MHz
#
# WiFi speed is slow and crashes by default (https://bugzilla.kernel.org/show_bug.cgi?id=213381)
# disable_11ax - required until ax driver support is fixed
# power_save - works well on this card
# boot.extraModprobeConfig = ''
# options iwlwifi power_save=1 disable_11ax=1
# '';

boot.extraModprobeConfig = ''
options iwlwifi power_save=1
'';
}
40 changes: 40 additions & 0 deletions dell/xps/15-9530/fingerprint/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{ pkgs, lib, config, ... }: {

environment.systemPackages = [

];

services.fprintd = {
enable = true;
tod = {
enable = true;
driver = pkgs.libfprint-2-tod1-goodix;
};
Comment on lines +9 to +12
Copy link

Choose a reason for hiding this comment

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

Is this section required on the 9530 ? The service works find on 9520 without specifying the tod.


};

# Used to allow a password login on first login as an alternative to just a fingerprint
security.pam.services.login.fprintAuth = false;
# similarly to how other distributions handle the fingerprinting login
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 obvious to me just now how this is different from what NixOS is currently doing.

Copy link
Author

Choose a reason for hiding this comment

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

I likely grabbed that when I was referencing other configuration examples. I should remove it.

Copy link
Author

Choose a reason for hiding this comment

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

Ok, I just tested, and this is how it affects the behaviour.

Without that line, you cannot enter a password when first logging in. It is grayed out. You "have" to use the fingerprint. But then it errors out. After the error, you can enter the password. It very much feels like a broken flow and could be confusing to some users.

By adding this, you remove the failed fingerprint error. You can then use the expected login flows (fingerprint or password). Obviously, if you log in via fingerprint (first login), you will still have to enter your keychain password at some point.

Copy link
Member

Choose a reason for hiding this comment

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

Ok. This is than generally broken in nixpkgs, right?

Copy link
Member

Choose a reason for hiding this comment

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

I will try to reproduce this behavior on a different laptop with Gnome.

Copy link

Choose a reason for hiding this comment

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

I tested this behaviour with KDE Plasma 6 (SDDM), NixOS 24.05 on a XPS 15 9520.

This setting disables the possibility to login using a fingerprint.

The default behaviour, using only services.fprintd.enable = true; requires an interaction from the fingerprint reader after a password has been provided, and then checks whether either is valid: I can provide an invalid or empty password (just press Enter) followed by a valid fingerprint reading to login, or a valid password and any fingerprint reading.

This default behaviour seems better than disabling the fingerprint by default.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think if we want the fingerprint behaviour to be changed, we should upstream to nixpkgs. This is not directly hardware related

security.pam.services.gdm-fingerprint =
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
security.pam.services.gdm-fingerprint =
security.pam.services.gdm-fingerprint = lib.mkDefault

Copy link
Contributor

Choose a reason for hiding this comment

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

Just by glancing at this, I cannot tell what it does, but it does not look hardware related.

lib.mkIf (config.services.fprintd.enable) {
text = ''
auth required pam_shells.so
auth requisite pam_nologin.so
auth requisite pam_faillock.so preauth
auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so
auth optional pam_permit.so
auth required pam_env.so
auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so
auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so

account include login

password required pam_deny.so

session include login
session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
'';
};

}
15 changes: 15 additions & 0 deletions dell/xps/15-9530/nvidia/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{ lib, ... }:
{
imports = [
../default.nix
../../../../common/gpu/nvidia/prime.nix
];

hardware.nvidia.prime = {
# Bus ID of the Intel GPU.
intelBusId = lib.mkDefault "PCI:0:2:0";

# Bus ID of the NVIDIA GPU.
nvidiaBusId = lib.mkDefault "PCI:1:0:0";
};
}