aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Andrea Ciceri 2022-04-12 11:30:42 +02:00
parent ad125d3cc8 f4160a629b
commit 3849fd9598
No known key found for this signature in database
GPG key ID: A1FC89532D1C5654
5 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/test.yml vendored
View file

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

6
common/pc/hdd/default.nix
View file

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

4
common/pc/ssd/default.nix
View file

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

2
lenovo/thinkpad/x1/default.nix
View file

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

7
pine64/pinebook-pro/firmware/ap6256-firmware/default.nix
View file

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