Merge remote-tracking branch 'upstream/master' into patch-2

README.md

@@ -180,6 +180,7 @@ See code for all available configurations.
 | [HP Elitebook 845g8](hp/elitebook/845/g8)                              | `<nixos-hardware/hp/elitebook/845/g8>`                  |
 | [HP Elitebook 845g9](hp/elitebook/845/g9)                              | `<nixos-hardware/hp/elitebook/845/g9>`                  |
 | [HP Notebook 14-df0023](hp/notebook/14-df0023)                         | `<nixos-hardware/hp/notebook/14-df0023>`                |
+| [HP Laptop 14s-dq2024nf](hp/laptop/14s-dq2024nf)                       | `<nixos-hardware/hp/laptop/14s-dq2024nf>`               |
 | [Huawei Matebook X Pro (2020)](huawei/machc-wa)                        | `<nixos-hardware/huawei/machc-wa>`                      |
 | [i.MX8QuadMax Multisensory Enablement Kit](nxp/imx8qm-mek/)            | `<nixos-hardware/nxp/imx8qm-mek>`                       |
 | [Intel NUC 8i7BEH](intel/nuc/8i7beh/)                                  | `<nixos-hardware/intel/nuc/8i7beh>`                     |

flake.nix

@@ -119,6 +119,7 @@
         hp-elitebook-845g7 = import ./hp/elitebook/845/g7;
         hp-elitebook-845g8 = import ./hp/elitebook/845/g8;
         hp-elitebook-845g9 = import ./hp/elitebook/845/g9;
+        hp-laptop-14s-dq2024nf = import ./hp/laptop/14s-dq2024nf;
         huawei-machc-wa = import ./huawei/machc-wa;
         hp-notebook-14-df0023 = import ./hp/notebook/14-df0023;
         intel-nuc-8i7beh = import ./intel/nuc/8i7beh;

framework/16-inch/common/default.nix

@@ -30,10 +30,16 @@
   # Allow `services.libinput.touchpad.disableWhileTyping` to work correctly.
   # Set unconditionally because libinput can also be configured dynamically via
   # gsettings.
+  #
+  # This is extracted from the quirks file that is in the upstream libinput
+  # source.  Once we can assume everyone is on at least libinput 1.26.0, this
+  # local override file can be removed.
+  # https://gitlab.freedesktop.org/libinput/libinput/-/commit/566857bd98131009699c9ab6efc7af37afd43fd0
   environment.etc."libinput/local-overrides.quirks".text = ''
-    [Serial Keyboards]
+    [Framework Laptop 16 Keyboard Module]
+    MatchName=Framework Laptop 16 Keyboard Module*
     MatchUdevType=keyboard
-    MatchName=Framework Laptop 16 Keyboard Module - ANSI Keyboard
+    MatchDMIModalias=dmi:*svnFramework:pnLaptop16*
     AttrKeyboardIntegration=internal
   '';
 

hp/laptop/14s-dq2024nf/default.nix

@@ -0,0 +1,11 @@
+{ config, lib, ... }:
+
+{
+  imports = [
+    ../../../common/cpu/intel
+    ../../../common/gpu/intel/tiger-lake
+    ../../../common/pc
+    ../../../common/pc/laptop
+    ../../../common/pc/laptop/ssd
+  ];
+}