diff --git a/flake.lock b/flake.lock index fa922aa..2094cdb 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1725432240, + "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "ad416d066ca1222956472ab7d0555a6946746a80", "type": "github" }, "original": { @@ -53,39 +53,21 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1733096140, - "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", + "lastModified": 1725233747, + "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" } }, "root": { "inputs": { "flake-parts": "flake-parts", "linux-jhovold": "linux-jhovold", - "nixpkgs": "nixpkgs", - "x13s-bt-linux-firmware": "x13s-bt-linux-firmware" - } - }, - "x13s-bt-linux-firmware": { - "flake": false, - "locked": { - "lastModified": 1733240564, - "narHash": "sha256-348f+wuX7x8xqaBRkraTclupdnRcwL/z2l/1Bs/reXc=", - "ref": "refs/heads/main", - "rev": "06aea4d8bfd5ca3624b56162b24339d7b0449913", - "revCount": 4282, - "type": "git", - "url": "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" - }, - "original": { - "rev": "06aea4d8bfd5ca3624b56162b24339d7b0449913", - "type": "git", - "url": "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 947b031..0300ea2 100644 --- a/flake.nix +++ b/flake.nix @@ -6,30 +6,6 @@ linux-jhovold.url = "github:jhovold/linux/wip/sc8280xp-6.13-rc1"; linux-jhovold.flake = false; - x13s-bt-linux-firmware = { - flake = false; - - # 2024-12-05 now required by jhovold's (and soon mainline) kernel. need two files from here: hpnv21.b8c hpnv21g.b8c - # url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qca/hpnv21.b8c?id=8d24066f829b97966818fd0d9b5881190670f53f"; - url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git?rev=06aea4d8bfd5ca3624b56162b24339d7b0449913"; - - - # 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"; - }; }; outputs = diff --git a/module.nix b/module.nix index 7e46748..2b87694 100644 --- a/module.nix +++ b/module.nix @@ -28,7 +28,6 @@ let paths = [ modulesClosure x13sPackages.graphics-firmware - x13sPackages.bluetooth-firmware ]; }; in @@ -54,10 +53,7 @@ in environment.systemPackages = [ pkgs.efibootmgr ]; hardware.enableAllFirmware = true; - hardware.firmware = lib.mkBefore [ - x13sPackages.graphics-firmware - x13sPackages.bluetooth-firmware - ]; + hardware.firmware = lib.mkBefore [ x13sPackages.graphics-firmware ]; boot = { initrd.systemd.enable = true; diff --git a/packages/default.nix b/packages/default.nix index bcd7bfe..09f2120 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -47,9 +47,4 @@ in ${lib.getExe pkgs.innoextract} ${gpu-src} cp -v code\$GetExtractPath\$/*/*.mbn "$out/lib/firmware/qcom/sc8280xp/LENOVO/21BX/" ''; - - bluetooth-firmware = pkgs.runCommand "x13s-bluetooth-firmware" { } '' - mkdir -p $out/lib/firmware/qca - cp -v ${inputs.x13s-bt-linux-firmware}/qca/{hpnv21.b8c,hpnv21g.b8c} $out/lib/firmware/qca/ - ''; }