Merge remote-tracking branch 'upstream/master'

.github/workflows/test.yml

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

common/pc/hdd/default.nix

@@ -1,7 +1,3 @@
 { lib, ... }:
 
-{
-  boot.kernel.sysctl = {
-    "vm.swappiness" = lib.mkDefault 10;
-  };
-}
+{}

common/pc/ssd/default.nix

@@ -1,9 +1,5 @@
 { lib, ... }:
 
 {
-  boot.kernel.sysctl = {
-    "vm.swappiness" = lib.mkDefault 1;
-  };
-
   services.fstrim.enable = lib.mkDefault true;
 }

lenovo/thinkpad/x1/default.nix

@@ -3,6 +3,4 @@
     ../.
     ../../../common/cpu/intel
   ];
-
-  boot.kernelParams = [ "intel_iommu=on" ];
 }

pine64/pinebook-pro/firmware/ap6256-firmware/default.nix

@@ -7,10 +7,9 @@ let
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "rkwifibt";
-    rev = "421b7dd8f3c67f66910710838a0be03f3575a3c9";
-    sha256 = "175qcjfaz7nhpyh0hxiih53k3hly407lkpxgissvldghxrw01ccn";
+    rev = "3524d73251fe4d16f0f873e583aa63b12a90ac26";
+    sha256 = "0ac7z3m5mnmk1qhf9pq9s3y6ky8jmd3ggn8m29797z1ng40q3cka";
   };
-  clm_blob = ./brcmfmac43456-sdio.clm_blob;
 in
 runCommandNoCC "pinebookpro-ap6256-firmware"
 {
@@ -19,10 +18,10 @@ runCommandNoCC "pinebookpro-ap6256-firmware"
   };
 } ''
   (PS4=" $ "; set -x
-  cp ${src}/"firmware/broadcom/all/bt/BCM4345C5.hcd"          "BCM4345C5.hcd"
-  cp ${src}/"firmware/broadcom/all/wifi/fw_bcm43456c5_ag.bin" "fw_bcm43456c5_ag.bin"
-  cp ${clm_blob}                                              "brcmfmac43456-sdio.clm_blob"
-  cp ${src}/"firmware/broadcom/all/wifi/nvram_ap6256.txt"     "nvram_ap6256.txt"
+  cp ${src}/"firmware/broadcom/all/bt/BCM4345C5.hcd"               "BCM4345C5.hcd"
+  cp ${src}/"firmware/broadcom/all/wifi/fw_bcm43456c5_ag.bin"      "fw_bcm43456c5_ag.bin"
+  cp ${src}/"clm_blob/broadcom/AP6256/brcmfmac43456-sdio.clm_blob" "brcmfmac43456-sdio.clm_blob"
+  cp ${src}/"firmware/broadcom/all/wifi/nvram_ap6256.txt"          "nvram_ap6256.txt"
   mkdir -p $out/lib/firmware/brcm
   # Bluetooth firmware
   install -Dm644 "BCM4345C5.hcd" -t "$out/lib/firmware/"