Upgrade NixOS. Use upstream libedgetpu, frigate, and gasket kernel module. Fix services broken by upgrade.
All checks were successful
Check Flake / check-flake (push) Successful in 17m43s
All checks were successful
Check Flake / check-flake (push) Successful in 17m43s
This commit is contained in:
@@ -29,10 +29,10 @@
|
||||
text = ''
|
||||
#!${pkgs.stdenv.shell}
|
||||
set -e
|
||||
${pkgs.kexectools}/bin/kexec -l ${image}/kernel --initrd=${image}/initrd --append="init=${builtins.unsafeDiscardStringContext config.system.build.toplevel}/init ${toString config.boot.kernelParams}"
|
||||
${pkgs.kexec-tools}/bin/kexec -l ${image}/kernel --initrd=${image}/initrd --append="init=${builtins.unsafeDiscardStringContext config.system.build.toplevel}/init ${toString config.boot.kernelParams}"
|
||||
sync
|
||||
echo "executing kernel, filesystems will be improperly umounted"
|
||||
${pkgs.kexectools}/bin/kexec -e
|
||||
${pkgs.kexec-tools}/bin/kexec -e
|
||||
'';
|
||||
};
|
||||
kexec_tarball = pkgs.callPackage (modulesPath + "/../lib/make-system-tarball.nix") {
|
||||
|
||||
@@ -154,7 +154,7 @@
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
|
||||
};
|
||||
hardware.opengl = {
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
intel-media-driver
|
||||
|
||||
@@ -82,9 +82,11 @@ lib.mkMerge [
|
||||
settings = {
|
||||
mqtt = {
|
||||
enabled = true;
|
||||
host = "localhost:1883";
|
||||
host = "localhost";
|
||||
port = 1883;
|
||||
user = "root";
|
||||
password = "{FRIGATE_MQTT_PASSWORD}";
|
||||
};
|
||||
rtmp.enabled = false;
|
||||
snapshots = {
|
||||
enabled = true;
|
||||
bounding_box = true;
|
||||
@@ -145,11 +147,23 @@ lib.mkMerge [
|
||||
systemd.services.frigate.serviceConfig.SupplementaryGroups = [ "apex" ];
|
||||
|
||||
# Coral PCIe driver
|
||||
kernel.enableGasketKernelModule = true;
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; [ gasket ];
|
||||
services.udev.extraRules = ''
|
||||
SUBSYSTEM=="apex", MODE="0660", GROUP="apex"
|
||||
'';
|
||||
|
||||
services.frigate.settings.detectors.coral = {
|
||||
type = "edgetpu";
|
||||
device = "pci";
|
||||
};
|
||||
}
|
||||
{
|
||||
# Fix bug in nixos module where cache is not cleared when starting the service because "rm" cannot be found
|
||||
systemd.services.frigate.serviceConfig.ExecStartPre = lib.mkForce "${pkgs.bash}/bin/sh -c 'rm -f /var/cache/frigate/*.mp4'";
|
||||
}
|
||||
{
|
||||
# Don't require authentication for frigate
|
||||
# This is ok because the reverse proxy already requires tailscale access anyway
|
||||
services.frigate.settings.auth.enabled = false;
|
||||
}
|
||||
]
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
# zfs
|
||||
networking.hostId = "5e6791f0";
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
|
||||
|
||||
# luks
|
||||
remoteLuksUnlock.enable = true;
|
||||
|
||||
@@ -24,12 +24,13 @@
|
||||
homeassistant = true;
|
||||
permit_join = false;
|
||||
serial = {
|
||||
adapter = "ember";
|
||||
port = "/dev/ttyACM0";
|
||||
};
|
||||
mqtt = {
|
||||
server = "mqtt://localhost:1883";
|
||||
user = "root";
|
||||
password = "'!/run/agenix/zigbee2mqtt.yaml mqtt_password'";
|
||||
password = "!/run/agenix/zigbee2mqtt.yaml mqtt_password";
|
||||
};
|
||||
frontend = {
|
||||
host = "localhost";
|
||||
|
||||
@@ -33,9 +33,9 @@
|
||||
hardware.enableAllFirmware = true;
|
||||
|
||||
# ROCm
|
||||
hardware.opengl.extraPackages = with pkgs; [
|
||||
rocm-opencl-icd
|
||||
rocm-opencl-runtime
|
||||
hardware.graphics.extraPackages = with pkgs; [
|
||||
rocmPackages.clr.icd
|
||||
rocmPackages.clr
|
||||
];
|
||||
systemd.tmpfiles.rules = [
|
||||
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
|
||||
|
||||
Reference in New Issue
Block a user