From 7f8bf5c5258b559aafdf8cc67f3c736e8b584076 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Sun, 4 Aug 2024 09:31:50 +0200
Subject: [PATCH] feat(toplevel): add x13s (proprietary) bluetooth and wifi
 firmware

this allows them to be reused more easily
---
 flake.lock                                    |  30 ++++++++++++++
 flake.nix                                     |  37 ++++++++++++++++++
 misc/x13s_bt_firmware/hpnv21g.b8c.crypt.fw    | Bin 0 -> 6378 bytes
 nix/os/devices/steveej-x13s/configuration.nix |   4 +-
 nix/os/devices/steveej-x13s/flake.lock        |  34 ----------------
 nix/os/devices/steveej-x13s/flake.nix         |  10 -----
 6 files changed, 70 insertions(+), 45 deletions(-)
 create mode 100755 misc/x13s_bt_firmware/hpnv21g.b8c.crypt.fw

diff --git a/flake.lock b/flake.lock
index c5cd20b..03b4e3b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -33,6 +33,22 @@
         "type": "github"
       }
     },
+    "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"
+      }
+    },
     "brainwart_x13s-nixos": {
       "flake": false,
       "locked": {
@@ -823,6 +839,7 @@
       "inputs": {
         "adamcstephens_stop-export": "adamcstephens_stop-export",
         "aphorme_launcher": "aphorme_launcher",
+        "ath11k-firmware": "ath11k-firmware",
         "brainwart_x13s-nixos": "brainwart_x13s-nixos",
         "colmena": "colmena",
         "crane": "crane",
@@ -860,6 +877,7 @@
         "salut": "salut",
         "sops-nix": "sops-nix",
         "srvos": "srvos",
+        "x13s-bt-firmware": "x13s-bt-firmware",
         "yofi": "yofi"
       }
     },
@@ -1057,6 +1075,18 @@
         "type": "github"
       }
     },
+    "x13s-bt-firmware": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-FCWkZp+MtEGS5lS5+pxmpCl4wU9GGRegolebcmCN7RU=",
+        "type": "file",
+        "url": "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qca/hpbtfw21.tlv?id=2ba1beaae0c649ce8a50baecc8df9e81cd524e65"
+      },
+      "original": {
+        "type": "file",
+        "url": "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qca/hpbtfw21.tlv?id=2ba1beaae0c649ce8a50baecc8df9e81cd524e65"
+      }
+    },
     "yofi": {
       "inputs": {
         "flake-utils": "flake-utils_4",
diff --git a/flake.nix b/flake.nix
index 768c194..a63a5c2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -119,6 +119,31 @@
       flake = false;
       url = "github:espanso/espanso/db97658d1d80697a635b57801696c594eacf057b";
     };
+
+    x13s-bt-firmware = {
+      flake = false;
+
+      # revisions for this file: https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/qca/hpbtfw21.tlv
+
+      # 2024-07-29
+      # not working well
+      # url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qca/hpbtfw21.tlv?id=d118dc8ad5562ac0ae0c07be748cbe35a9361b47";
+
+      # 2024-05-30
+      # url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qca/hpbtfw21.tlv?id=436b0a920352d13290043d9ec9e50c420ab10f92";
+
+      # 2023-12-18
+      # not working well
+      # url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qca/hpbtfw21.tlv?id=598f5bd22361d7e92eebe8452d1f8013a1d35b9a";
+
+      # 2013-01-17
+      url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qca/hpbtfw21.tlv?id=2ba1beaae0c649ce8a50baecc8df9e81cd524e65";
+    };
+
+    ath11k-firmware = {
+      url = "git+https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git";
+      flake = false;
+    };
   };
 
   outputs = inputs @ {
@@ -337,6 +362,18 @@
             buildInputs = [
             ];
           };
+
+          x13s-bt-firmware = pkgs.runCommand "x13s-bt-firmware" {} ''
+            mkdir -p $out/lib/firmware/qca
+            cp -v ${self}/misc/x13s_bt_firmware/hpnv21g.b8c.crypt.fw $out/lib/firmware/qca/hpnv21.bin
+            cp -v ${inputs.x13s-bt-firmware} $out/lib/firmware/qca//hpbtfw21.tlv
+          '';
+
+          x13s-ath11k-firmware = pkgs.runCommand "x13s-ath11k-firmware-before" {} ''
+            mkdir -p $out/lib/firmware/ath11k/WCN6855/hw2.1/
+            cp -v ${inputs.ath11k-firmware}/WCN6855/hw2.1/{board-2,regdb}.bin $out/lib/firmware/ath11k/WCN6855/hw2.1/
+            cp -v ${inputs.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/
+          '';
         };
 
         formatter = pkgs.alejandra;
diff --git a/misc/x13s_bt_firmware/hpnv21g.b8c.crypt.fw b/misc/x13s_bt_firmware/hpnv21g.b8c.crypt.fw
new file mode 100755
index 0000000000000000000000000000000000000000..ea5b5b88fbfe2fd9b4df0142dd11527fbf002756
GIT binary patch
literal 6378
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
X-7@w1YtMjvMM1JjlFJfj_c8$hH1=NC

literal 0
HcmV?d00001

diff --git a/nix/os/devices/steveej-x13s/configuration.nix b/nix/os/devices/steveej-x13s/configuration.nix
index 63f932e..41a9b8c 100644
--- a/nix/os/devices/steveej-x13s/configuration.nix
+++ b/nix/os/devices/steveej-x13s/configuration.nix
@@ -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/
diff --git a/nix/os/devices/steveej-x13s/flake.lock b/nix/os/devices/steveej-x13s/flake.lock
index 4d3d60a..724c6e9 100644
--- a/nix/os/devices/steveej-x13s/flake.lock
+++ b/nix/os/devices/steveej-x13s/flake.lock
@@ -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",
diff --git a/nix/os/devices/steveej-x13s/flake.nix b/nix/os/devices/steveej-x13s/flake.nix
index 8a30dbe..110c2ae 100644
--- a/nix/os/devices/steveej-x13s/flake.nix
+++ b/nix/os/devices/steveej-x13s/flake.nix
@@ -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/
-      '';
     };
   };
 }