diff --git a/flake.lock b/flake.lock index 90ff840..4f3178b 100644 --- a/flake.lock +++ b/flake.lock @@ -733,22 +733,6 @@ "type": "github" } }, - "nixpkgs-otbr": { - "locked": { - "lastModified": 1766776257, - "narHash": "sha256-MG9DnzBn6TdAztaMPVhW9sjYj2bi9Jcux0F0fJ6LeO4=", - "owner": "mrene", - "repo": "nixpkgs", - "rev": "0c4c97066d555b7d27a0a56ee400130ec51f02ee", - "type": "github" - }, - "original": { - "owner": "mrene", - "ref": "openthread-border-router", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1772598333, @@ -783,11 +767,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1772624091, - "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", + "lastModified": 1776548001, + "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", + "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", "type": "github" }, "original": { @@ -876,7 +860,6 @@ "nix-minecraft": "nix-minecraft", "nixgl": "nixgl", "nixpkgs": "nixpkgs_3", - "nixpkgs-otbr": "nixpkgs-otbr", "nixvim": "nixvim", "noctalia": "noctalia", "starship-jj": "starship-jj", diff --git a/flake.nix b/flake.nix index a9e07dc..400b472 100644 --- a/flake.nix +++ b/flake.nix @@ -76,9 +76,6 @@ url = "gitlab:lanastara_foss/starship-jj"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs-otbr = { - url = "github:mrene/nixpkgs/openthread-border-router"; - }; }; outputs = diff --git a/modules/system/home-assistant.nix b/modules/system/home-assistant.nix index 6252949..f5756de 100644 --- a/modules/system/home-assistant.nix +++ b/modules/system/home-assistant.nix @@ -1,13 +1,8 @@ { config, pkgs, inputs, ... }: { - imports = [ - (inputs.nixpkgs-otbr + "/nixos/modules/services/home-automation/openthread-border-router.nix") - ]; - services.openthread-border-router = { enable = true; - package = (import inputs.nixpkgs-otbr { system = pkgs.system; }).openthread-border-router; - backboneInterface = "enp7s0u2c2"; + backboneInterfaces = [ "enp7s0u2c2" ]; radio = { device = "/dev/serial/by-id/usb-Nabu_Casa_ZBT-2_9C139EAAD5E8-if00"; baudRate = 460800; @@ -55,6 +50,7 @@ "spotify" "spotify_connect" "chromecast" + "heos" ]; }; }