hosts/desktop: add corefonts

2025-05-11 20:44:10 +01:00
56 changed files with 1374 additions and 1635 deletions
--- a/flake.lock
+++ b/flake.lock
--- a/flake.nix
+++ b/flake.nix
@ -2,7 +2,7 @@
  description = "NixOS system configuration";

  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-25.05";
+    nixpkgs.url = "nixpkgs/nixos-24.11";
    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
    # nixpkgs-master.url = "nixpkgs";
    agenix.url = "github:ryantm/agenix";
@ -12,14 +12,9 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };
    home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager/release-24.11";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    hyprland.url = "github:hyprwm/Hyprland";
-    hyprland-plugins = {
-      url = "github:hyprwm/hyprland-plugins";
-      inputs.hyprland.follows = "hyprland";
-    };
    firefox-gnome-theme = {
      url = "github:rafaelmardojai/firefox-gnome-theme";
      flake = false;
@ -35,11 +30,11 @@
    };
    nixos-hardware.url = "github:NixOS/nixos-hardware";
    nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    nixvim = {
-      url = "github:nix-community/nixvim/nixos-25.05";
+      url = "github:nix-community/nixvim/nixos-24.11";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    pre-commit-hooks = {
@ -50,6 +45,7 @@
      url = "git+ssh://git@git.vimium.com/jordan/nix-secrets.git";
      flake = false;
    };
+    stylix.url = "github:danth/stylix/release-24.11";
    thunderbird-gnome-theme = {
      url = "github:rafaelmardojai/thunderbird-gnome-theme";
      flake = false;
@ -136,7 +132,6 @@
              nixfmt-rfc-style.enable = true;
              trim-trailing-whitespace.enable = true;
            };
-            excludes = [ "pkgs/libcamera-rpi/libcamera-rpi-ipa-priv-key.pem" ];
          };
        }));

@ -158,8 +153,8 @@
        sshUser = "root";
        nodes = lib.genAttrs [
          "mail"
-          "pi"
-          "skycam"
+          # "pi"
+          # "skycam"
          "vps1"
        ] mkDeployNode;
      };
--- a/hosts/common.nix
+++ b/hosts/common.nix
@ -8,25 +8,18 @@
 {
  imports = [
    inputs.agenix.nixosModules.age
-    inputs.home-manager.nixosModules.home-manager
+    inputs.home-manager.nixosModule
+    inputs.stylix.nixosModules.stylix
    ../modules/nixos
  ];

-  nixpkgs = {
-    config.allowUnfree = true;
-    overlays = [
+  nixpkgs.overlays = [
    inputs.agenix.overlays.default
    (import ../overlays/default.nix)
    (final: prev: {
-        unstable = import inputs.nixpkgs-unstable {
-          config = {
-            allowUnfree = true;
-          };
-          system = final.system;
-        };
+      unstable = import inputs.nixpkgs-unstable { system = final.system; };
    })
  ];
-  };

  time.timeZone = "Europe/London";

@ -76,7 +69,7 @@
    '';
    buildMachines = [
      {
-        hostName = "10.0.1.235";
+        hostName = "10.0.1.79";
        sshUser = "root";
        system = "aarch64-linux";
        maxJobs = 6;
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@ -9,10 +9,14 @@
    ../users/jordan
  ];

+  nixpkgs.overlays = [
+    (import ../overlays/gnome.nix)
+  ];
+
  services.printing.enable = true;
  services.openssh.startWhenNeeded = true;

-  services.pulseaudio.enable = false;
+  hardware.pulseaudio.enable = false;
  security.rtkit.enable = true;
  services.pipewire = {
    enable = true;
@ -46,6 +50,19 @@

  systemd.services.NetworkManager-wait-online.enable = false;

+  fonts.packages = with pkgs; [
+    corefonts
+    noto-fonts
+    (nerdfonts.override {
+      fonts = [
+        "BigBlueTerminal"
+        "ComicShannsMono"
+        "Terminus"
+        "UbuntuMono"
+      ];
+    })
+  ];
+
  modules = {
    system.desktop.gnome.enable = true;
    services.tailscale.enable = true;
--- a/hosts/helios/hardware-configuration.nix
+++ b/hosts/helios/hardware-configuration.nix
@ -28,8 +28,6 @@
    supportedFilesystems = [ "zfs" ];
  };

-  powerManagement.cpuFreqGovernor = "schedutil";
-
  fileSystems."/" = {
    device = "rpool/system/root";
    fsType = "zfs";
--- a/hosts/hypnos/default.nix
+++ b/hosts/hypnos/default.nix
@ -16,6 +16,7 @@
  nixpkgs = {
    hostPlatform = "x86_64-linux";
    config = {
+      allowUnfree = true;
      nvidia.acceptLicense = true;
    };
  };
--- 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 - JMCD-12S4
+* Case - Fractal Design Node 804

 ### Disks
 Device | Partitions _(filesystem, size, usage)_
 --- | ---
-Samsung 970 Evo Plus | `/dev/nvme0n1p1` (EFI, 512 MiB, NixOS Boot) <br> `/dev/nvme0n1p2` (ZFS `rpool`, 200 GiB, NixOS Root)
+Samsung 980 Evo | `/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
@ -1,38 +0,0 @@
-{
-  inputs,
-  config,
-  pkgs,
-  ...
-}:
-
-{
-  age.secrets."files/services/open-webui/envfile" = {
-    file = "${inputs.secrets}/files/services/open-webui/envfile.age";
-  };
-
-  services.open-webui = {
-    enable = true;
-    package = pkgs.unstable.open-webui;
-    port = 8081;
-    environment =
-      let
-        clientId = "open-webui";
-        publicUrl = "https://chat.ai.vimium.com";
-      in
-      {
-        WEBUI_URL = publicUrl;
-        ENABLE_LOGIN_FORM = "False";
-        ENABLE_OAUTH_SIGNUP = "True";
-        ENABLE_OAUTH_ROLE_MANAGEMENT = "True";
-        OAUTH_CLIENT_ID = clientId;
-        OAUTH_PROVIDER_NAME = "Vimium";
-        OPENID_PROVIDER_URL = "https://auth.vimium.com/oauth2/openid/${clientId}/.well-known/openid-configuration";
-        OPENID_REDIRECT_URI = "${publicUrl}/oauth/oidc/callback";
-      };
-    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
@ -1,17 +1,8 @@
-{
-  ...
-}:
+{ config, pkgs, ... }:

 {
  imports = [
    ./hardware-configuration.nix
-    ./ai.nix
-    ./grafana.nix
-    ./jellyfin.nix
-    ./jellysearch.nix
-    ./nginx.nix
-    ./prometheus.nix
-    ./tunnel.nix
    ../server.nix
  ];

@ -20,10 +11,7 @@
  boot = {
    loader.systemd-boot.enable = true;
    loader.efi.canTouchEfiVariables = true;
-    zfs.extraPools = [
-      "downloads"
-      "library"
-    ];
+    zfs.extraPools = [ "library" ];
  };

  networking = {
@ -58,12 +46,147 @@
    enable = true;
  };

+  services.grafana = {
+    enable = true;
+    settings = {
+      server = {
+        domain = "library.mesh.vimium.net";
+        http_addr = "0.0.0.0";
+        http_port = 3000;
+      };
+    };
+  };
+
+  services.prometheus = {
+    enable = true;
+    port = 9001;
+    exporters = {
+      node = {
+        enable = true;
+        enabledCollectors = [ "systemd" ];
+        port = 9002;
+      };
+      zfs = {
+        enable = true;
+        port = 9003;
+      };
+    };
+    scrapeConfigs = [
+      {
+        job_name = "node";
+        static_configs = [
+          {
+            targets = [
+              "127.0.0.1:${toString config.services.prometheus.exporters.node.port}"
+              "127.0.0.1:${toString config.services.prometheus.exporters.zfs.port}"
+            ];
+          }
+        ];
+      }
+    ];
+  };
+
+  systemd.services.vps1-tunnel = {
+    enable = true;
+    description = "vps1.mesh.vimium.net SSH tunnel";
+    after = [
+      "network-online.target"
+      "jellyfin.service"
+    ];
+    wants = [ "network-online.target" ];
+    serviceConfig = {
+      Type = "simple";
+      ExecStart = pkgs.lib.mkForce ''
+        ${pkgs.openssh}/bin/ssh \
+          -NT \
+          -o ExitOnForwardFailure=yes \
+          -o ServerAliveInterval=60 \
+          -o TCPKeepAlive=no \
+          -i %h/.ssh/id_jellyfin \
+          -R localhost:8000:localhost:8000 \
+          jellyfin@vps1.mesh.vimium.net
+      '';
+      Restart = "always";
+      RestartSec = 20;
+    };
+    wantedBy = [ "default.target" ];
+  };
+
+  services.nginx =
+    let
+      proxyConfig = ''
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+
+        proxy_set_header Range $http_range;
+        proxy_set_header If-Range $http_if_range;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+      '';
+    in
+    {
+      enable = true;
+      package = pkgs.openresty;
+      recommendedGzipSettings = true;
+      recommendedOptimisation = true;
+      recommendedTlsSettings = true;
+      clientMaxBodySize = "2G";
+      virtualHosts = {
+        "library.mesh.vimium.net" = {
+          locations."/" = {
+            root = "/mnt/library";
+            extraConfig = ''
+              autoindex on;
+            '';
+          };
+        };
+        "jellyfin.vimium.com" = {
+          default = true;
+          listen = [
+            {
+              addr = "127.0.0.1";
+              port = 8000;
+            }
+          ];
+          locations."/" = {
+            proxyPass = "http://localhost:8096";
+            extraConfig = proxyConfig;
+          };
+          locations."/metrics" = {
+            return = "404";
+          };
+        };
+      };
+    };
+
+  hardware.graphics = {
+    enable = true;
+    extraPackages = with pkgs; [
+      vaapiVdpau
+    ];
+  };
+  users.users.jellyfin.extraGroups = [
+    "video"
+    "render"
+  ];
+  services.jellyfin = {
+    enable = true;
+    package = pkgs.unstable.jellyfin;
+    cacheDir = "/var/cache/jellyfin";
+    dataDir = "/var/lib/jellyfin";
+  };
+
  modules = {
    podman.enable = true;
    services = {
      borgmatic = {
        enable = true;
        directories = [
+          config.services.jellyfin.dataDir
          "/home/jordan"
        ];
        repoPath = "ssh://b61758r4@b61758r4.repo.borgbase.com/./repo";
--- a/hosts/library/grafana.nix
+++ b/hosts/library/grafana.nix
@ -1,16 +0,0 @@
-{
-  ...
-}:
-
-{
-  services.grafana = {
-    enable = true;
-    settings = {
-      server = {
-        domain = "library.mesh.vimium.net";
-        http_addr = "0.0.0.0";
-        http_port = 3000;
-      };
-    };
-  };
-}
--- a/hosts/library/jellyfin.nix
+++ b/hosts/library/jellyfin.nix
@ -1,30 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}:
-
-{
-  hardware.graphics = {
-    enable = true;
-    extraPackages = with pkgs; [
-      vaapiVdpau
-    ];
-  };
-
-  users.users.jellyfin.extraGroups = [
-    "video"
-    "render"
-  ];
-
-  services.jellyfin = {
-    enable = true;
-    package = pkgs.unstable.jellyfin;
-    cacheDir = "/var/cache/jellyfin";
-    dataDir = "/var/lib/jellyfin";
-  };
-
-  modules.services.borgmatic.directories = [
-    config.services.jellyfin.dataDir
-  ];
-}
--- a/hosts/library/jellysearch.nix
+++ b/hosts/library/jellysearch.nix
@ -1,58 +0,0 @@
-{
-  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
@ -1,88 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-
-{
-  services.nginx =
-    let
-      proxyConfig = ''
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header Host $host;
-
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-      '';
-    in
-    {
-      enable = true;
-      package = pkgs.openresty;
-      recommendedGzipSettings = true;
-      recommendedOptimisation = true;
-      recommendedTlsSettings = true;
-      clientMaxBodySize = "2G";
-      virtualHosts = {
-        "library.mesh.vimium.net" = {
-          locations."/" = {
-            root = "/mnt/library";
-            extraConfig = ''
-              autoindex on;
-            '';
-          };
-        };
-        "chat.ai.vimium.com" = {
-          listen = [
-            {
-              addr = "127.0.0.1";
-              port = 8001;
-            }
-          ];
-          locations."/" = {
-            proxyPass = "http://localhost:8081";
-            extraConfig =
-              proxyConfig
-              + ''
-                # Disable proxy buffering for better streaming response from models
-                proxy_buffering off;
-
-                # Increase max request size for large attachments and long audio messages
-                client_max_body_size 20M;
-                proxy_read_timeout 10m;
-              '';
-          };
-        };
-        "jellyfin.vimium.com" = {
-          default = true;
-          listen = [
-            {
-              addr = "127.0.0.1";
-              port = 8000;
-            }
-          ];
-          locations."/" = {
-            extraConfig =
-              ''
-                # 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;
-              '';
-          };
-          locations."/metrics" = {
-            return = "404";
-          };
-        };
-      };
-    };
-}
--- a/hosts/library/prometheus.nix
+++ b/hosts/library/prometheus.nix
@ -1,35 +0,0 @@
-{
-  config,
-  ...
-}:
-
-{
-  services.prometheus = {
-    enable = true;
-    port = 9001;
-    exporters = {
-      node = {
-        enable = true;
-        enabledCollectors = [ "systemd" ];
-        port = 9002;
-      };
-      zfs = {
-        enable = true;
-        port = 9003;
-      };
-    };
-    scrapeConfigs = [
-      {
-        job_name = "node";
-        static_configs = [
-          {
-            targets = [
-              "127.0.0.1:${toString config.services.prometheus.exporters.node.port}"
-              "127.0.0.1:${toString config.services.prometheus.exporters.zfs.port}"
-            ];
-          }
-        ];
-      }
-    ];
-  };
-}
--- a/hosts/library/tunnel.nix
+++ b/hosts/library/tunnel.nix
@ -1,33 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-
-{
-  systemd.services.vps1-tunnel = {
-    enable = true;
-    description = "vps1.mesh.vimium.net SSH tunnel";
-    after = [
-      "network-online.target"
-      "jellyfin.service"
-    ];
-    wants = [ "network-online.target" ];
-    serviceConfig = {
-      Type = "simple";
-      ExecStart = pkgs.lib.mkForce ''
-        ${pkgs.openssh}/bin/ssh \
-          -NT \
-          -o ExitOnForwardFailure=yes \
-          -o ServerAliveInterval=60 \
-          -o TCPKeepAlive=no \
-          -i %h/.ssh/id_jellyfin \
-          -R localhost:8000:localhost:8000 \
-          -R localhost:8001:localhost:8001 \
-          jellyfin@vps1.mesh.vimium.net
-      '';
-      Restart = "always";
-      RestartSec = 20;
-    };
-    wantedBy = [ "default.target" ];
-  };
-}
--- a/hosts/mail/mail.nix
+++ b/hosts/mail/mail.nix
@ -5,32 +5,25 @@
 }:

 let
-  sendingDomains = [
-    "jdholt.com"
-    "vimium.com"
-  ];
-  receiveOnlyDomains = [
+  domains = [
    "h0lt.com"
+    "jdholt.com"
    "jordanholt.xyz"
    "vimium.co"
+    "vimium.com"
    "vimium.co.uk"
    "vimium.info"
    "vimium.net"
    "vimium.org"
    "vimium.xyz"
  ];
-  allDomains = sendingDomains ++ receiveOnlyDomains;
 in
 {
  imports = [
    inputs.nixos-mailserver.nixosModule
  ];

-  age.secrets = {
-    "files/services/postfix/sasl_passwd".file =
-      "${inputs.secrets}/files/services/postfix/sasl_passwd.age";
-    "passwords/users/jordan".file = "${inputs.secrets}/passwords/users/jordan.age";
-  };
+  age.secrets."passwords/users/jordan".file = "${inputs.secrets}/passwords/users/jordan.age";

  services.roundcube = {
    enable = true;
@ -53,7 +46,7 @@ in
  mailserver = {
    enable = true;
    fqdn = "mail.vimium.com";
-    domains = allDomains;
+    domains = domains;
    indexDir = "/var/lib/dovecot/indices";

    certificateDomains = [
@ -67,22 +60,15 @@ in
    loginAccounts = {
      "jordan@vimium.com" = {
        hashedPasswordFile = config.age.secrets."passwords/users/jordan".path;
-        aliases = map (domain: "@" + domain) sendingDomains;
-        catchAll = receiveOnlyDomains;
-      };
+        catchAll = domains;
      };
    };

-  services.postfix.config = {
-    relayhost = "[mail.smtp2go.com]:2525";
-
-    smtp_sasl_auth_enable = "yes";
-    smtp_sasl_password_maps = "texthash:${
-      config.age.secrets."files/services/postfix/sasl_passwd".path
-    }";
-    smtp_sasl_security_options = "noanonymous";
-
-    smtp_destination_concurrency_limit = "20";
-    header_size_limit = "4096000";
+    extraVirtualAliases = {
+      "hostmaster@vimium.com" = "jordan@vimium.com";
+      "postmaster@vimium.com" = "jordan@vimium.com";
+      "webmaster@vimium.com" = "jordan@vimium.com";
+      "abuse@vimium.com" = "jordan@vimium.com";
+    };
  };
 }
--- a/hosts/odyssey/default.nix
+++ b/hosts/odyssey/default.nix
@ -15,6 +15,7 @@
  nixpkgs = {
    hostPlatform = "x86_64-linux";
    config = {
+      allowUnfree = true;
      nvidia.acceptLicense = true;
    };
  };
@ -43,7 +44,7 @@
  };

  services.sunshine = {
-    enable = false;
+    enable = true;
    package = pkgs.unstable.sunshine;
    capSysAdmin = true;
  };
--- a/hosts/pi/default.nix
+++ b/hosts/pi/default.nix
@ -9,7 +9,6 @@
    inputs.nixos-hardware.nixosModules.raspberry-pi-4
    ./hardware-configuration.nix
    ./home-assistant
-    ./snapcast.nix
    ../server.nix
  ];

--- a/hosts/pi/hardware-configuration.nix
+++ b/hosts/pi/hardware-configuration.nix
@ -1,5 +1,6 @@
 {
  lib,
+  pkgs,
  modulesPath,
  ...
 }:
@ -10,6 +11,44 @@
  ];

  boot = {
+    kernelPackages =
+      let
+        version = "6.1.73";
+        tag = "stable_20240124";
+        srcHash = "sha256-P4ExzxWqZj+9FZr9U2tmh7rfs/3+iHEv0m74PCoXVuM=";
+      in
+      pkgs.linuxPackagesFor (
+        pkgs.linux_rpi4.override {
+          argsOverride = {
+            src = pkgs.fetchFromGitHub {
+              owner = "raspberrypi";
+              repo = "linux";
+              rev = tag;
+              hash = srcHash;
+            };
+            version = version;
+            modDirVersion = version;
+            structuredExtraConfig = { };
+            kernelPatches = [
+              {
+                name = "drm-rp1-depends-on-instead-of-select-MFD_RP1.patch";
+                patch = pkgs.fetchpatch {
+                  url = "https://github.com/peat-psuwit/rpi-linux/commit/6de0bb51929cd3ad4fa27b2a421a2af12e6468f5.patch";
+                  hash = "sha256-9pHcbgWTiztu48SBaLPVroUnxnXMKeCGt5vEo9V8WGw=";
+                };
+              }
+              {
+                name = "iommu-bcm2712-don-t-allow-building-as-module.patch";
+                patch = pkgs.fetchpatch {
+                  url = "https://github.com/peat-psuwit/rpi-linux/commit/693a5e69bddbcbe1d1b796ebc7581c3597685b1b.patch";
+                  hash = "sha256-8BYYQDM5By8cTk48ASYKJhGVQnZBIK4PXtV70UtfS+A=";
+                };
+              }
+            ];
+          };
+        }
+      );
+
    # Stop ZFS kernel being built
    supportedFilesystems = lib.mkForce [
      "btrfs"
@ -30,6 +69,23 @@
    (final: prev: {
      makeModulesClosure = x: prev.makeModulesClosure (x // { allowMissing = true; });
    })
+    (final: prev: {
+      raspberrypifw =
+        let
+          version = "1.20240529";
+          srcHash = "sha256-KsCo7ZG6vKstxRyFljZtbQvnDSqiAPdUza32xTY/tlA=";
+        in
+        pkgs.raspberrypifw.override {
+          argsOverride = {
+            src = prev.fetchFromGitHub {
+              owner = "raspberrypi";
+              repo = "firmware";
+              rev = "${version}";
+              hash = srcHash;
+            };
+          };
+        };
+    })
  ];

  fileSystems = {
--- a/hosts/pi/home-assistant/default.nix
+++ b/hosts/pi/home-assistant/default.nix
@ -63,6 +63,7 @@
      };
      media_player = [ ];
      mobile_app = { };
+      onkyo = { };
      open_meteo = { };
      recorder = {
        purge_keep_days = 365;
--- a/hosts/pi/snapcast.nix
+++ b/hosts/pi/snapcast.nix
@ -1,43 +0,0 @@
-{
-  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/server.nix
+++ b/hosts/server.nix
@ -50,6 +50,11 @@ in
      AllowSuspend=no
      AllowHibernation=no
    '';
+
+    watchdog = {
+      runtimeTime = "20s";
+      rebootTime = "30s";
+    };
  };

  services.fail2ban = {
--- a/hosts/skycam/default.nix
+++ b/hosts/skycam/default.nix
@ -1,16 +1,77 @@
 {
+  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"
+  '';
+
+  nixpkgs.overlays = [
+    (import ./../../overlays/libcamera.nix)
+  ];
+
  networking = {
    hostId = "731d1660";
    firewall = {
@ -20,59 +81,37 @@
    };
  };

-  services.go2rtc =
-    let
-      rpicam-vid = "${pkgs.rpicam-apps}/bin/rpicam-vid";
-    in
-    {
+  systemd.services.ustreamer = {
    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";
+    description = "uStreamer service";
+    unitConfig = {
+      Type = "simple";
+      ConditionPathExists = "/sys/bus/i2c/drivers/imx708/10-001a/video4linux";
    };
-    };
-
-  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"
-      '';
-    in
-    {
-      description = "Capture skycam snapshot and save with timestamp";
    serviceConfig = {
-        Type = "oneshot";
-        StateDirectory = "skycam-archiver";
-        ExecStart = "${snapshotScript}";
+      ExecStart = ''
+        ${pkgs.libcamera}/bin/libcamerify ${pkgs.unstable.ustreamer}/bin/ustreamer \
+                --host=0.0.0.0 \
+                --resolution=4608x2592
+      '';
+      DynamicUser = "yes";
+      SupplementaryGroups = [ "video" ];
+      Restart = "always";
+      RestartSec = 10;
    };
-      requires = [ "go2rtc.service" ];
-      after = [ "go2rtc.service" ];
-    };
-
-  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";
+    wantedBy = [ "network-online.target" ];
+    confinement.mode = "chroot-only";
  };

  environment.systemPackages = with pkgs; [
+    camera-streamer
    git
    neovim
    libcamera
    libraspberrypi
    raspberrypi-eeprom
-    rpicam-apps
+    v4l-utils
+    unstable.ustreamer
  ];

  system.stateVersion = "24.05";
--- a/hosts/skycam/hardware-configuration.nix
+++ b/hosts/skycam/hardware-configuration.nix
@ -1,20 +1,18 @@
 {
-  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 [
@ -25,61 +23,6 @@
    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/kanidm.nix
+++ b/hosts/vps1/kanidm.nix
@ -26,7 +26,6 @@ in
        origin = uri;
        tls_chain = "${config.security.acme.certs.${domain}.directory}/full.pem";
        tls_key = "${config.security.acme.certs.${domain}.directory}/key.pem";
-        version = "2";
      };
    };

--- a/hosts/vps1/nginx.nix
+++ b/hosts/vps1/nginx.nix
@ -85,31 +85,6 @@ in
    virtualHosts =
      {
        ## Static sites
-        "chat.ai.vimium.com" = {
-          forceSSL = true;
-          enableACME = true;
-          extraConfig = nginxErrorPages + nginxEdgeHeaders;
-          locations."/" = {
-            proxyPass = "http://localhost:8001";
-            extraConfig = ''
-              proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-              proxy_set_header X-Forwarded-Proto $scheme;
-              proxy_set_header X-Real-IP $remote_addr;
-              proxy_set_header Host $host;
-
-              proxy_http_version 1.1;
-              proxy_set_header Upgrade $http_upgrade;
-              proxy_set_header Connection "upgrade";
-
-              # Disable proxy buffering for better streaming response from models
-              proxy_buffering off;
-
-              # Increase max request size for large attachments and long audio messages
-              client_max_body_size 20M;
-              proxy_read_timeout 10m;
-            '';
-          };
-        };
        "jellyfin.vimium.com" = {
          forceSSL = true;
          enableACME = true;
@ -136,16 +111,13 @@ 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:1984";
+              set $backend "skycam.mesh.vimium.net:8080";

              resolver 100.100.100.100;

-              proxy_pass http://$backend/api/frame.jpeg?src=rpicam;
+              proxy_pass http://$backend/snapshot;
              proxy_cache skycam_cache;
              proxy_cache_valid any 10s;
              proxy_ignore_headers Cache-Control Expires Set-Cookie;
--- a/hosts/vps1/outline.nix
+++ b/hosts/vps1/outline.nix
@ -7,6 +7,8 @@ let
  domain = "outline.vimium.com";
 in
 {
+  nixpkgs.config.allowUnfree = true;
+
  services.nginx.virtualHosts = {
    "${domain}" = {
      forceSSL = true;
--- a/modules/nixos/hardware/presonus-studio/default.nix
+++ b/modules/nixos/hardware/presonus-studio/default.nix
@ -100,7 +100,7 @@ in
        };
      };
      pipewire-pulse."40-upmix" = upmixConfig;
-      client."40-upmix" = upmixConfig;
+      client-rt."40-upmix" = upmixConfig;
    };
  };
 }
--- a/modules/nixos/services/borgmatic.nix
+++ b/modules/nixos/services/borgmatic.nix
@ -64,8 +64,7 @@ in
    ];

    # Add `pg_dumpall` to unit environment
-    systemd.services.borgmatic.path =
-      if config.services.postgresql.enable then [ config.services.postgresql.package ] else [ ];
+    systemd.services.borgmatic.path = [ config.services.postgresql.package ];

    # Without this override, `cat` is unavailable for `encryption_passcommand`
    systemd.services.borgmatic.confinement.fullUnit = true;
--- a/modules/nixos/system/desktop/hyprland.nix
+++ b/modules/nixos/system/desktop/hyprland.nix
@ -1,4 +1,5 @@
 {
+  pkgs,
  config,
  lib,
  ...
@ -21,5 +22,16 @@ in
      enable = true;
      withUWSM = true;
    };
+
+    nixpkgs.config.allowUnfree = true;
+
+    stylix = {
+      enable = true;
+      autoEnable = false;
+      image = config.lib.stylix.pixel "base00";
+      polarity = "dark";
+
+      base16Scheme = "${pkgs.base16-schemes}/share/themes/colors.yaml";
+    };
  };
 }
--- a/overlays/0001-Ignore-IPA-signing.patch
+++ b/overlays/0001-Ignore-IPA-signing.patch
@ -0,0 +1,24 @@
+From 625939e594ce255afa3fab3a40c3e524460e1f8b Mon Sep 17 00:00:00 2001
+From: Jordan Holt <jordan@vimium.com>
+Date: Sat, 10 Aug 2024 18:28:08 +0100
+Subject: [PATCH] Ignore IPA signing
+
+---
+ src/libcamera/ipa_manager.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp
+index 6d5bbd05..43004175 100644
+--- a/src/libcamera/ipa_manager.cpp
+++ b/src/libcamera/ipa_manager.cpp
+@@ -295,7 +295,7 @@ bool IPAManager::isSignatureValid([[maybe_unused]] IPAModule *ipa) const
+ 	if (data.empty())
+ 		return false;
+
+-	bool valid = pubKey_.verify(data, ipa->signature());
+	bool valid = true;
+
+ 	LOG(IPAManager, Debug)
+ 		<< "IPA module " << ipa->path() << " signature is "
+--
+2.44.1
--- a/overlays/0001-Remove-relative-config-lookups.patch
+++ b/overlays/0001-Remove-relative-config-lookups.patch
@ -0,0 +1,141 @@
+From 57128bb78f56cadf9e2dcca5ba4d710c3bd478a7 Mon Sep 17 00:00:00 2001
+From: Jordan Holt <jordan@vimium.com>
+Date: Mon, 5 Aug 2024 21:53:09 +0100
+Subject: [PATCH] Remove relative config lookups
+
+---
+ src/libcamera/ipa_manager.cpp      | 16 ----------
+ src/libcamera/ipa_proxy.cpp        | 48 ++----------------------------
+ src/libcamera/pipeline_handler.cpp | 21 ++-----------
+ 3 files changed, 4 insertions(+), 81 deletions(-)
+
+diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp
+index f4e0b633..6d5bbd05 100644
+--- a/src/libcamera/ipa_manager.cpp
+++ b/src/libcamera/ipa_manager.cpp
+@@ -131,22 +131,6 @@ IPAManager::IPAManager()
+ 				<< "No IPA found in '" << modulePaths << "'";
+ 	}
+
+-	/*
+-	 * When libcamera is used before it is installed, load IPAs from the
+-	 * same build directory as the libcamera library itself.
+-	 */
+-	std::string root = utils::libcameraBuildPath();
+-	if (!root.empty()) {
+-		std::string ipaBuildPath = root + "src/ipa";
+-		constexpr int maxDepth = 2;
+-
+-		LOG(IPAManager, Info)
+-			<< "libcamera is not installed. Adding '"
+-			<< ipaBuildPath << "' to the IPA search path";
+-
+-		ipaCount += addDir(ipaBuildPath.c_str(), maxDepth);
+-	}
+-
+ 	/* Finally try to load IPAs from the installed system path. */
+ 	ipaCount += addDir(IPA_MODULE_DIR);
+
+diff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp
+index 69975d8f..cd9284a3 100644
+--- a/src/libcamera/ipa_proxy.cpp
+++ b/src/libcamera/ipa_proxy.cpp
+@@ -122,33 +122,11 @@ std::string IPAProxy::configurationFile(const std::string &name,
+ 		}
+ 	}
+
+-	std::string root = utils::libcameraSourcePath();
+-	if (!root.empty()) {
+-		/*
+-		 * When libcamera is used before it is installed, load
+-		 * configuration files from the source directory. The
+-		 * configuration files are then located in the 'data'
+-		 * subdirectory of the corresponding IPA module.
+-		 */
+-		std::string ipaConfDir = root + "src/ipa/" + ipaName + "/data";
+-
+-		LOG(IPAProxy, Info)
+-			<< "libcamera is not installed. Loading IPA configuration from '"
+-			<< ipaConfDir << "'";
+-
+-		std::string confPath = ipaConfDir + "/" + name;
+	for (const auto &dir : utils::split(IPA_CONFIG_DIR, ":")) {
+		std::string confPath = dir + "/" + ipaName + "/" + name;
+ 		ret = stat(confPath.c_str(), &statbuf);
+ 		if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)
+ 			return confPath;
+-
+-	} else {
+-		/* Else look in the system locations. */
+-		for (const auto &dir : utils::split(IPA_CONFIG_DIR, ":")) {
+-			std::string confPath = dir + "/" + ipaName + "/" + name;
+-			ret = stat(confPath.c_str(), &statbuf);
+-			if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)
+-				return confPath;
+-		}
+ 	}
+
+ 	if (fallbackName.empty()) {
+@@ -197,28 +175,6 @@ std::string IPAProxy::resolvePath(const std::string &file) const
+ 		}
+ 	}
+
+-	/*
+-	 * When libcamera is used before it is installed, load proxy workers
+-	 * from the same build directory as the libcamera directory itself.
+-	 * This requires identifying the path of the libcamera.so, and
+-	 * referencing a relative path for the proxy workers from that point.
+-	 */
+-	std::string root = utils::libcameraBuildPath();
+-	if (!root.empty()) {
+-		std::string ipaProxyDir = root + "src/libcamera/proxy/worker";
+-
+-		LOG(IPAProxy, Info)
+-			<< "libcamera is not installed. Loading proxy workers from '"
+-			<< ipaProxyDir << "'";
+-
+-		std::string proxyPath = ipaProxyDir + proxyFile;
+-		if (!access(proxyPath.c_str(), X_OK))
+-			return proxyPath;
+-
+-		return std::string();
+-	}
+-
+-	/* Else try finding the exec target from the install directory. */
+ 	std::string proxyPath = std::string(IPA_PROXY_DIR) + proxyFile;
+ 	if (!access(proxyPath.c_str(), X_OK))
+ 		return proxyPath;
+diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp
+index 5ea2ca78..fd8555ca 100644
+--- a/src/libcamera/pipeline_handler.cpp
+++ b/src/libcamera/pipeline_handler.cpp
+@@ -561,25 +561,8 @@ std::string PipelineHandler::configurationFile(const std::string &subdir,
+ 	struct stat statbuf;
+ 	int ret;
+
+-	std::string root = utils::libcameraSourcePath();
+-	if (!root.empty()) {
+-		/*
+-		 * When libcamera is used before it is installed, load
+-		 * configuration files from the source directory. The
+-		 * configuration files are then located in the 'data'
+-		 * subdirectory of the corresponding pipeline handler.
+-		 */
+-		std::string confDir = root + "src/libcamera/pipeline/";
+-		confPath = confDir + subdir + "/data/" + name;
+-
+-		LOG(Pipeline, Info)
+-			<< "libcamera is not installed. Loading platform configuration file from '"
+-			<< confPath << "'";
+-	} else {
+-		/* Else look in the system locations. */
+-		confPath = std::string(LIBCAMERA_DATA_DIR)
+-				+ "/pipeline/" + subdir + '/' + name;
+-	}
+	confPath = std::string(LIBCAMERA_DATA_DIR)
+			+ "/pipeline/" + subdir + '/' + name;
+
+ 	ret = stat(confPath.c_str(), &statbuf);
+ 	if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)
+--
+2.44.1
--- a/overlays/gnome.nix
+++ b/overlays/gnome.nix
@ -0,0 +1,21 @@
+final: prev: {
+  gvdb = prev.fetchgit {
+    url = "https://gitlab.gnome.org/GNOME/gvdb.git";
+    rev = "b54bc5da25127ef416858a3ad92e57159ff565b3"; # From gvdb_wrap
+    sha256 = "c56yOepnKPEYFcU1B1TrDl8ydU0JU+z6R8siAQP4d2A=";
+  };
+
+  mutter = prev.mutter.overrideAttrs (attrs: {
+    src = prev.fetchurl {
+      url = "https://gitlab.gnome.org/Community/Ubuntu/mutter/-/archive/triple-buffering-v4-47/mutter-triple-buffering-v4-47.tar.gz";
+      sha256 = "LoGAOCFopDT5+fV/6FffBzwlqK5XtozEGaOHTEXmkmg=";
+    };
+
+    postPatch = ''
+      mkdir -p subprojects/gvdb
+      cp -r ${final.gvdb}/* subprojects/gvdb/
+
+      ${attrs.postPatch or ""}
+    '';
+  });
+}
--- a/overlays/libcamera.nix
+++ b/overlays/libcamera.nix
@ -0,0 +1,65 @@
+final: prev: {
+  libpisp = final.stdenv.mkDerivation {
+    name = "libpisp";
+    version = "1.0.5";
+    src = final.fetchFromGitHub {
+      owner = "raspberrypi";
+      repo = "libpisp";
+      rev = "v1.0.5";
+      hash = "sha256-CHd44CH5dBcZuK+5fZtONZ8HE/lwGKwK5U0BYUK8gG4=";
+    };
+
+    nativeBuildInputs = with final; [
+      pkg-config
+      meson
+      ninja
+    ];
+
+    buildInputs = with final; [
+      nlohmann_json
+      boost
+    ];
+
+    BOOST_INCLUDEDIR = "${prev.lib.getDev final.boost}/include";
+    BOOST_LIBRARYDIR = "${prev.lib.getLib final.boost}/lib";
+  };
+
+  libcamera = prev.libcamera.overrideAttrs (old: {
+    src = final.fetchFromGitHub {
+      owner = "raspberrypi";
+      repo = "libcamera";
+      rev = "eb00c13d7c9f937732305d47af5b8ccf895e700f";
+      hash = "sha256-p0/inkHPRUkxSIsTmj7VI7sIaX7OXdqjMGZ31W7cnt4=";
+    };
+
+    postPatch = ''
+      patchShebangs utils/ src/py/
+    '';
+
+    patches = [
+      ./0001-Remove-relative-config-lookups.patch
+      ./0001-Ignore-IPA-signing.patch
+    ];
+
+    buildInputs =
+      old.buildInputs
+      ++ (with final; [
+        libpisp
+        libglibutil
+      ]);
+
+    mesonFlags = old.mesonFlags ++ [
+      "--buildtype=release"
+      "-Dpipelines=rpi/vc4,rpi/pisp"
+      "-Dipas=rpi/vc4,rpi/pisp"
+      "-Dgstreamer=enabled"
+      "-Dtest=false"
+      "-Dcam=enabled"
+      "-Dpycamera=disabled"
+    ];
+  });
+
+  camera-streamer = prev.callPackage ../pkgs/camera-streamer/package.nix {
+    libcamera = final.libcamera;
+  };
+}
--- a/pkgs/camera-streamer/0001-Disable-libdatachannel.patch
+++ b/pkgs/camera-streamer/0001-Disable-libdatachannel.patch
@ -0,0 +1,24 @@
+From 0f17bb86772afe9495891e420a809a0b3c071caf Mon Sep 17 00:00:00 2001
+From: Jordan Holt <jordan@vimium.com>
+Date: Sat, 10 Aug 2024 15:37:15 +0100
+Subject: [PATCH] Disable libdatachannel
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index d5029bd..e50ba1a 100644
+--- a/Makefile
+++ b/Makefile
+@@ -23,7 +23,7 @@ USE_HW_H264 ?= 1
+ USE_FFMPEG ?= $(shell pkg-config libavutil libavformat libavcodec && echo 1)
+ USE_LIBCAMERA ?= $(shell pkg-config libcamera && echo 1)
+ USE_RTSP ?= $(shell pkg-config live555 && echo 1)
+-USE_LIBDATACHANNEL ?= $(shell [ -e $(LIBDATACHANNEL_PATH)/CMakeLists.txt ] && echo 1)
+USE_LIBDATACHANNEL ?= 0
+
+ ifeq (1,$(DEBUG))
+ CFLAGS += -g
+--
+2.44.1
--- a/pkgs/camera-streamer/package.nix
+++ b/pkgs/camera-streamer/package.nix
@ -0,0 +1,82 @@
+{
+  stdenv,
+  fetchFromGitHub,
+
+  cmake,
+  gnumake,
+  pkg-config,
+  xxd,
+
+  v4l-utils,
+  nlohmann_json,
+  ffmpegSupport ? true,
+  ffmpeg,
+  libcameraSupport ? true,
+  libcamera,
+  rtspSupport ? false,
+  live555,
+  webrtcSupport ? false,
+  openssl,
+
+  lib,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "camera-streamer";
+  version = "0.2.8";
+
+  src = fetchFromGitHub {
+    owner = "ayufan";
+    repo = "camera-streamer";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-8vV8BMFoDeh22I1/qxk6zttJROaD/lrThBxXHZSPpT4=";
+    fetchSubmodules = true;
+  };
+
+  patches = [
+    ./0001-Disable-libdatachannel.patch
+  ];
+
+  # Second replacement fixes literal newline in generated version.h.
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace '/usr/local/bin' '/bin' \
+      --replace 'echo "#define' 'echo -e "#define'
+  '';
+
+  env.NIX_CFLAGS_COMPILE = builtins.toString [
+    "-Wno-error=stringop-overflow"
+    "-Wno-error=format"
+    "-Wno-format"
+    "-Wno-format-security"
+    "-Wno-error=unused-result"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    gnumake
+    pkg-config
+    xxd
+  ];
+
+  dontUseCmakeConfigure = true;
+
+  buildInputs =
+    [
+      nlohmann_json
+      v4l-utils
+    ]
+    ++ (lib.optional ffmpegSupport ffmpeg)
+    ++ (lib.optional libcameraSupport libcamera)
+    ++ (lib.optional rtspSupport live555)
+    ++ (lib.optional webrtcSupport openssl);
+
+  installFlags = [ "DESTDIR=${builtins.placeholder "out"}" ];
+  preInstall = "mkdir -p $out/bin";
+
+  meta = with lib; {
+    description = "High-performance low-latency camera streamer for Raspberry Pi's";
+    website = "https://github.com/ayufan/camera-streamer";
+    license = licenses.gpl3Only;
+  };
+})
--- a/pkgs/jellysearch/nuget-deps.json
+++ b/pkgs/jellysearch/nuget-deps.json
@ -1,172 +0,0 @@
-[
-  {
-    "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
@ -1,36 +0,0 @@
-{
-  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
@ -1,24 +0,0 @@
-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
@ -1,28 +0,0 @@
-----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
@ -1,66 +0,0 @@
-{
-  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
@ -1,53 +0,0 @@
-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
@ -1,29 +0,0 @@
-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
@ -1,68 +1,58 @@
 {
  stdenv,
-  callPackage,
  fetchFromGitHub,
-  makeWrapper,
  meson,
  ninja,
  pkg-config,
  boost,
-  ffmpeg-headless,
+  ffmpeg,
+  libcamera,
  libdrm,
-  libepoxy,
  libexif,
  libjpeg,
  libpng,
  libtiff,
-  libX11,
+  lib,
 }:
-let
-  libcamera-rpi = callPackage (import ../libcamera-rpi/package.nix) { };
-in
+
 stdenv.mkDerivation (finalAttrs: {
  pname = "rpicam-apps";
-  version = "1.7.0";
+  version = "1.4.1";

  src = fetchFromGitHub {
    owner = "raspberrypi";
    repo = "rpicam-apps";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-79qpAfY83YOZdM5ZPyIOkg3s7x75hvjG6Cc96UAIdb0=";
+    rev = "v" + finalAttrs.version;
+    hash = "sha256-3NG2ZE/Ub3lTbfne0LCXuDgLGTPaAAADRdElEbZwvls=";
  };

-  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"
+  buildInputs = [
+    boost
+    ffmpeg
+    libcamera
+    libdrm
+    libexif
+    libjpeg
+    libpng
+    libtiff
  ];

-  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
+  # Meson is no longer able to pick up Boost automatically:
+  # https://github.com/NixOS/nixpkgs/issues/86131
+  BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
+  BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
+
+  meta = with lib; {
+    description = ''
+      libcamera-based applications to drive the cameras on a Raspberry Pi platform
    '';
+    homepage = "https://github.com/raspberrypi/rpicam-apps";
+    license = licenses.bsd2;
+  };
 })
--- a/pkgs/streamrip/ensure-the-default-config-file-is-writable.patch
+++ b/pkgs/streamrip/ensure-the-default-config-file-is-writable.patch
@ -0,0 +1,25 @@
+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
@ -0,0 +1,78 @@
+{
+  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";
+  };
+}
--- a/users/jordan/common/optional/graphical/firefox.nix
+++ b/users/jordan/common/optional/graphical/firefox.nix
@ -10,8 +10,8 @@
    enable = true;
    profiles.Default = {
      search = {
-        default = "ddg";
-        privateDefault = "ddg";
+        default = "DuckDuckGo";
+        privateDefault = "DuckDuckGo";
        force = true;
      };
      userChrome = ''
--- a/users/jordan/common/optional/graphical/fonts.nix
+++ b/users/jordan/common/optional/graphical/fonts.nix
@ -1,17 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-
-{
-  home.packages = with pkgs; [
-    adwaita-fonts
-    apple-color-emoji
-    corefonts
-    nerd-fonts.bigblue-terminal
-    nerd-fonts.comic-shanns-mono
-    nerd-fonts.terminess-ttf
-    nerd-fonts.ubuntu-mono
-    sf-pro
-  ];
-}
--- a/users/jordan/common/optional/graphical/gnome.nix
+++ b/users/jordan/common/optional/graphical/gnome.nix
@ -239,5 +239,5 @@ in
        [ ]
    );

-  services.gpg-agent.pinentry.package = pkgs.pinentry-gnome3;
+  services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
 }
--- a/users/jordan/common/optional/graphical/hyprland/default.nix
+++ b/users/jordan/common/optional/graphical/hyprland/default.nix
@ -58,13 +58,8 @@ in

  wayland.windowManager.hyprland = {
    enable = true;
-    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-    portalPackage =
-      inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
-    plugins = [
-      pkgs.unstable.hyprlandPlugins.hyprbars
-      pkgs.unstable.hyprlandPlugins.hypr-dynamic-cursors
-    ];
+    package = pkgs.unstable.hyprland;
+    # plugins = [ hypr-dynamic-cursors ]; # https://github.com/VirtCode/hypr-dynamic-cursors
    settings = {
      general = {
        gaps_in = 5;
@ -76,22 +71,6 @@ in
        layout = "dwindle";
      };

-      plugin = {
-        dynamic-cursors = {
-          enabled = true;
-          mode = "none";
-          shake = {
-            enabled = true;
-          };
-        };
-
-        hyprbars = {
-          enabled = true;
-          bar_height = 20;
-          bar_blur = true;
-        };
-      };
-
      dwindle = {
        pseudotile = true;
        preserve_split = true;
@ -106,11 +85,6 @@ in
        disable_hyprland_logo = true;
      };

-      ecosystem = {
-        no_donation_nag = true;
-        no_update_news = true;
-      };
-
      decoration = {
        rounding = 10;

@ -121,6 +95,7 @@ in
          enabled = true;
          range = 4;
          render_power = 3;
+          color = "rgba(1a1a1aee)";
        };

        blur = {
@ -247,6 +222,10 @@ in
    };
  };

+  fonts.fontconfig.defaultFonts.sansSerif = [
+    "SF Pro Text"
+  ];
+
  xdg.configFile = mkIf osConfig.programs.hyprland.withUWSM {
    "Kvantum/kvantum.kvconfig".text = toINI { } {
      General.theme = "KvLibadwaitaDark";
@ -260,47 +239,47 @@ in
    ) hyprVariables;
  };

-  home.pointerCursor = {
+  stylix = {
    enable = true;
-    gtk.enable = true;
+    autoEnable = false;
+    image = osConfig.lib.stylix.pixel "base00";
+    polarity = "dark";
+
+    # colors, dracula, eris, google-dark, framer, horizon-terminal-dark, humanoid-dark, isotope, onedark-dark, spacemacs, windows-nt
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/colors.yaml";
+
+    cursor = {
      name = "macOS";
      package = pkgs.apple-cursor;
      size = 28;
    };

-  gtk = {
-    enable = true;
+    fonts = {
+      sansSerif = {
+        name = "SF Pro Text";
+        package = pkgs.sf-pro;
+      };
+      emoji = {
+        name = "Apple Color Emoji";
+        package = pkgs.apple-color-emoji;
+      };
+    };

    iconTheme = {
-      name = "MoreWaita";
+      enable = true;
      package = pkgs.unstable.morewaita-icon-theme;
-    };
+      dark = "MoreWaita";
+      light = "MoreWaita";
    };

-  fonts.fontconfig = {
-    enable = true;
-    defaultFonts = {
-      sansSerif = [
-        "Adwaita Sans"
-      ];
-      emoji = [
-        "Apple Color Emoji"
-      ];
-    };
-  };
-
-  programs.kitty = {
-    enable = true;
-    settings = {
-      background = "#000000";
-      background_opacity = 0.7;
-    };
+    targets.gtk.enable = true;
  };

  home.packages = with pkgs.unstable; [
    anyrun
    clipse
    dunst
+    kitty
    libsForQt5.qtstyleplugin-kvantum
    loupe
    mpv
@ -314,5 +293,5 @@ in
    unclutter.enable = true;
  };

-  services.gpg-agent.pinentry.package = pkgs.pinentry-gnome3;
+  services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
 }
--- a/users/jordan/common/optional/graphical/hyprland/hyprlock.nix
+++ b/users/jordan/common/optional/graphical/hyprland/hyprlock.nix
@ -1,18 +1,8 @@
 {
-  config,
-  lib,
  ...
 }:
-let
-  inherit (lib)
-    getExe
-    ;
-in
-{
-  wayland.windowManager.hyprland.settings.bind = [
-    "$mainMod, L, exec, uwsm app -- ${getExe config.programs.hyprlock.package}"
-  ];

+{
  programs.hyprlock = {
    enable = true;
    settings = {
--- a/users/jordan/common/shell.nix
+++ b/users/jordan/common/shell.nix
@ -1,14 +1,8 @@
 {
-  lib,
  pkgs,
  ...
 }:
-let
-  inherit (lib)
-    mkMerge
-    mkOrder
-    ;
-in
+
 {
  programs = {
    zsh = {
@ -33,12 +27,7 @@ in
        size = 1000000;
      };

-      initContent =
-        let
-          zshConfigBeforeCompInit = mkOrder 550 ''
-            setopt HASH_LIST_ALL
-          '';
-          zshConfig = mkOrder 1000 ''
+      initExtra = ''
        ## Colors
        autoload -U colors && colors

@ -84,11 +73,10 @@ in
        ## Zsh line editor
        unsetopt BEEP
      '';
-        in
-        mkMerge [
-          zshConfigBeforeCompInit
-          zshConfig
-        ];
+
+      initExtraBeforeCompInit = ''
+        setopt HASH_LIST_ALL
+      '';

      localVariables = {
        # Prevent zsh-vi-mode overriding other keybinds
--- a/users/jordan/default.nix
+++ b/users/jordan/default.nix
@ -50,9 +50,4 @@ in

    xdg.enable = true;
  };
-
-  # Workaround: https://github.com/nix-community/home-manager/issues/7166
-  systemd.services."home-manager-${name}".serviceConfig = {
-    RemainAfterExit = "yes";
-  };
 }
--- a/users/jordan/helios.nix
+++ b/users/jordan/helios.nix
@ -6,13 +6,9 @@
 {
  imports = [
    ./common/optional/graphical/firefox.nix
-    ./common/optional/graphical/fonts.nix
-    ./common/optional/graphical/hyprland
-    ./common/optional/graphical/mimeapps.nix
+    ./common/optional/graphical/gnome.nix
  ];

-  programs.nh.enable = true;
-
  home.packages = with pkgs; [
    jellyfin-media-player
  ];
--- a/users/jordan/hypnos.nix
+++ b/users/jordan/hypnos.nix
@ -6,7 +6,6 @@
 {
  imports = [
    ./common/optional/graphical/firefox.nix
-    ./common/optional/graphical/fonts.nix
    ./common/optional/graphical/gnome.nix
  ];

--- a/users/jordan/odyssey.nix
+++ b/users/jordan/odyssey.nix
@ -6,7 +6,6 @@
 {
  imports = [
    ./common/optional/graphical/firefox.nix
-    ./common/optional/graphical/fonts.nix
    ./common/optional/graphical/hyprland
    ./common/optional/graphical/libreoffice.nix
    ./common/optional/graphical/mimeapps.nix