From f472b26c654c9eb9bb61b99170f97118953f46a1 Mon Sep 17 00:00:00 2001 From: TheWanderingCrow Date: Tue, 16 Sep 2025 11:18:37 -0400 Subject: [PATCH 1/4] frigate updates for mqtt and openhab --- modules/services/frigate/default.nix | 6 +++--- modules/services/mqtt/default.nix | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/services/frigate/default.nix b/modules/services/frigate/default.nix index 742f2e2..e7901e0 100644 --- a/modules/services/frigate/default.nix +++ b/modules/services/frigate/default.nix @@ -11,8 +11,9 @@ in auth.reset_admin_password = true; # roll the admin password every restart, depend on user accounts for long-lived access tls.enabled = false; # off because we're doing ssl through the proxy mqtt = { - # TODO: add mqtt broker - enabled = false; + enabled = true; + host = "host.containers.internal"; + port = 1883; }; notifications = { enabled = true; @@ -56,7 +57,6 @@ in track = [ "person" "cat" - "car" "dog" ]; }; diff --git a/modules/services/mqtt/default.nix b/modules/services/mqtt/default.nix index 42b478e..52404f2 100644 --- a/modules/services/mqtt/default.nix +++ b/modules/services/mqtt/default.nix @@ -9,4 +9,6 @@ } ]; }; + + networking.firewall.allowedTCPPorts = [1883]; } From 1e2caff797a0f29c40ab14c3c74d7357bb23c858 Mon Sep 17 00:00:00 2001 From: TheWanderingCrow Date: Wed, 17 Sep 2025 09:46:10 -0400 Subject: [PATCH 2/4] frigate move alerts to detections on wce-0001 --- modules/services/frigate/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/services/frigate/default.nix b/modules/services/frigate/default.nix index e7901e0..4dc38b8 100644 --- a/modules/services/frigate/default.nix +++ b/modules/services/frigate/default.nix @@ -107,6 +107,13 @@ in ]; }; detect.enabled = true; + review = { + alerts.labels = []; + detections.labels = [ + "person" + "cat" + ]; + }; }; wce-0002 = { ffmpeg = { From 0e82037bef3c0675b9b3d2a902a3c9908724046a Mon Sep 17 00:00:00 2001 From: TheWanderingCrow Date: Tue, 23 Sep 2025 09:52:46 -0400 Subject: [PATCH 3/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/c8a0e78d86b12ea67be6ed0f7cae7f9bfabae75a?narHash=sha256-XH33B1X888Xc/xEXhF1RPq/kzKElM0D5C9N6YdvOvIc%3D' (2025-09-07) → 'github:nix-community/disko/67ff9807dd148e704baadbd4fd783b54282ca627?narHash=sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU%3D' (2025-09-19) • Updated input 'hardware': 'github:nixos/nixos-hardware/11b2a10c7be726321bb854403fdeec391e798bf0?narHash=sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH%2Bq462Sn8lrmWmk%3D' (2025-09-05) → 'github:nixos/nixos-hardware/67a709cfe5d0643dafd798b0b613ed579de8be05?narHash=sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM%3D' (2025-09-15) • Updated input 'home-manager': 'github:nix-community/home-manager/07fc025fe10487dd80f2ec694f1cd790e752d0e8?narHash=sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB%2BgTQ%3D' (2025-08-31) → 'github:nix-community/home-manager/3b955f5f0a942f9f60cdc9cacb7844335d0f21c3?narHash=sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA%3D' (2025-09-21) • Updated input 'niri-flake': 'github:sodiboo/niri-flake/a0ec3abc11e90afa47150dd2d3607920a63c056c?narHash=sha256-iGAWGz2uG8GsGw9114FZnTcaAn0uiLXDPmYzzuM69w8%3D' (2025-09-08) → 'github:sodiboo/niri-flake/4f2dd01567e4e988eb57a90bc21896bac4a7b06a?narHash=sha256-y%2B1P5PZpis2C0ouxvecNPQSvYw73QiiQrOkGgMylnq8%3D' (2025-09-23) • Updated input 'niri-flake/niri-unstable': 'github:YaLTeR/niri/22f629c24b9f81a2fcaaf3a79d75128484c6ed78?narHash=sha256-EqZPBr%2BfPs7uoFCDLxRa8kRcrUgn0kZTVTky/7I81aI%3D' (2025-09-07) → 'github:YaLTeR/niri/4d4d968d97ebe633d8910ec65908e1ea75fc2b6d?narHash=sha256-GYcO5NbOY5vfY3iygWjOaZy%2BnYzemP0kacJ5z5E3P3Y%3D' (2025-09-22) • Updated input 'niri-flake/nixpkgs': 'github:NixOS/nixpkgs/8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9?narHash=sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4%3D' (2025-09-05) → 'github:NixOS/nixpkgs/554be6495561ff07b6c724047bdd7e0716aa7b46?narHash=sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc%3D' (2025-09-21) • Updated input 'niri-flake/nixpkgs-stable': 'github:NixOS/nixpkgs/092c565d333be1e17b4779ac22104338941d913f?narHash=sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM%3D' (2025-09-07) → 'github:NixOS/nixpkgs/b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20?narHash=sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E%3D' (2025-09-20) • Updated input 'niri-flake/xwayland-satellite-unstable': 'github:Supreeeme/xwayland-satellite/970728d0d9d1eada342bb8860af214b601139e58?narHash=sha256-TIvyWzRt1miQj6Cf5Wy8Qz43XIZX7c4vTVwRLAT5S4Y%3D' (2025-09-06) → 'github:Supreeeme/xwayland-satellite/03368548ba745e17a85bd631613a59cb2d8469a4?narHash=sha256-sB2GAOjhjoWnjU6A/uHNJiY6O3UeztV5pJAN2g1FkXU%3D' (2025-09-22) • Updated input 'nix-darwin': 'github:lnl7/nix-darwin/15f067638e2887c58c4b6ba1bdb65a0b61dc58c5?narHash=sha256-4i7KKuXesSZGUv0cLPLfxbmF1S72Gf/3aSypgvVkwuA%3D' (2025-09-06) → 'github:lnl7/nix-darwin/25381509d5c91bbf3c30e23abc6d8476d2143cd1?narHash=sha256-yGA6MV0E4JSEXqLTb4ZZkmdJZcoQ8HUzihRRX12Bvpg%3D' (2025-09-21) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/092c565d333be1e17b4779ac22104338941d913f?narHash=sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM%3D' (2025-09-07) → 'github:nixos/nixpkgs/b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20?narHash=sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E%3D' (2025-09-20) • Updated input 'nixpkgs-darwin': 'github:nixos/nixpkgs/092c565d333be1e17b4779ac22104338941d913f?narHash=sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM%3D' (2025-09-07) → 'github:nixos/nixpkgs/c3d456aad3a84fcd76b4bebf8b48be169fc45c31?narHash=sha256-ui5ciTMlP4nSkxHAjfJTUCt/INLykPuv/Z7Ifj4GmhA%3D' (2025-09-20) • Updated input 'nixpkgs-stable': 'github:nixos/nixpkgs/092c565d333be1e17b4779ac22104338941d913f?narHash=sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM%3D' (2025-09-07) → 'github:nixos/nixpkgs/b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20?narHash=sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E%3D' (2025-09-20) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9?narHash=sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4%3D' (2025-09-05) → 'github:nixos/nixpkgs/554be6495561ff07b6c724047bdd7e0716aa7b46?narHash=sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc%3D' (2025-09-21) • Updated input 'nvix': 'github:TheWanderingCrow/nvix/434fe4ab148485990c3669eadad747e56b2deeec?narHash=sha256-06NI3EVGrICbQTOUZkEJrGhYahbmuV2sX1D%2B/rBEEXA%3D' (2025-09-15) → 'github:TheWanderingCrow/nvix/e27d43a5a8843a2807c733392cdef8da49fd6f3a?narHash=sha256-vXn8wn%2Bb8C9ed9NqctP0EvKWFDIcqYOh6AZf4vUkXYY%3D' (2025-09-19) • Updated input 'sops-nix': 'github:mic92/sops-nix/3223c7a92724b5d804e9988c6b447a0d09017d48?narHash=sha256-t%2Bvoe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U%3D' (2025-08-12) → 'github:mic92/sops-nix/e0fdaea3c31646e252a60b42d0ed8eafdb289762?narHash=sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ%2BY%3D' (2025-09-21) --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index c43b6eb..571d8a6 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1757255839, - "narHash": "sha256-XH33B1X888Xc/xEXhF1RPq/kzKElM0D5C9N6YdvOvIc=", + "lastModified": 1758287904, + "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", "owner": "nix-community", "repo": "disko", - "rev": "c8a0e78d86b12ea67be6ed0f7cae7f9bfabae75a", + "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "hardware": { "locked": { - "lastModified": 1757103352, - "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", + "lastModified": 1757943327, + "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", + "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", "type": "github" }, "original": { @@ -98,11 +98,11 @@ ] }, "locked": { - "lastModified": 1756679287, - "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "nix-community", "repo": "home-manager", - "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { @@ -137,11 +137,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1757324011, - "narHash": "sha256-iGAWGz2uG8GsGw9114FZnTcaAn0uiLXDPmYzzuM69w8=", + "lastModified": 1758613710, + "narHash": "sha256-y+1P5PZpis2C0ouxvecNPQSvYw73QiiQrOkGgMylnq8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a0ec3abc11e90afa47150dd2d3607920a63c056c", + "rev": "4f2dd01567e4e988eb57a90bc21896bac4a7b06a", "type": "github" }, "original": { @@ -170,11 +170,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1757242823, - "narHash": "sha256-EqZPBr+fPs7uoFCDLxRa8kRcrUgn0kZTVTky/7I81aI=", + "lastModified": 1758552132, + "narHash": "sha256-GYcO5NbOY5vfY3iygWjOaZy+nYzemP0kacJ5z5E3P3Y=", "owner": "YaLTeR", "repo": "niri", - "rev": "22f629c24b9f81a2fcaaf3a79d75128484c6ed78", + "rev": "4d4d968d97ebe633d8910ec65908e1ea75fc2b6d", "type": "github" }, "original": { @@ -190,11 +190,11 @@ ] }, "locked": { - "lastModified": 1757130842, - "narHash": "sha256-4i7KKuXesSZGUv0cLPLfxbmF1S72Gf/3aSypgvVkwuA=", + "lastModified": 1758447883, + "narHash": "sha256-yGA6MV0E4JSEXqLTb4ZZkmdJZcoQ8HUzihRRX12Bvpg=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "15f067638e2887c58c4b6ba1bdb65a0b61dc58c5", + "rev": "25381509d5c91bbf3c30e23abc6d8476d2143cd1", "type": "github" }, "original": { @@ -223,11 +223,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { @@ -239,11 +239,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1757244434, - "narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=", + "lastModified": 1758397774, + "narHash": "sha256-ui5ciTMlP4nSkxHAjfJTUCt/INLykPuv/Z7Ifj4GmhA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "092c565d333be1e17b4779ac22104338941d913f", + "rev": "c3d456aad3a84fcd76b4bebf8b48be169fc45c31", "type": "github" }, "original": { @@ -267,11 +267,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1757244434, - "narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=", + "lastModified": 1758346548, + "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "092c565d333be1e17b4779ac22104338941d913f", + "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20", "type": "github" }, "original": { @@ -283,11 +283,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1757244434, - "narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=", + "lastModified": 1758346548, + "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "092c565d333be1e17b4779ac22104338941d913f", + "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20", "type": "github" }, "original": { @@ -299,11 +299,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { @@ -329,11 +329,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1757244434, - "narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=", + "lastModified": 1758346548, + "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "092c565d333be1e17b4779ac22104338941d913f", + "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20", "type": "github" }, "original": { @@ -419,11 +419,11 @@ "nvf": "nvf" }, "locked": { - "lastModified": 1757947918, - "narHash": "sha256-06NI3EVGrICbQTOUZkEJrGhYahbmuV2sX1D+/rBEEXA=", + "lastModified": 1758320467, + "narHash": "sha256-vXn8wn+b8C9ed9NqctP0EvKWFDIcqYOh6AZf4vUkXYY=", "owner": "TheWanderingCrow", "repo": "nvix", - "rev": "434fe4ab148485990c3669eadad747e56b2deeec", + "rev": "e27d43a5a8843a2807c733392cdef8da49fd6f3a", "type": "github" }, "original": { @@ -456,11 +456,11 @@ ] }, "locked": { - "lastModified": 1754988908, - "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", + "lastModified": 1758425756, + "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=", "owner": "mic92", "repo": "sops-nix", - "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", + "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762", "type": "github" }, "original": { @@ -523,11 +523,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1757179758, - "narHash": "sha256-TIvyWzRt1miQj6Cf5Wy8Qz43XIZX7c4vTVwRLAT5S4Y=", + "lastModified": 1758577423, + "narHash": "sha256-sB2GAOjhjoWnjU6A/uHNJiY6O3UeztV5pJAN2g1FkXU=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "970728d0d9d1eada342bb8860af214b601139e58", + "rev": "03368548ba745e17a85bd631613a59cb2d8469a4", "type": "github" }, "original": { From f1245d2d243bfd3b478b47a12a7f288ce0f71a08 Mon Sep 17 00:00:00 2001 From: TheWanderingCrow Date: Tue, 23 Sep 2025 14:30:06 -0400 Subject: [PATCH 4/4] playing around with new camera --- modules/services/frigate/default.nix | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/modules/services/frigate/default.nix b/modules/services/frigate/default.nix index 4dc38b8..0b3ba11 100644 --- a/modules/services/frigate/default.nix +++ b/modules/services/frigate/default.nix @@ -42,6 +42,12 @@ in wce-0003_sub = [ "rtsp://thingino:thingino@192.168.150.3:554/ch1" ]; + wce-0004 = [ + "rtsp://192.168.0.210:554/media/live/1/1" + ]; + wce-0004_sub = [ + "rtsp://192.168.0.210:554/media/live/1/2" + ]; }; }; ############# @@ -98,7 +104,6 @@ in } ]; }; - live.stream_name = "wce-0001_sub"; motion = { enabled = true; mask = [ @@ -128,7 +133,6 @@ in } ]; }; - live.stream_name = "wce-0002_sub"; motion = { enabled = true; mask = [ @@ -151,7 +155,6 @@ in } ]; }; - live.stream_name = "wce-0003_sub"; motion = { enabled = true; mask = [ @@ -161,6 +164,24 @@ in }; detect.enabled = true; }; + wce-0004 = { + ffmpeg = { + inputs = [ + { + path = "rtsp://127.0.0.1:8554/wce-0004"; + roles = ["record"]; + } + { + path = "rtsp://127.0.0.1:8554/wce-0004_sub"; + roles = ["detect"]; + } + ]; + }; + motion = { + enabled = true; + }; + detect.enabled = true; + }; }; }); in {