Merge branch 'master' into yoga-slim-7

.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@v24
+    - uses: cachix/install-nix-action@v25
       with:
         nix_path: nixpkgs=channel:nixos-unstable
     - name: Show nixpkgs version

dell/xps/13-7390/README.wiki

@@ -17,10 +17,4 @@ to your <code>configuration.nix</code> if you cannot wake from "Sleep". See refe
 == Firmware upgrades ==
 
 Note that this device is supported by [https://fwupd.org/ fwupd].
-To perform firmware upgrades just activate the service
+To perform updates, simply use <code>fwupdmgr</code>.
-
-<code>
-services.fwupd.enable = true;
-</code>
-
-Then use <code>fwupdmgr</code> to perform updates.

dell/xps/13-7390/default.nix

@@ -13,5 +13,9 @@
   # - https://github.com/NixOS/nixos-hardware/issues/173
   boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.6") pkgs.linuxPackages_latest;
 
-  services.thermald.enable = true;
+  # Cooling management
+  services.thermald.enable = lib.mkDefault true;
+
+  # Allows for updating firmware via `fwupdmgr`.
+  services.fwupd.enable = lib.mkDefault true;
 }