From 2524d87ac00a895c29b03dcb841ba1c5d595d2f0 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Sun, 28 Nov 2021 17:17:22 +0000
Subject: [PATCH] kattv: Updates, new hardware

---
 ci/flake-cron.nix                |  4 ----
 config/hosts/marisa.nix          |  2 +-
 config/services/kattv-ingest.nix |  2 +-
 config/services/kattv.nix        | 12 ++++++------
 config/tf                        |  2 +-
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/ci/flake-cron.nix b/ci/flake-cron.nix
index 5b2020e4..01eac2cc 100644
--- a/ci/flake-cron.nix
+++ b/ci/flake-cron.nix
@@ -77,10 +77,6 @@ with lib; {
     nixpkgs.path = "${channels.nixfiles.inputs.nixpkgs}";
   };
 
-  environment.test = {
-    inherit (channels.nixpkgs) nix;
-  };
-
   jobs.flake-update = {
     tasks.flake-build.inputs = with channels.cipkgs;
       ci.command {
diff --git a/config/hosts/marisa.nix b/config/hosts/marisa.nix
index 743fd8f9..848ea642 100644
--- a/config/hosts/marisa.nix
+++ b/config/hosts/marisa.nix
@@ -6,7 +6,7 @@
     services.nginx
     services.access
     users.kat.server
-  ] ++ optional (meta.trusted ? services) trusted.service.website;
+  ] ++ optional (meta.trusted ? services) trusted.services.website;
 
 
   deploy.tf = {
diff --git a/config/services/kattv-ingest.nix b/config/services/kattv-ingest.nix
index d4b019e5..2a9d06a6 100644
--- a/config/services/kattv-ingest.nix
+++ b/config/services/kattv-ingest.nix
@@ -45,7 +45,7 @@ let
     #psy-tune = "film";
     #noise-reduction=0;
     quantizer = 27;
-    bitrate = 8192;
+    bitrate = 16384;
     rc-lookahead = 6;
   };
   denoise = {
diff --git a/config/services/kattv.nix b/config/services/kattv.nix
index 85ac9918..5abeffaa 100644
--- a/config/services/kattv.nix
+++ b/config/services/kattv.nix
@@ -15,17 +15,17 @@ let
   cameracapture = {
     element."v4l2src" = {
       device = "/dev/videomew";
-      saturation = 100;
-      brightness = 100;
-      extra-controls = "c,exposure_auto=3";
+      #saturation = 100;
+      #brightness = 100;
+      #extra-controls = "c,exposure_auto=3";
     };
   };
   v4l2src = [
     cameracapture
     {
       caps."image/jpeg" = {
-        width = 1280;
-        height = 720;
+        width = 1920;
+        height = 1080;
         framerate = "30/1"; # "10/1"
       };
     }
@@ -44,7 +44,7 @@ let
 in
 {
   services.udev.extraRules = ''
-    KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", SUBSYSTEMS=="usb", ATTR{index}=="0", ATTRS{idVendor}=="045e", ATTRS{idProduct}=="0779", SYMLINK+="videomew", TAG+="systemd"
+    KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", SUBSYSTEMS=="usb", ATTR{index}=="0", ATTRS{idVendor}=="1c3f", ATTRS{idProduct}=="2002", SYMLINK+="videomew", TAG+="systemd"
   '';
 
   systemd.services.kattv = {
diff --git a/config/tf b/config/tf
index 72a3eef0..d7be543d 160000
--- a/config/tf
+++ b/config/tf
@@ -1 +1 @@
-Subproject commit 72a3eef071b64b18fb61d48041f9bc0285a358db
+Subproject commit d7be543d00111eeecd968a63d6b66d333884d899