TheWanderingCrow/CrOS
1
0
Fork 0
mirror of https://github.com/TheWanderingCrow/CrOS.git synced 2026-01-11 01:34:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/test' into prod

Browse source
This commit is contained in:
TheWanderingCrow 2025-09-26 09:29:14 -04:00
commit a673044e06
3 changed files with 81 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

90
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757255839, "lastModified": 1758287904,
"narHash": "sha256-XH33B1X888Xc/xEXhF1RPq/kzKElM0D5C9N6YdvOvIc=", "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "c8a0e78d86b12ea67be6ed0f7cae7f9bfabae75a", "rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -78,11 +78,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1757103352, "lastModified": 1757943327,
"narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "11b2a10c7be726321bb854403fdeec391e798bf0", "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -98,11 +98,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756679287, "lastModified": 1758463745,
"narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -137,11 +137,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1757324011, "lastModified": 1758613710,
"narHash": "sha256-iGAWGz2uG8GsGw9114FZnTcaAn0uiLXDPmYzzuM69w8=", "narHash": "sha256-y+1P5PZpis2C0ouxvecNPQSvYw73QiiQrOkGgMylnq8=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "a0ec3abc11e90afa47150dd2d3607920a63c056c", "rev": "4f2dd01567e4e988eb57a90bc21896bac4a7b06a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -170,11 +170,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1757242823, "lastModified": 1758552132,
"narHash": "sha256-EqZPBr+fPs7uoFCDLxRa8kRcrUgn0kZTVTky/7I81aI=", "narHash": "sha256-GYcO5NbOY5vfY3iygWjOaZy+nYzemP0kacJ5z5E3P3Y=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "22f629c24b9f81a2fcaaf3a79d75128484c6ed78", "rev": "4d4d968d97ebe633d8910ec65908e1ea75fc2b6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -190,11 +190,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757130842, "lastModified": 1758447883,
"narHash": "sha256-4i7KKuXesSZGUv0cLPLfxbmF1S72Gf/3aSypgvVkwuA=", "narHash": "sha256-yGA6MV0E4JSEXqLTb4ZZkmdJZcoQ8HUzihRRX12Bvpg=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "15f067638e2887c58c4b6ba1bdb65a0b61dc58c5", "rev": "25381509d5c91bbf3c30e23abc6d8476d2143cd1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -223,11 +223,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1757068644, "lastModified": 1758427187,
"narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -239,11 +239,11 @@
}, },
"nixpkgs-darwin": { "nixpkgs-darwin": {
"locked": { "locked": {
"lastModified": 1757244434, "lastModified": 1758397774,
"narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=", "narHash": "sha256-ui5ciTMlP4nSkxHAjfJTUCt/INLykPuv/Z7Ifj4GmhA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "092c565d333be1e17b4779ac22104338941d913f", "rev": "c3d456aad3a84fcd76b4bebf8b48be169fc45c31",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -267,11 +267,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1757244434, "lastModified": 1758346548,
"narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=", "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "092c565d333be1e17b4779ac22104338941d913f", "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -283,11 +283,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1757244434, "lastModified": 1758346548,
"narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=", "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "092c565d333be1e17b4779ac22104338941d913f", "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -299,11 +299,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1757068644, "lastModified": 1758427187,
"narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -329,11 +329,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1757244434, "lastModified": 1758346548,
"narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=", "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "092c565d333be1e17b4779ac22104338941d913f", "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -419,11 +419,11 @@
"nvf": "nvf" "nvf": "nvf"
}, },
"locked": { "locked": {
"lastModified": 1757947918, "lastModified": 1758320467,
"narHash": "sha256-06NI3EVGrICbQTOUZkEJrGhYahbmuV2sX1D+/rBEEXA=", "narHash": "sha256-vXn8wn+b8C9ed9NqctP0EvKWFDIcqYOh6AZf4vUkXYY=",
"owner": "TheWanderingCrow", "owner": "TheWanderingCrow",
"repo": "nvix", "repo": "nvix",
"rev": "434fe4ab148485990c3669eadad747e56b2deeec", "rev": "e27d43a5a8843a2807c733392cdef8da49fd6f3a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -456,11 +456,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754988908, "lastModified": 1758425756,
"narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -523,11 +523,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1757179758, "lastModified": 1758577423,
"narHash": "sha256-TIvyWzRt1miQj6Cf5Wy8Qz43XIZX7c4vTVwRLAT5S4Y=", "narHash": "sha256-sB2GAOjhjoWnjU6A/uHNJiY6O3UeztV5pJAN2g1FkXU=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "970728d0d9d1eada342bb8860af214b601139e58", "rev": "03368548ba745e17a85bd631613a59cb2d8469a4",
"type": "github" "type": "github"
}, },
"original": { "original": {

40
modules/services/frigate/default.nix
View file

@ -11,8 +11,9 @@ in
auth.reset_admin_password = true; # roll the admin password every restart, depend on user accounts for long-lived access 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 tls.enabled = false; # off because we're doing ssl through the proxy
mqtt = { mqtt = {
# TODO: add mqtt broker enabled = true;
enabled = false; host = "host.containers.internal";
port = 1883;
}; };
notifications = { notifications = {
enabled = true; enabled = true;
@ -41,6 +42,12 @@ in
wce-0003_sub = [ wce-0003_sub = [
"rtsp://thingino:thingino@192.168.150.3:554/ch1" "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"
];
}; };
}; };
############# #############
@ -56,7 +63,6 @@ in
track = [ track = [
"person" "person"
"cat" "cat"
"car"
"dog" "dog"
]; ];
}; };
@ -98,7 +104,6 @@ in
} }
]; ];
}; };
live.stream_name = "wce-0001_sub";
motion = { motion = {
enabled = true; enabled = true;
mask = [ mask = [
@ -107,6 +112,13 @@ in
]; ];
}; };
detect.enabled = true; detect.enabled = true;
review = {
alerts.labels = [];
detections.labels = [
"person"
"cat"
];
};
}; };
wce-0002 = { wce-0002 = {
ffmpeg = { ffmpeg = {
@ -121,7 +133,6 @@ in
} }
]; ];
}; };
live.stream_name = "wce-0002_sub";
motion = { motion = {
enabled = true; enabled = true;
mask = [ mask = [
@ -144,7 +155,6 @@ in
} }
]; ];
}; };
live.stream_name = "wce-0003_sub";
motion = { motion = {
enabled = true; enabled = true;
mask = [ mask = [
@ -154,6 +164,24 @@ in
}; };
detect.enabled = true; 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 { in {

2
modules/services/mqtt/default.nix
View file

@ -9,4 +9,6 @@
} }
]; ];
}; };
networking.firewall.allowedTCPPorts = [1883];
} }