steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

feat(toplevel): add x13s (proprietary) bluetooth and wifi firmware

Browse source 
this allows them to be reused more easily
This commit is contained in:
steveej 2024-08-04 09:31:50 +02:00
parent 186488456c
commit 7f8bf5c525
6 changed files with 70 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nix/os/devices/steveej-x13s/configuration.nix
View file

@ -7,6 +7,7 @@
nodeName,
localDomainName,
system,
packages',
...
}: {
nixos-x13s = {
@ -193,7 +194,8 @@
};
hardware.firmware = lib.mkBefore [
nodeFlake.packages.${system}.x13s-ath11k-firmware
packages'.x13s-bt-firmware
packages'.x13s-ath11k-firmware
];
# see https://linrunner.de/tlp/

34
nix/os/devices/steveej-x13s/flake.lock generated
View file

@ -1,21 +1,5 @@
{
"nodes": {
"ath11k-firmware": {
"flake": false,
"locked": {
"lastModified": 1720482684,
"narHash": "sha256-p6ifwtRNUOyQ2FN2VhSXS6dcrvrtiFZawu/iVXQ4uR0=",
"ref": "refs/heads/main",
"rev": "bb527dcebac835c47ed4f5428a7687769fa9b1b2",
"revCount": 152,
"type": "git",
"url": "https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git"
},
"original": {
"type": "git",
"url": "https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git"
}
},
"crane": {
"inputs": {
"nixpkgs": [
@ -141,22 +125,6 @@
"type": "github"
}
},
"mobile-nixos": {
"flake": false,
"locked": {
"lastModified": 1722056346,
"narHash": "sha256-50fcuCppaLMfSOTFO4IkCBs4folToCwlhTgc6IdZFHg=",
"owner": "NixOS",
"repo": "mobile-nixos",
"rev": "717ce90cfadffa449480bae2e155185c651e9993",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "mobile-nixos",
"type": "github"
}
},
"mycelium": {
"inputs": {
"crane": "crane",
@ -291,11 +259,9 @@
},
"root": {
"inputs": {
"ath11k-firmware": "ath11k-firmware",
"disko": "disko",
"get-flake": "get-flake",
"home-manager": "home-manager",
"mobile-nixos": "mobile-nixos",
"mycelium": "mycelium",
"nixos-x13s": "nixos-x13s",
"nixpkgs": "nixpkgs_3",

10
nix/os/devices/steveej-x13s/flake.nix
View file

@ -20,17 +20,12 @@
# nixos-x13s.inputs.nixpkgs.follows = "nixpkgs";
mycelium.url = "github:threefoldtech/mycelium";
ath11k-firmware = {
url = "git+https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git";
flake = false;
};
};
outputs = {
self,
get-flake,
nixpkgs,
ath11k-firmware,
...
}: let
targetPlatform = "aarch64-linux";
@ -93,11 +88,6 @@
};
};
packages.${targetPlatform} = {
x13s-ath11k-firmware = nixpkgs.legacyPackages.${targetPlatform}.runCommand "x13s-ath11k-firmware-before" {} ''
mkdir -p $out/lib/firmware/ath11k/WCN6855/hw2.1/
cp -v ${ath11k-firmware}/WCN6855/hw2.1/{board-2,regdb}.bin $out/lib/firmware/ath11k/WCN6855/hw2.1/
cp -v ${ath11k-firmware}/WCN6855/hw2.1/1.1/WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.41/{amss,m3}.bin $out/lib/firmware/ath11k/WCN6855/hw2.1/
'';
};
};
}