hosts/vps1: add route for skycam

flake.lock: Update
Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/7f1857b31522062a6a00f88cbccf86b43acceed1?narHash=sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84%3D' (2025-06-16) → 'github:nix-community/disko/8fd2d6c75009ac75f9a6fb18c33a239806778d01?narHash=sha256-kD88T/NqmcgfOBFAwphN30ccaUdj6K6%2BLG0XdM2w2LA%3D' (2025-06-23) • Updated input 'hyprland': 'github:hyprwm/Hyprland/8b1d5560cf1ca2c4c2624914de284d315502a092?narHash=sha256-a6SN50G3JLZV7OQoQL9O7vNFVO9uR9/2arJcqUpI4EU%3D' (2025-06-21) → 'github:hyprwm/Hyprland/cf7e3aa448f8c9e0d9e8f407e6ed730da55acc69?narHash=sha256-uxIwiV1p2SVNIoP%2BoD025lZKfq4zNn7CmdaYVoskqnQ%3D' (2025-06-23) • Updated input 'hyprland-plugins': 'github:hyprwm/hyprland-plugins/8b4405ab46cafc471d5b09ff7258676dc9aaca59?narHash=sha256-/qnR7/GvGP1cGtOOm4OGJRtkVejn75/jsvJpiqE1ZDk%3D' (2025-06-21) → 'github:hyprwm/hyprland-plugins/132e610b6526820fa1bcf33588be11538fb92ca7?narHash=sha256-ZA00aPfBtrSTz6UsZ6uoBfy2UYi49A9XpxxyKUjbQ2A%3D' (2025-06-23) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/08f22084e6085d19bcfb4be30d1ca76ecb96fe54?narHash=sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50%3D' (2025-06-19) → 'github:NixOS/nixpkgs/4206c4cb56751df534751b058295ea61357bbbaa?narHash=sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc%3D' (2025-06-21) • Updated input 'pre-commit-hooks': 'github:cachix/git-hooks.nix/623c56286de5a3193aa38891a6991b28f9bab056?narHash=sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4%3D' (2025-06-11) → 'github:cachix/git-hooks.nix/fae816c55a75675f30d18c9cbdecc13b970d95d4?narHash=sha256-uLtw0iF9mQ94L831NOlQLPX9wm0qzd5yim3rcwACEoM%3D' (2025-06-23)
2025-06-23 18:43:22 +01:00 · 2025-06-23 17:22:41 +01:00 · 2025-06-22 23:03:31 +01:00 · 2025-06-22 20:43:46 +01:00 · 2025-06-22 18:18:03 +01:00 · 2025-06-22 18:03:52 +01:00
23 changed files with 755 additions and 238 deletions
--- a/flake.lock
+++ b/flake.lock
@ -41,11 +41,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749155310,
-        "narHash": "sha256-t0HfHg/1+TbSra5s6nNM0o4tnb3uqWedShSpZXsUMYY=",
+        "lastModified": 1750372185,
+        "narHash": "sha256-lVBKxd9dsZOH1fA6kSE5WNnt8e+09fN+NL/Q3BjTWHY=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "94981cf75a9f11da0b6dd6a1abbd7c50a36ab2d3",
+        "rev": "7cef49d261cbbe537e8cb662485e76d29ac4cbca",
        "type": "github"
      },
      "original": {
@ -119,11 +119,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1750040002,
-        "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=",
+        "lastModified": 1750680230,
+        "narHash": "sha256-kD88T/NqmcgfOBFAwphN30ccaUdj6K6+LG0XdM2w2LA=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1",
+        "rev": "8fd2d6c75009ac75f9a6fb18c33a239806778d01",
        "type": "github"
      },
      "original": {
@ -446,11 +446,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749238452,
-        "narHash": "sha256-8qiKEWcxUrjpUpK+WyFNg/72C8rp70LUuyTD23T+SdQ=",
+        "lastModified": 1750371717,
+        "narHash": "sha256-cNP+bVq8m5x2Rl6MTjwfQLCdwbVmKvTH7yqVc1SpiJM=",
        "owner": "hyprwm",
        "repo": "hyprgraphics",
-        "rev": "c7225d73755a6c4c7c72f4d4f3925ea426e325a8",
+        "rev": "15c6f8f3a567fec9a0f732cd310a7ff456deef88",
        "type": "github"
      },
      "original": {
@ -475,11 +475,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1750373382,
-        "narHash": "sha256-HsBt7sl2ODSHv1LxKxA47j7klCqY4k3fE4SQGnEO0Ac=",
+        "lastModified": 1750681989,
+        "narHash": "sha256-uxIwiV1p2SVNIoP+oD025lZKfq4zNn7CmdaYVoskqnQ=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "8ebff1948ff665ff6a1b49fb715b7de0797fae04",
+        "rev": "cf7e3aa448f8c9e0d9e8f407e6ed730da55acc69",
        "type": "github"
      },
      "original": {
@ -505,11 +505,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1750408892,
-        "narHash": "sha256-SDhYYByonfW1jdKSe68GukGWSbOuuxzkMVRTXSsU7g0=",
+        "lastModified": 1750682153,
+        "narHash": "sha256-ZA00aPfBtrSTz6UsZ6uoBfy2UYi49A9XpxxyKUjbQ2A=",
        "owner": "hyprwm",
        "repo": "hyprland-plugins",
-        "rev": "f49193f8e0b3eb167fc105107791a22fdb1d283f",
+        "rev": "132e610b6526820fa1bcf33588be11538fb92ca7",
        "type": "github"
      },
      "original": {
@ -598,11 +598,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749155776,
-        "narHash": "sha256-t1PM0wxQLQwv2F2AW23uA7pm5giwmcgYEWbNIRct9r4=",
+        "lastModified": 1750371812,
+        "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=",
        "owner": "hyprwm",
        "repo": "hyprland-qtutils",
-        "rev": "396e8aa1c06274835b69da7f9a015fff9a9b7522",
+        "rev": "b13c7481e37856f322177010bdf75fccacd1adc8",
        "type": "github"
      },
      "original": {
@ -627,11 +627,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749145882,
-        "narHash": "sha256-qr0KXeczF8Sma3Ae7+dR2NHhvG7YeLBJv19W4oMu6ZE=",
+        "lastModified": 1750371198,
+        "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "1bfb84f54d50c7ae6558c794d3cfd5f6a7e6e676",
+        "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b",
        "type": "github"
      },
      "original": {
@ -652,11 +652,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749819919,
-        "narHash": "sha256-7F/KG8dwSH9JXdlpOVrEEArS+PJSn0iEnx5eVCk89/I=",
+        "lastModified": 1750371096,
+        "narHash": "sha256-JB1IeJ41y7kWc/dPGV6RMcCUM0Xj2NEK26A2Ap7EM9c=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "57ab2a867d8b554ad89f29060c15efd11631db91",
+        "rev": "38f3a211657ce82a1123bf19402199b67a410f08",
        "type": "github"
      },
      "original": {
@ -677,11 +677,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749145760,
-        "narHash": "sha256-IHaGWpGrv7seFWdw/1A+wHtTsPlOGIKMrk1TUIYJEFI=",
+        "lastModified": 1750371869,
+        "narHash": "sha256-lGk4gLjgZQ/rndUkzmPYcgbHr8gKU5u71vyrjnwfpB4=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
-        "rev": "817918315ea016cc2d94004bfb3223b5fd9dfcc6",
+        "rev": "aa38edd6e3e277ae6a97ea83a69261a5c3aab9fd",
        "type": "github"
      },
      "original": {
@ -823,11 +823,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1750365781,
-        "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=",
+        "lastModified": 1750506804,
+        "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54",
+        "rev": "4206c4cb56751df534751b058295ea61357bbbaa",
        "type": "github"
      },
      "original": {
@ -854,11 +854,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1749794982,
-        "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
+        "lastModified": 1750365781,
+        "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
+        "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54",
        "type": "github"
      },
      "original": {
@ -870,11 +870,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1750259320,
-        "narHash": "sha256-H8J4H2XCIMEJ5g6fZ179QfQvsc2dUqhqfBjC8RAHNRY=",
+        "lastModified": 1750400657,
+        "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9ba04bda9249d5d5e5238303c9755de5a49a79c5",
+        "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37",
        "type": "github"
      },
      "original": {
@ -893,11 +893,11 @@
        "systems": "systems_5"
      },
      "locked": {
-        "lastModified": 1750149910,
-        "narHash": "sha256-M0WNjAy2FCHJAb1hEp+J2gnMk707K5/iTA24amEu/s8=",
+        "lastModified": 1750512587,
+        "narHash": "sha256-kZqTQEARUkkKDFhECd0MGU4wXCJcxCdh5WeM/yD6oI4=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "1252966779a5632a3cd5238e442d55a1d2f56660",
+        "rev": "b04bcdcbba4aa648903e065ad1907a97d4f7aee9",
        "type": "github"
      },
      "original": {
@ -962,11 +962,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749636823,
-        "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=",
+        "lastModified": 1750684550,
+        "narHash": "sha256-uLtw0iF9mQ94L831NOlQLPX9wm0qzd5yim3rcwACEoM=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "623c56286de5a3193aa38891a6991b28f9bab056",
+        "rev": "fae816c55a75675f30d18c9cbdecc13b970d95d4",
        "type": "github"
      },
      "original": {
@ -1000,11 +1000,11 @@
    "secrets": {
      "flake": false,
      "locked": {
-        "lastModified": 1748905535,
-        "narHash": "sha256-lRWIpo//dTT7kqtiuaeAITbL535eHImpcpcIfAg2wxs=",
+        "lastModified": 1750611706,
+        "narHash": "sha256-bKhQ+lAaNtfpTUR3fysCdbnMfYT5PJ4diiM9EkHMdHI=",
        "ref": "refs/heads/master",
-        "rev": "c6f23eddf543b4de1c8c596e51be1d5ba1137673",
-        "revCount": 32,
+        "rev": "ae16fda90546dde6c014a4f91a5443bce4dce234",
+        "revCount": 34,
        "type": "git",
        "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
      },
@ -1150,11 +1150,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749490041,
-        "narHash": "sha256-R9Dn9IyUdPaJHD2Oqd7XJnnxpka6M6UYw4Ld0iA46HM=",
+        "lastModified": 1750372504,
+        "narHash": "sha256-VBeZb1oqZM1cqCAZnFz/WyYhO8aF/ImagI7WWg/Z3Og=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "3cf35e178bc192ee51e3fddfd69e531e2c106a30",
+        "rev": "400308fc4f9d12e0a93e483c2e7a649e12af1a92",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -136,6 +136,7 @@
              nixfmt-rfc-style.enable = true;
              trim-trailing-whitespace.enable = true;
            };
+            excludes = [ "pkgs/libcamera-rpi/libcamera-rpi-ipa-priv-key.pem" ];
          };
        }));

--- a/hosts/library/README.md
+++ b/hosts/library/README.md
@ -8,12 +8,12 @@ Media and public file server.
 * Chipset - AMD B550
 * Memory - 64 GB DDR4
 * Motherboard - ASRock B550M Pro4
-* Case - Fractal Design Node 804
+* Case - JMCD-12S4

 ### Disks
 Device | Partitions _(filesystem, size, usage)_
 --- | ---
-Samsung 980 Evo | `/dev/nvme0n1p1` (EFI, 512 MiB, NixOS Boot) <br> `/dev/nvme0n1p2` (ZFS `rpool`, 200 GiB, NixOS Root)
+Samsung 970 Evo Plus | `/dev/nvme0n1p1` (EFI, 512 MiB, NixOS Boot) <br> `/dev/nvme0n1p2` (ZFS `rpool`, 200 GiB, NixOS Root)

 #### ZFS datasets
 ```
--- a/hosts/library/ai.nix
+++ b/hosts/library/ai.nix
@ -31,4 +31,8 @@
      };
    environmentFile = config.age.secrets."files/services/open-webui/envfile".path;
  };
+
+  modules.services.borgmatic.directories = [
+    "/var/lib/private/open-webui"
+  ];
 }
--- a/hosts/library/default.nix
+++ b/hosts/library/default.nix
@ -8,6 +8,7 @@
    ./ai.nix
    ./grafana.nix
    ./jellyfin.nix
+    ./jellysearch.nix
    ./nginx.nix
    ./prometheus.nix
    ./tunnel.nix
@ -19,7 +20,10 @@
  boot = {
    loader.systemd-boot.enable = true;
    loader.efi.canTouchEfiVariables = true;
-    zfs.extraPools = [ "library" ];
+    zfs.extraPools = [
+      "downloads"
+      "library"
+    ];
  };

  networking = {
--- a/hosts/library/jellysearch.nix
+++ b/hosts/library/jellysearch.nix
@ -0,0 +1,58 @@
+{
+  inputs,
+  config,
+  pkgs,
+  ...
+}:
+
+{
+  age.secrets."files/services/meilisearch/envfile" = {
+    file = "${inputs.secrets}/files/services/meilisearch/envfile.age";
+  };
+
+  services.meilisearch = {
+    enable = true;
+    package = pkgs.meilisearch;
+    masterKeyEnvironmentFile = config.age.secrets."files/services/meilisearch/envfile".path;
+  };
+
+  users.users.jellysearch = {
+    group = "jellysearch";
+    isSystemUser = true;
+  };
+
+  users.groups.jellysearch = { };
+
+  systemd.services.jellysearch = {
+    enable = true;
+    description = "JellySearch";
+    wantedBy = [ "multi-user.target" ];
+    after = [ "network-online.target" ];
+    wants = [ "network-online.target" ];
+    serviceConfig = {
+      Restart = "on-failure";
+      ExecStart = "${pkgs.jellysearch}/bin/jellysearch";
+      StateDirectory = "jellysearch";
+      StateDirectoryMode = "0750";
+      WorkingDirectory = "/var/lib/jellysearch";
+      EnvironmentFile = config.age.secrets."files/services/meilisearch/envfile".path;
+
+      NoNewPrivileges = true;
+      SystemCallArchitectures = "native";
+      RestrictRealtime = true;
+      RestrictSUIDSGID = true;
+      ProtectHostname = true;
+      LockPersonality = true;
+      PrivateDevices = true;
+      PrivateUsers = true;
+      RemoveIPC = true;
+    };
+    environment = {
+      DOTNET_ENVIRONMENT = "Production";
+      INDEX_CRON = "0 0 0/2 ? * * *";
+      JELLYFIN_URL = "http://localhost:8096";
+      JELLYFIN_CONFIG_DIR = "${toString config.services.jellyfin.dataDir}";
+      MEILI_URL = "http://localhost:${toString config.services.meilisearch.listenPort}";
+    };
+  };
+}
--- a/hosts/library/nginx.nix
+++ b/hosts/library/nginx.nix
@ -63,9 +63,17 @@
            }
          ];
          locations."/" = {
-            proxyPass = "http://localhost:8096";
            extraConfig =
-              proxyConfig
+              ''
+                # Proxy JellySearch first
+                if ($arg_searchTerm) {
+                  proxy_pass http://localhost:5000;
+                  break;
+                }
+
+                proxy_pass http://localhost:8096;
+              ''
+              + proxyConfig
              + ''
                proxy_set_header Range $http_range;
                proxy_set_header If-Range $http_if_range;
--- a/hosts/pi/default.nix
+++ b/hosts/pi/default.nix
@ -9,6 +9,7 @@
    inputs.nixos-hardware.nixosModules.raspberry-pi-4
    ./hardware-configuration.nix
    ./home-assistant
+    ./snapcast.nix
    ../server.nix
  ];

--- a/hosts/pi/home-assistant/default.nix
+++ b/hosts/pi/home-assistant/default.nix
@ -63,7 +63,6 @@
      };
      media_player = [ ];
      mobile_app = { };
-      onkyo = { };
      open_meteo = { };
      recorder = {
        purge_keep_days = 365;
--- a/hosts/pi/snapcast.nix
+++ b/hosts/pi/snapcast.nix
@ -0,0 +1,43 @@
+{
+  pkgs,
+  ...
+}:
+
+{
+  # Put all sinks in pipewire group
+  services.pipewire.systemWide = true;
+
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    publish = {
+      enable = true;
+      domain = true;
+      addresses = true;
+    };
+  };
+
+  services.snapserver = {
+    enable = true;
+    streams = {
+      default = {
+        type = "file";
+        location = "/var/lib/snapserver/test.wav";
+        sampleFormat = "44100:16:2";
+        codec = "flac";
+      };
+    };
+  };
+
+  systemd.services.snapclient = {
+    wantedBy = [ "multi-user.target" ];
+    after = [ "pipewire.service" ];
+    requires = [ "pipewire.service" ];
+    description = "Snapcast client";
+    serviceConfig = {
+      ExecStart = "${pkgs.snapcast}/bin/snapclient -h 127.0.0.1 --player pulse --mixer hardware";
+      DynamicUser = true;
+      SupplementaryGroups = [ "pipewire" ];
+    };
+  };
+}
--- a/hosts/skycam/default.nix
+++ b/hosts/skycam/default.nix
@ -1,73 +1,16 @@
 {
-  inputs,
-  config,
  pkgs,
  ...
 }:

 {
  imports = [
-    inputs.nixos-hardware.nixosModules.raspberry-pi-4
    ./hardware-configuration.nix
    ../server.nix
  ];

  nixpkgs.hostPlatform = "aarch64-linux";

-  hardware = {
-    raspberry-pi."4" = {
-      apply-overlays-dtmerge.enable = true;
-      audio.enable = false;
-      xhci.enable = false;
-    };
-    deviceTree = {
-      enable = true;
-      filter = "*rpi-4-*.dtb";
-      # From https://github.com/Electrostasy/dots/blob/3b81723feece67610a252ce754912f6769f0cd34/hosts/phobos/klipper.nix#L43-L65
-      overlays =
-        let
-          mkCompatibleDtsFile =
-            dtbo:
-            let
-              drv =
-                pkgs.runCommand "fix-dts"
-                  {
-                    nativeBuildInputs = with pkgs; [
-                      dtc
-                      gnused
-                    ];
-                  }
-                  ''
-                    mkdir "$out"
-                    dtc -I dtb -O dts ${dtbo} | sed -e 's/bcm2835/bcm2711/' > $out/overlay.dts
-                  '';
-            in
-            "${drv}/overlay.dts";
-
-          inherit (config.boot.kernelPackages) kernel;
-        in
-        [
-          {
-            name = "imx708.dtbo";
-            dtsFile = mkCompatibleDtsFile "${kernel}/dtbs/overlays/imx708.dtbo";
-          }
-          {
-            name = "vc4-kms-v3d-pi4.dtbo";
-            dtsFile = mkCompatibleDtsFile "${kernel}/dtbs/overlays/vc4-kms-v3d-pi4.dtbo";
-          }
-        ];
-    };
-    firmware = with pkgs; [
-      firmwareLinuxNonfree
-    ];
-  };
-
-  services.udev.extraRules = ''
-    SUBSYSTEM=="rpivid-*", GROUP="video", MODE="0660"
-    KERNEL=="vcsm-cma", GROUP="video", MODE="0660"
-    SUBSYSTEM=="dma_heap", GROUP="video", MODE="0660"
-  '';
-
  networking = {
    hostId = "731d1660";
    firewall = {
@ -77,26 +20,50 @@
    };
  };

-  systemd.services.ustreamer = {
-    enable = true;
-    description = "uStreamer service";
-    unitConfig = {
-      Type = "simple";
-      ConditionPathExists = "/sys/bus/i2c/drivers/imx708/10-001a/video4linux";
+  services.go2rtc =
+    let
+      rpicam-vid = "${pkgs.rpicam-apps}/bin/rpicam-vid";
+    in
+    {
+      enable = true;
+      settings = {
+        streams.rpicam = "exec:${rpicam-vid} -v1 -t0 -o- --inline --width=4608 --height=2592 --framerate=14 --codec mjpeg --quality 90 --denoise=cdn_off --sharpness 1.25 --exposure long --gain 3";
+      };
    };
-    serviceConfig = {
-      ExecStart = ''
-        ${pkgs.libcamera}/bin/libcamerify ${pkgs.unstable.ustreamer}/bin/ustreamer \
-                --host=0.0.0.0 \
-                --resolution=4608x2592
+
+  systemd.services.skycam-archiver =
+    let
+      snapshotScript = pkgs.writeShellScript "skycam-archiver" ''
+        ${pkgs.lib.getExe pkgs.curl} -s -o "/var/lib/skycam-archiver/snapshot-$(date +%Y%m%d-%H%M%S).jpg" "http://skycam.mesh.vimium.net:1984/api/frame.jpeg?src=rpicam"
      '';
-      DynamicUser = "yes";
-      SupplementaryGroups = [ "video" ];
-      Restart = "always";
-      RestartSec = 10;
+    in
+    {
+      description = "Capture skycam snapshot and save with timestamp";
+      serviceConfig = {
+        Type = "oneshot";
+        StateDirectory = "skycam-archiver";
+        ExecStart = "${snapshotScript}";
+      };
+      requires = [ "go2rtc.service" ];
+      after = [ "go2rtc.service" ];
    };
-    wantedBy = [ "network-online.target" ];
-    confinement.mode = "chroot-only";
+
+  systemd.timers.skycam-archiver = {
+    description = "Timer for capturing skycam snapshots every 30 minutes";
+    wantedBy = [ "timers.target" ];
+    timerConfig = {
+      OnBootSec = "5min";
+      OnUnitActiveSec = "30min";
+      Unit = "skycam-archiver.service";
+    };
+  };
+
+  modules.services.borgmatic = {
+    enable = true;
+    directories = [
+      "/var/lib/skycam-archiver"
+    ];
+    repoPath = "ssh://m94ekv2i@m94ekv2i.repo.borgbase.com/./repo";
  };

  environment.systemPackages = with pkgs; [
@ -105,8 +72,7 @@
    libcamera
    libraspberrypi
    raspberrypi-eeprom
-    v4l-utils
-    unstable.ustreamer
+    rpicam-apps
  ];

  system.stateVersion = "24.05";
--- a/hosts/skycam/hardware-configuration.nix
+++ b/hosts/skycam/hardware-configuration.nix
@ -1,18 +1,20 @@
 {
+  inputs,
+  config,
  lib,
+  pkgs,
  modulesPath,
  ...
 }:

 {
  imports = [
+    inputs.nixos-hardware.nixosModules.raspberry-pi-4
    (modulesPath + "/installer/sd-card/sd-image-aarch64.nix")
  ];

  boot = {
-    kernelModules = [ "bcm2835-v4l2" ];
    kernelParams = [
-      "cma=512M"
      "panic=0"
    ];
    supportedFilesystems = lib.mkForce [
@ -23,6 +25,61 @@
    tmp.cleanOnBoot = false;
  };

+  hardware = {
+    raspberry-pi."4" = {
+      apply-overlays-dtmerge.enable = true;
+      audio.enable = false;
+      xhci.enable = false;
+    };
+    deviceTree = {
+      enable = true;
+      filter = "*rpi-4-*.dtb";
+      # From https://github.com/Electrostasy/dots/blob/3b81723feece67610a252ce754912f6769f0cd34/hosts/phobos/klipper.nix#L43-L65
+      overlays =
+        let
+          mkCompatibleDtsFile =
+            dtbo:
+            let
+              drv =
+                pkgs.runCommand "fix-dts"
+                  {
+                    nativeBuildInputs = with pkgs; [
+                      dtc
+                      gnused
+                    ];
+                  }
+                  ''
+                    mkdir "$out"
+                    dtc -I dtb -O dts ${dtbo} | sed -e 's/bcm2835/bcm2711/' > $out/overlay.dts
+                  '';
+            in
+            "${drv}/overlay.dts";
+
+          inherit (config.boot.kernelPackages) kernel;
+        in
+        [
+          {
+            name = "imx708.dtbo";
+            dtsFile = mkCompatibleDtsFile "${kernel}/dtbs/overlays/imx708.dtbo";
+          }
+          {
+            name = "vc4-kms-v3d-pi4.dtbo";
+            dtsFile = mkCompatibleDtsFile "${kernel}/dtbs/overlays/vc4-kms-v3d-pi4.dtbo";
+          }
+        ];
+    };
+    firmware = with pkgs; [
+      firmwareLinuxNonfree
+    ];
+  };
+
+  services.udev.extraRules = ''
+    SUBSYSTEM=="rpivid-*", GROUP="video", MODE="0660"
+    KERNEL=="vcsm-cma", GROUP="video", MODE="0660"
+    SUBSYSTEM=="dma_heap", GROUP="video", MODE="0660"
+    SUBSYSTEM=="dma_heap", KERNEL=="linux,cma", SYMLINK+="dma_heap/vidbuf_cached", OPTIONS+="link_priority=-50"
+  '';
+
  nixpkgs.overlays = [
    (final: super: {
      makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; });
--- a/hosts/vps1/nginx.nix
+++ b/hosts/vps1/nginx.nix
@ -136,13 +136,16 @@ in
          enableACME = true;
          serverAliases = [ "www.jdholt.com" ];
          extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders;
+          locations."/skycam" = {
+            root = "/var/www/jdholt.com";
+          };
          locations."/skycam/snapshot.jpg" = {
            extraConfig = ''
-              set $backend "skycam.mesh.vimium.net:8080";
+              set $backend "skycam.mesh.vimium.net:1984";

              resolver 100.100.100.100;

-              proxy_pass http://$backend/snapshot;
+              proxy_pass http://$backend/api/frame.jpeg?src=rpicam;
              proxy_cache skycam_cache;
              proxy_cache_valid any 10s;
              proxy_ignore_headers Cache-Control Expires Set-Cookie;
--- a/pkgs/jellysearch/nuget-deps.json
+++ b/pkgs/jellysearch/nuget-deps.json
@ -0,0 +1,172 @@
+[
+  {
+    "pname": "MeiliSearch",
+    "version": "0.15.0",
+    "hash": "sha256-MM8Z8xc+AG0m+jNXAHSLhUB2egJC4lI+u6BDTVaOwzg="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.OpenApi",
+    "version": "8.0.4",
+    "hash": "sha256-Y/UnyBlwraJjxDmEO3vsgB63GO1M7OXyIS10vL1Fs5A="
+  },
+  {
+    "pname": "Microsoft.Data.Sqlite",
+    "version": "8.0.6",
+    "hash": "sha256-t1g1cF4T26Np10H7opo/vCMTMNb9SS9pmLA9pSCUBp4="
+  },
+  {
+    "pname": "Microsoft.Data.Sqlite.Core",
+    "version": "8.0.6",
+    "hash": "sha256-MgUBbb0LDM1ixm8pBfBrSTVjNoGFn6NQMD36mirELmo="
+  },
+  {
+    "pname": "Microsoft.Extensions.ApiDescription.Server",
+    "version": "6.0.5",
+    "hash": "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "2.1.1",
+    "hash": "sha256-TzbYgz4EemrYKHMvB9HWDkFmq0BkTetKPUwBpYHk9+k="
+  },
+  {
+    "pname": "Microsoft.IdentityModel.Abstractions",
+    "version": "7.4.0",
+    "hash": "sha256-rzTsvh5hDX7zk6wYzUKNg7lIQf38G/EeR6qUq/j3Eo0="
+  },
+  {
+    "pname": "Microsoft.IdentityModel.JsonWebTokens",
+    "version": "7.4.0",
+    "hash": "sha256-IeezkUkScumgLQZqq2Zu4YsyldIUA/XpTeONB2AtYDc="
+  },
+  {
+    "pname": "Microsoft.IdentityModel.Logging",
+    "version": "7.4.0",
+    "hash": "sha256-rudTpYcSlIlE1OX2LO3Qd6DAisqd5vsuX/Edu7rHIJs="
+  },
+  {
+    "pname": "Microsoft.IdentityModel.Tokens",
+    "version": "7.4.0",
+    "hash": "sha256-qVqVYxBy5p6Jerd1rfMUgApV7vcH54N4neS2x+N5zRQ="
+  },
+  {
+    "pname": "Microsoft.OpenApi",
+    "version": "1.2.3",
+    "hash": "sha256-OafkxXKnDmLZo5tjifjycax0n0F/OnWQTEZCntBMYR0="
+  },
+  {
+    "pname": "Microsoft.OpenApi",
+    "version": "1.4.3",
+    "hash": "sha256-vk47e78OwopXJx2LhDRbKFObqF3GShHfNHR2SzvbQeA="
+  },
+  {
+    "pname": "Microsoft.Win32.SystemEvents",
+    "version": "6.0.0",
+    "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
+  },
+  {
+    "pname": "Quartz",
+    "version": "3.10.0",
+    "hash": "sha256-1sb+JKJdS01lScgVjcbDHxbXSpHeMn1Mqg/CQ8r+BKI="
+  },
+  {
+    "pname": "SQLitePCLRaw.bundle_e_sqlite3",
+    "version": "2.1.6",
+    "hash": "sha256-dZD/bZsYXjOu46ZH5Y/wgh0uhHOqIxC+S+0ecKhr718="
+  },
+  {
+    "pname": "SQLitePCLRaw.core",
+    "version": "2.1.6",
+    "hash": "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E="
+  },
+  {
+    "pname": "SQLitePCLRaw.lib.e_sqlite3",
+    "version": "2.1.6",
+    "hash": "sha256-uHt5d+SFUkSd6WD7Tg0J3e8eVoxy/FM/t4PAkc9PJT0="
+  },
+  {
+    "pname": "SQLitePCLRaw.provider.e_sqlite3",
+    "version": "2.1.6",
+    "hash": "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8="
+  },
+  {
+    "pname": "Swashbuckle.AspNetCore",
+    "version": "6.4.0",
+    "hash": "sha256-czuCv3Os7Oo06m3W+auJjrTGuYT82E+Bi80sJqeVb8o="
+  },
+  {
+    "pname": "Swashbuckle.AspNetCore.Swagger",
+    "version": "6.4.0",
+    "hash": "sha256-1u4A9vzDUJ+wLoxH5yQEVhpOxi+VnAMd64Z18SLqjPE="
+  },
+  {
+    "pname": "Swashbuckle.AspNetCore.SwaggerGen",
+    "version": "6.4.0",
+    "hash": "sha256-Alra5J+i0L/4JoS5pATJexVu8LId8HZcofkx7KiRqMw="
+  },
+  {
+    "pname": "Swashbuckle.AspNetCore.SwaggerUI",
+    "version": "6.4.0",
+    "hash": "sha256-P84wlE4EVruLVGGTUHK29wWYs/BTq/MR5P7PuSBwr+c="
+  },
+  {
+    "pname": "System.Configuration.ConfigurationManager",
+    "version": "6.0.1",
+    "hash": "sha256-U/0HyekAZK5ya2VNfGA1HeuQyJChoaqcoIv57xLpzLQ="
+  },
+  {
+    "pname": "System.Drawing.Common",
+    "version": "6.0.0",
+    "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
+  },
+  {
+    "pname": "System.IdentityModel.Tokens.Jwt",
+    "version": "7.4.0",
+    "hash": "sha256-LYvdJPbPuxr8V3FJacStflSf9GVStprl1Wr+dfgqMdw="
+  },
+  {
+    "pname": "System.Memory",
+    "version": "4.5.3",
+    "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="
+  },
+  {
+    "pname": "System.Net.Http.Json",
+    "version": "6.0.0",
+    "hash": "sha256-R4s4Fb3OTKpg9gXSv+8CQ9gPJPJMmj3/nagzaRndm+g="
+  },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "6.0.0",
+    "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
+  },
+  {
+    "pname": "System.Security.AccessControl",
+    "version": "6.0.0",
+    "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="
+  },
+  {
+    "pname": "System.Security.Cryptography.ProtectedData",
+    "version": "6.0.0",
+    "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="
+  },
+  {
+    "pname": "System.Security.Permissions",
+    "version": "6.0.0",
+    "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="
+  },
+  {
+    "pname": "System.Text.Encodings.Web",
+    "version": "6.0.0",
+    "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "6.0.0",
+    "hash": "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo="
+  },
+  {
+    "pname": "System.Windows.Extensions",
+    "version": "6.0.0",
+    "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="
+  }
+]
--- a/pkgs/jellysearch/package.nix
+++ b/pkgs/jellysearch/package.nix
@ -0,0 +1,36 @@
+{
+  lib,
+  fetchFromGitLab,
+  buildDotnetModule,
+  dotnetCorePackages,
+}:
+
+buildDotnetModule rec {
+  pname = "jellysearch";
+  version = "0.0.1";
+
+  src = fetchFromGitLab {
+    owner = "DomiStyle";
+    repo = "JellySearch";
+    rev = "7397e3f8c7daa6f0d30b22dda7c5159a913ca6b8";
+    hash = "sha256-7t0j4S5A9yvRN8zjToMNsxJ72OjU3j++EAqq9CKcPaI=";
+  };
+
+  patches = [
+    ./patches/Only-listen-on-loopback-interface.patch
+  ];
+
+  projectFile = "src/JellySearch/JellySearch.csproj";
+  executables = [ "jellysearch" ];
+  nugetDeps = ./nuget-deps.json;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
+
+  meta = with lib; {
+    description = "A fast full-text search proxy for Jellyfin";
+    homepage = "https://gitlab.com/DomiStyle/jellysearch";
+    license = licenses.mit;
+    mainProgram = "JellySearch";
+    platforms = dotnet-runtime.meta.platforms;
+  };
+}
--- a/pkgs/jellysearch/patches/Only-listen-on-loopback-interface.patch
+++ b/pkgs/jellysearch/patches/Only-listen-on-loopback-interface.patch
@ -0,0 +1,24 @@
+From dede2b55ef53028b1347ccb731657a12d7fa3d15 Mon Sep 17 00:00:00 2001
+From: Jordan Holt <jordan@vimium.com>
+Date: Sun, 22 Jun 2025 17:16:56 +0100
+Subject: [PATCH] Only listen on loopback interface
+
+---
+ src/JellySearch/Program.cs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/JellySearch/Program.cs b/src/JellySearch/Program.cs
+index a0c6ee1..98798f7 100644
+--- a/src/JellySearch/Program.cs
+++ b/src/JellySearch/Program.cs
+@@ -6,7 +6,7 @@ using Quartz.Impl;
+
+ var builder = WebApplication.CreateBuilder(args);
+
+-builder.WebHost.UseUrls("http://0.0.0.0:5000"); // Listen on every IP
+builder.WebHost.UseUrls("http://127.0.0.1:5000"); // Listen on loopback only
+
+ builder.Services.AddCors(options =>
+ {
+--
+2.49.0
--- a/pkgs/libcamera-rpi/libcamera-rpi-ipa-priv-key.pem
+++ b/pkgs/libcamera-rpi/libcamera-rpi-ipa-priv-key.pem
@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCocmtyzPPjv+52
+JiZrpZFfaZ0eeUgugc8gV+0+2Q9GEkl/xxqjiDVg31gBO3iwQov2NmGuPbXr+vwZ
+QcUqNQakmmdi22tBaTtd6hMuhu9OfbP8sIFaf0dToZRHkPgf63+WCF6w0O9enEz4
+zjW3kPa1eVRVekiYCXGML/VhN+h5WwWouNWgEOw5JH39ZuGmhsGN5XekkHtyMkwq
+Vr+JodoSizhYs9VBYNA1J4PlyiS4BYr4pLiLffzPwRjcSS777x33g+nWNr1lsFxB
+nDoVvVnq0E7fiXxlmCtAr/7dv0Ug5ixuNfZ9yoT0f+mfUiG/anmfodHujIm2Db37
+jvmfxaq1AgMBAAECggEAFhJKBHSY92xod0g37A55fiZFTV8oZ1mgdXU386522yBd
+y5Wf5rIcBmm1axHrFjNeCgClq3JQEk/kdP3Ccy2YBXzq04/7HYrHmd5oLYZGOINt
+kExjYqN/SdTH7FmxPWN66AKIP8RcvQmfZ1GDxd4DiZNQitO3S96e53bIQPkVp8Lg
+GfK6LQCdOGimD00wvRoeqbV0PWGGVMfx+KvD5hxKYolyi/hNUxToD28qCAoMlMTi
+yL+17q3nIYZvUmL0k7d64U+lXF8ov3cVXNJzAzFi41MXZ2Xqk3Lj+IhNweUhlOyn
+fTo8QntNlirNL/XmtJ+5mPbGufE/6zsSNOf2Cyz2aQKBgQDio/tA3tFBzOz31hox
+gW6NKarhp7e5R3XHQjZPmQXKq2lGCTBN+LzwCLYDa+ZWkS+cel/xSbkUFl0dopCu
+7uGrSvmVAv+l1k879WHsYmLlDjJSa8WmDtVQ0SJr70X9UJmD2BivWnTnzrpZFu2A
+Nv57gvebJTI4tLfAAyIfbg8gOQKBgQC+RJRv8/jVha/4sPonQYvpH0scS0Xzwca6
+xd23e+vULBpk7IVzMbVGJEDdfWXVJeAO++FSQcgTJA38nfYm2XRPZAProliLaW8o
+XVhhhWbXP7Jc8BmL5zyfDaLOXNFBX2kfr/oKeOoQ+0dRDlWKlarw1SxC+RT6i2qQ
+YETgXHKmXQKBgGk8mWsqy2HRZOtDqE/6eLnlciprtVy7+M14Sj21oUHVTAGwPJTH
+/fs7IEEAdikWK1RuYmRoxh60r7IWDTadR35BRxjRFqILnCkMLNcVbDRN3kH1NwZ/
+dr+bDG+v4ADazx2wVu39g7Erhc3eXpOddZcmXhDVObeo+nWXPt33PeDJAoGBAJ4v
+FVnuo8Tee1Cfogat87W5KSedIcnqSjpjt+Y2MXq8PrNplnSjwrE42UCd6KRvcnX
+Ykr4Q/ad+D75uYgtLMVAuv2yWPl3bCJcETnrJkh5PbqFKEgntT/rn1sA0j0OrSDa
+NwFz6+64a1+ZkkcJDjjykr0Px4BSXwOv9jOuyOdFAoGADZEADOLX5y4utxboe1M0
+UnaFKGEDE6H8qdRJQ9bSvEwJI142al02CvnvqvP4cpd8rKOCRs9nSXFJFXCedTLy
+ojSVfjTyJMTVJxab/c/Qugkxb/TqGfEnZF2yoTsfPYp2pXRd6DvyKlDQzlSOj933
+FrqeSe1QKapuPRsujVwLZDU=
+-----END PRIVATE KEY-----
--- a/pkgs/libcamera-rpi/package.nix
+++ b/pkgs/libcamera-rpi/package.nix
@ -0,0 +1,66 @@
+{
+  lib,
+  fetchFromGitHub,
+  libcamera,
+  boost,
+  nlohmann_json,
+  python3Packages,
+  git,
+  cacert,
+  meson,
+}:
+libcamera.overrideAttrs (old: {
+  buildInputs = old.buildInputs ++ [
+    boost
+    nlohmann_json
+  ];
+  nativeBuildInputs = old.nativeBuildInputs ++ [ python3Packages.pybind11 ];
+
+  BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
+  BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
+
+  patches = [
+    ./patches/libcamera-installed.patch
+    ./patches/libcamera-no-timeout.patch
+  ];
+
+  postPatch =
+    old.postPatch
+    + ''
+      patchShebangs src/py/libcamera
+    '';
+
+  preBuild = ''
+    ninja src/ipa-priv-key.pem
+    install -D ${./libcamera-rpi-ipa-priv-key.pem} src/ipa-priv-key.pem
+  '';
+
+  mesonFlags = old.mesonFlags ++ [
+    "--buildtype=release"
+    "-Dcam=disabled"
+    "-Dgstreamer=disabled"
+    "-Dipas=rpi/vc4,rpi/pisp"
+    "-Dpipelines=rpi/vc4,rpi/pisp"
+    "-Dtest=false"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "raspberrypi";
+    repo = "libcamera";
+    rev = "d83ff0a4ae4503bc56b7ed48cd142c3dd423ad3b";
+    sha256 = "sha256-VP0s1jOON9J3gn81aiemsChvGeqx0PPivQF5rmSga6M=";
+
+    nativeBuildInputs = [ git ];
+
+    postFetch = ''
+      cd "$out"
+
+      export NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
+
+      ${lib.getExe meson} subprojects download \
+        libpisp
+
+      find subprojects -type d -name .git -prune -execdir rm -r {} +
+    '';
+  };
+})
--- a/pkgs/libcamera-rpi/patches/libcamera-installed.patch
+++ b/pkgs/libcamera-rpi/patches/libcamera-installed.patch
@ -0,0 +1,53 @@
+From e65bbb6e263d99212cd29a32d89e4c45d0c05353 Mon Sep 17 00:00:00 2001
+From: Jordan Holt <jordan@vimium.com>
+Date: Sat, 21 Jun 2025 18:38:38 +0100
+Subject: [PATCH] libcamera installed
+
+---
+ src/libcamera/source_paths.cpp | 9 ---------
+ src/py/libcamera/meson.build   | 4 ++--
+ 2 files changed, 2 insertions(+), 11 deletions(-)
+
+diff --git a/src/libcamera/source_paths.cpp b/src/libcamera/source_paths.cpp
+index 1af5386a..3fc7d044 100644
+--- a/src/libcamera/source_paths.cpp
+++ b/src/libcamera/source_paths.cpp
+@@ -39,15 +39,6 @@ namespace {
+  */
+ bool isLibcameraInstalled()
+ {
+-	/*
+-	 * DT_RUNPATH (DT_RPATH when the linker uses old dtags) is removed on
+-	 * install.
+-	 */
+-	for (const ElfW(Dyn) *dyn = _DYNAMIC; dyn->d_tag != DT_NULL; ++dyn) {
+-		if (dyn->d_tag == DT_RUNPATH || dyn->d_tag == DT_RPATH)
+-			return false;
+-	}
+-
+ 	return true;
+ }
+
+diff --git a/src/py/libcamera/meson.build b/src/py/libcamera/meson.build
+index 596a203c..c0b1db59 100644
+--- a/src/py/libcamera/meson.build
+++ b/src/py/libcamera/meson.build
+@@ -34,14 +34,14 @@ gen_py_controls = files('gen-py-controls.py')
+ pycamera_sources += custom_target('py_gen_controls',
+                                   input : controls_files,
+                                   output : ['py_controls_generated.cpp'],
+-                                  command : [gen_py_controls, '--mode', 'controls', '-o', '@OUTPUT@',
+                                  command : ['python3', gen_py_controls, '--mode', 'controls', '-o', '@OUTPUT@',
+                                              '-t', gen_py_controls_template, '@INPUT@'],
+                                   env : py_build_env)
+
+ pycamera_sources += custom_target('py_gen_properties',
+                                   input : properties_files,
+                                   output : ['py_properties_generated.cpp'],
+-                                  command : [gen_py_controls, '--mode', 'properties', '-o', '@OUTPUT@',
+                                  command : ['python3', gen_py_controls, '--mode', 'properties', '-o', '@OUTPUT@',
+                                              '-t', gen_py_controls_template, '@INPUT@'],
+                                   env : py_build_env)
+
+--
+2.49.0
--- a/pkgs/libcamera-rpi/patches/libcamera-no-timeout.patch
+++ b/pkgs/libcamera-rpi/patches/libcamera-no-timeout.patch
@ -0,0 +1,29 @@
+From 98918c4efdcf03701908bb756f252ba11b59490b Mon Sep 17 00:00:00 2001
+From: Jordan Holt <jordan@vimium.com>
+Date: Sat, 21 Jun 2025 18:41:54 +0100
+Subject: [PATCH] libcamera no timeout
+
+---
+ src/libcamera/ipc_pipe_unixsocket.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/libcamera/ipc_pipe_unixsocket.cpp b/src/libcamera/ipc_pipe_unixsocket.cpp
+index 668ec73b..faf7e2a5 100644
+--- a/src/libcamera/ipc_pipe_unixsocket.cpp
+++ b/src/libcamera/ipc_pipe_unixsocket.cpp
+@@ -130,11 +130,13 @@ int IPCPipeUnixSocket::call(const IPCUnixSocket::Payload &message,
+ 	/* \todo Make this less dangerous, see IPCPipe::sendSync() */
+ 	timeout.start(2000ms);
+ 	while (!iter->second.done) {
+	#if 0
+ 		if (!timeout.isRunning()) {
+ 			LOG(IPCPipe, Error) << "Call timeout!";
+ 			callData_.erase(iter);
+ 			return -ETIMEDOUT;
+ 		}
+	#endif
+
+ 		Thread::current()->eventDispatcher()->processEvents();
+ 	}
+--
+2.49.0
--- a/pkgs/rpicam-apps/package.nix
+++ b/pkgs/rpicam-apps/package.nix
@ -0,0 +1,68 @@
+{
+  stdenv,
+  callPackage,
+  fetchFromGitHub,
+  makeWrapper,
+  meson,
+  ninja,
+  pkg-config,
+  boost,
+  ffmpeg-headless,
+  libdrm,
+  libepoxy,
+  libexif,
+  libjpeg,
+  libpng,
+  libtiff,
+  libX11,
+}:
+let
+  libcamera-rpi = callPackage (import ../libcamera-rpi/package.nix) { };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "rpicam-apps";
+  version = "1.7.0";
+
+  src = fetchFromGitHub {
+    owner = "raspberrypi";
+    repo = "rpicam-apps";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-79qpAfY83YOZdM5ZPyIOkg3s7x75hvjG6Cc96UAIdb0=";
+  };
+
+  buildInputs = [
+    boost
+    ffmpeg-headless
+    libcamera-rpi
+    libdrm
+    libepoxy # GLES/EGL preview window
+    libexif
+    libjpeg
+    libpng
+    libtiff
+    libX11
+  ];
+
+  nativeBuildInputs = [
+    makeWrapper
+    meson
+    ninja
+    pkg-config
+  ];
+
+  # See all options here: https://github.com/raspberrypi/rpicam-apps/blob/main/meson_options.txt
+  mesonFlags = [
+    "-Denable_drm=disabled"
+    "-Denable_egl=disabled"
+    "-Denable_hailo=disabled"
+    "-Denable_qt=disabled"
+    "-Denable_libav=disabled"
+  ];
+
+  postInstall = ''
+    for f in rpicam-hello rpicam-jpeg rpicam-raw rpicam-still rpicam-vid
+    do
+      wrapProgram $out/bin/$f --set-default LIBCAMERA_IPA_PROXY_PATH ${libcamera-rpi}/libexec/libcamera
+    done
+  '';
+})
--- a/pkgs/streamrip/ensure-the-default-config-file-is-writable.patch
+++ b/pkgs/streamrip/ensure-the-default-config-file-is-writable.patch
@ -1,25 +0,0 @@
-From 18efb9b5c8e562b169425f6ba79977e52e8b91b9 Mon Sep 17 00:00:00 2001
-From: Pavel Sobolev <paveloomm@gmail.com>
-Date: Sat, 13 Jan 2024 12:49:45 +0000
-Subject: [PATCH] Ensure the default config file is writable.
-
---
- streamrip/config.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/streamrip/config.py b/streamrip/config.py
-index 7ee2f57..88a5fef 100644
--- a/streamrip/config.py
-+++ b/streamrip/config.py
-@@ -378,6 +378,9 @@ def set_user_defaults(path: str, /):
-     """Update the TOML file at the path with user-specific default values."""
-     shutil.copy(BLANK_CONFIG_PATH, path)
-
-+    # Ensure the default config file is writable
-+    os.chmod(path, 0o644)
-+
-     with open(path) as f:
-         toml = parse(f.read())
-     toml["downloads"]["folder"] = DEFAULT_DOWNLOADS_FOLDER  # type: ignore
--
-2.42.0
--- a/pkgs/streamrip/package.nix
+++ b/pkgs/streamrip/package.nix
@ -1,78 +0,0 @@
-{
-  lib,
-  python3Packages,
-  fetchFromGitHub,
-
-  ffmpeg,
-}:
-
-python3Packages.buildPythonApplication {
-  pname = "streamrip";
-  version = "2.0.7";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "nathom";
-    repo = "streamrip";
-    rev = "46b570dbb6f81d604cbaa3bfa379463e0a20a841";
-    hash = "sha256-LD99OjguaBnrQxCwmCeHvmBMq5aOfobwnMd5/aCRZW8=";
-  };
-
-  patches = [
-    ./ensure-the-default-config-file-is-writable.patch
-  ];
-
-  nativeBuildInputs = with python3Packages; [
-    poetry-core
-  ];
-
-  propagatedBuildInputs = with python3Packages; [
-    aiodns
-    aiofiles
-    aiohttp
-    aiolimiter
-    appdirs
-    cleo
-    click-help-colors
-    deezer-py
-    m3u8
-    mutagen
-    pathvalidate
-    pillow
-    pycryptodomex
-    pytest-asyncio
-    pytest-mock
-    rich
-    simple-term-menu
-    tomlkit
-    tqdm
-  ];
-
-  nativeCheckInputs = with python3Packages; [
-    pytestCheckHook
-  ];
-
-  prePatch = ''
-    sed -i 's#aiofiles = ".*"#aiofiles = "*"#' pyproject.toml
-    sed -i 's#deezer-py = ".*"#deezer-py = "*"#' pyproject.toml
-    sed -i 's#m3u8 = ".*"#m3u8 = "*"#' pyproject.toml
-    sed -i 's#pathvalidate = ".*"#pathvalidate = "*"#' pyproject.toml
-    sed -i 's#Pillow = ".*"#Pillow = "*"#' pyproject.toml
-    sed -i 's#pytest-asyncio = ".*"#pytest-asyncio = "*"#' pyproject.toml
-    sed -i 's#tomlkit = ".*"#tomlkit = "*"#' pyproject.toml
-
-    sed -i 's#"ffmpeg"#"${lib.getBin ffmpeg}/bin/ffmpeg"#g' streamrip/client/downloadable.py
-  '';
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
-  meta = with lib; {
-    description = "Scriptable music downloader for Qobuz, Tidal, SoundCloud, and Deezer";
-    homepage = "https://github.com/nathom/streamrip";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ paveloom ];
-    mainProgram = "rip";
-  };
-}
Author	SHA1	Message	Date
Jordan Holt	14d8f23d54	hosts/vps1: add route for skycam All checks were successful Check flake / build-amd64-linux (push) Successful in 1m19s Details	2025-06-23 18:43:22 +01:00
Jordan Holt	47bcec6b0d	flake.lock: Update All checks were successful Check flake / build-amd64-linux (push) Successful in 1m47s Details Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/7f1857b31522062a6a00f88cbccf86b43acceed1?narHash=sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84%3D' (2025-06-16) → 'github:nix-community/disko/8fd2d6c75009ac75f9a6fb18c33a239806778d01?narHash=sha256-kD88T/NqmcgfOBFAwphN30ccaUdj6K6%2BLG0XdM2w2LA%3D' (2025-06-23) • Updated input 'hyprland': 'github:hyprwm/Hyprland/8b1d5560cf1ca2c4c2624914de284d315502a092?narHash=sha256-a6SN50G3JLZV7OQoQL9O7vNFVO9uR9/2arJcqUpI4EU%3D' (2025-06-21) → 'github:hyprwm/Hyprland/cf7e3aa448f8c9e0d9e8f407e6ed730da55acc69?narHash=sha256-uxIwiV1p2SVNIoP%2BoD025lZKfq4zNn7CmdaYVoskqnQ%3D' (2025-06-23) • Updated input 'hyprland-plugins': 'github:hyprwm/hyprland-plugins/8b4405ab46cafc471d5b09ff7258676dc9aaca59?narHash=sha256-/qnR7/GvGP1cGtOOm4OGJRtkVejn75/jsvJpiqE1ZDk%3D' (2025-06-21) → 'github:hyprwm/hyprland-plugins/132e610b6526820fa1bcf33588be11538fb92ca7?narHash=sha256-ZA00aPfBtrSTz6UsZ6uoBfy2UYi49A9XpxxyKUjbQ2A%3D' (2025-06-23) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/08f22084e6085d19bcfb4be30d1ca76ecb96fe54?narHash=sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50%3D' (2025-06-19) → 'github:NixOS/nixpkgs/4206c4cb56751df534751b058295ea61357bbbaa?narHash=sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc%3D' (2025-06-21) • Updated input 'pre-commit-hooks': 'github:cachix/git-hooks.nix/623c56286de5a3193aa38891a6991b28f9bab056?narHash=sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4%3D' (2025-06-11) → 'github:cachix/git-hooks.nix/fae816c55a75675f30d18c9cbdecc13b970d95d4?narHash=sha256-uLtw0iF9mQ94L831NOlQLPX9wm0qzd5yim3rcwACEoM%3D' (2025-06-23)	2025-06-23 17:22:41 +01:00
Jordan Holt	fb15ef954b	hosts/pi: add snapcast All checks were successful Check flake / build-amd64-linux (push) Successful in 1m15s Details	2025-06-22 23:03:31 +01:00
Jordan Holt	6a8016dd66	home-assistant: configure onkyo in UI All checks were successful Check flake / build-amd64-linux (push) Successful in 1m15s Details	2025-06-22 20:43:46 +01:00
Jordan Holt	8a110a8f30	pkgs/streamrip: remove All checks were successful Check flake / build-amd64-linux (push) Successful in 1m17s Details	2025-06-22 18:18:03 +01:00
Jordan Holt	c71208da11	open-webui: backup private directory All checks were successful Check flake / build-amd64-linux (push) Successful in 1m16s Details	2025-06-22 18:03:52 +01:00
Jordan Holt	c1ded6c3ce	hosts/skycam: backup skycam-archiver directory	2025-06-22 18:02:32 +01:00
Jordan Holt	68b09a34d2	hosts/library: backup open-webui state directory All checks were successful Check flake / build-amd64-linux (push) Successful in 1m16s Details	2025-06-22 17:44:51 +01:00
Jordan Holt	c57bbad8e5	pkgs/jellysearch: only listen on loopback interface All checks were successful Check flake / build-amd64-linux (push) Successful in 1m19s Details	2025-06-22 17:19:08 +01:00
Jordan Holt	2aa6dd2aa7	hosts/library: fix jellysearch service All checks were successful Check flake / build-amd64-linux (push) Successful in 1m16s Details	2025-06-22 17:14:16 +01:00
Jordan Holt	532427c07f	pkgs/jellysearch: init at 0.0.1 All checks were successful Check flake / build-amd64-linux (push) Successful in 1m16s Details	2025-06-22 17:00:54 +01:00
Jordan Holt	3fb607752b	hosts/library: use meilisearch 1.14 All checks were successful Check flake / build-amd64-linux (push) Successful in 1m16s Details	2025-06-22 14:38:36 +01:00
Jordan Holt	e0c0ae3ee7	hosts/library: add jellysearch All checks were successful Check flake / build-amd64-linux (push) Successful in 1m17s Details	2025-06-22 14:21:39 +01:00
Jordan Holt	fed69bbc80	hosts/library: import downloads zpool All checks were successful Check flake / build-amd64-linux (push) Successful in 1m16s Details	2025-06-22 13:29:05 +01:00
Jordan Holt	ac95c15e34	hosts/library: update README.md	2025-06-22 13:27:41 +01:00
Jordan Holt	b4ffc4ec0b	hosts/skycam: add archiver script All checks were successful Check flake / build-amd64-linux (push) Successful in 1m16s Details	2025-06-22 10:56:52 +01:00
Jordan Holt	a578aaa922	hosts/skycam: adjust camera settings All checks were successful Check flake / build-amd64-linux (push) Successful in 1m17s Details	2025-06-22 10:02:53 +01:00
Jordan Holt	48ac90515d	flake.lock: Update All checks were successful Check flake / build-amd64-linux (push) Successful in 1m18s Details Flake lock file updates: • Updated input 'hyprland': 'github:hyprwm/Hyprland/8ebff1948ff665ff6a1b49fb715b7de0797fae04?narHash=sha256-HsBt7sl2ODSHv1LxKxA47j7klCqY4k3fE4SQGnEO0Ac%3D' (2025-06-19) → 'github:hyprwm/Hyprland/8b1d5560cf1ca2c4c2624914de284d315502a092?narHash=sha256-a6SN50G3JLZV7OQoQL9O7vNFVO9uR9/2arJcqUpI4EU%3D' (2025-06-21) • Updated input 'hyprland/aquamarine': 'github:hyprwm/aquamarine/94981cf75a9f11da0b6dd6a1abbd7c50a36ab2d3?narHash=sha256-t0HfHg/1%2BTbSra5s6nNM0o4tnb3uqWedShSpZXsUMYY%3D' (2025-06-05) → 'github:hyprwm/aquamarine/7cef49d261cbbe537e8cb662485e76d29ac4cbca?narHash=sha256-lVBKxd9dsZOH1fA6kSE5WNnt8e%2B09fN%2BNL/Q3BjTWHY%3D' (2025-06-19) • Updated input 'hyprland/hyprgraphics': 'github:hyprwm/hyprgraphics/c7225d73755a6c4c7c72f4d4f3925ea426e325a8?narHash=sha256-8qiKEWcxUrjpUpK%2BWyFNg/72C8rp70LUuyTD23T%2BSdQ%3D' (2025-06-06) → 'github:hyprwm/hyprgraphics/15c6f8f3a567fec9a0f732cd310a7ff456deef88?narHash=sha256-cNP%2BbVq8m5x2Rl6MTjwfQLCdwbVmKvTH7yqVc1SpiJM%3D' (2025-06-19) • Updated input 'hyprland/hyprland-qtutils': 'github:hyprwm/hyprland-qtutils/396e8aa1c06274835b69da7f9a015fff9a9b7522?narHash=sha256-t1PM0wxQLQwv2F2AW23uA7pm5giwmcgYEWbNIRct9r4%3D' (2025-06-05) → 'github:hyprwm/hyprland-qtutils/b13c7481e37856f322177010bdf75fccacd1adc8?narHash=sha256-D868K1dVEACw17elVxRgXC6hOxY%2B54wIEjURztDWLk8%3D' (2025-06-19) • Updated input 'hyprland/hyprlang': 'github:hyprwm/hyprlang/1bfb84f54d50c7ae6558c794d3cfd5f6a7e6e676?narHash=sha256-qr0KXeczF8Sma3Ae7%2BdR2NHhvG7YeLBJv19W4oMu6ZE%3D' (2025-06-05) → 'github:hyprwm/hyprlang/cee01452bca58d6cadb3224e21e370de8bc20f0b?narHash=sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE%3D' (2025-06-19) • Updated input 'hyprland/hyprutils': 'github:hyprwm/hyprutils/57ab2a867d8b554ad89f29060c15efd11631db91?narHash=sha256-7F/KG8dwSH9JXdlpOVrEEArS%2BPJSn0iEnx5eVCk89/I%3D' (2025-06-13) → 'github:hyprwm/hyprutils/38f3a211657ce82a1123bf19402199b67a410f08?narHash=sha256-JB1IeJ41y7kWc/dPGV6RMcCUM0Xj2NEK26A2Ap7EM9c%3D' (2025-06-19) • Updated input 'hyprland/hyprwayland-scanner': 'github:hyprwm/hyprwayland-scanner/817918315ea016cc2d94004bfb3223b5fd9dfcc6?narHash=sha256-IHaGWpGrv7seFWdw/1A%2BwHtTsPlOGIKMrk1TUIYJEFI%3D' (2025-06-05) → 'github:hyprwm/hyprwayland-scanner/aa38edd6e3e277ae6a97ea83a69261a5c3aab9fd?narHash=sha256-lGk4gLjgZQ/rndUkzmPYcgbHr8gKU5u71vyrjnwfpB4%3D' (2025-06-19) • Updated input 'hyprland/nixpkgs': 'github:NixOS/nixpkgs/ee930f9755f58096ac6e8ca94a1887e0534e2d81?narHash=sha256-Kh9K4taXbVuaLC0IL%2B9HcfvxsSUx8dPB5s5weJcc9pc%3D' (2025-06-13) → 'github:NixOS/nixpkgs/08f22084e6085d19bcfb4be30d1ca76ecb96fe54?narHash=sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50%3D' (2025-06-19) • Updated input 'hyprland/xdph': 'github:hyprwm/xdg-desktop-portal-hyprland/3cf35e178bc192ee51e3fddfd69e531e2c106a30?narHash=sha256-R9Dn9IyUdPaJHD2Oqd7XJnnxpka6M6UYw4Ld0iA46HM%3D' (2025-06-09) → 'github:hyprwm/xdg-desktop-portal-hyprland/400308fc4f9d12e0a93e483c2e7a649e12af1a92?narHash=sha256-VBeZb1oqZM1cqCAZnFz/WyYhO8aF/ImagI7WWg/Z3Og%3D' (2025-06-19) • Updated input 'hyprland-plugins': 'github:hyprwm/hyprland-plugins/f49193f8e0b3eb167fc105107791a22fdb1d283f?narHash=sha256-SDhYYByonfW1jdKSe68GukGWSbOuuxzkMVRTXSsU7g0%3D' (2025-06-20) → 'github:hyprwm/hyprland-plugins/8b4405ab46cafc471d5b09ff7258676dc9aaca59?narHash=sha256-/qnR7/GvGP1cGtOOm4OGJRtkVejn75/jsvJpiqE1ZDk%3D' (2025-06-21) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/9ba04bda9249d5d5e5238303c9755de5a49a79c5?narHash=sha256-H8J4H2XCIMEJ5g6fZ179QfQvsc2dUqhqfBjC8RAHNRY%3D' (2025-06-18) → 'github:NixOS/nixpkgs/b2485d56967598da068b5a6946dadda8bfcbcd37?narHash=sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA%3D' (2025-06-20) • Updated input 'nixvim': 'github:nix-community/nixvim/1252966779a5632a3cd5238e442d55a1d2f56660?narHash=sha256-M0WNjAy2FCHJAb1hEp%2BJ2gnMk707K5/iTA24amEu/s8%3D' (2025-06-17) → 'github:nix-community/nixvim/b04bcdcbba4aa648903e065ad1907a97d4f7aee9?narHash=sha256-kZqTQEARUkkKDFhECd0MGU4wXCJcxCdh5WeM/yD6oI4%3D' (2025-06-21)	2025-06-21 23:53:43 +01:00
Jordan Holt	4435f4ff2d	hosts/vps1: update skycam proxy path All checks were successful Check flake / build-amd64-linux (push) Successful in 1m20s Details	2025-06-21 23:53:06 +01:00
Jordan Holt	f6c0620f8e	hosts/skycam: working stream with go2rtc	2025-06-21 23:49:40 +01:00