Merge branch 'polecat/shiny/x-qdkuu@mlec8nfv': add harmonia cache to nix.settings

feat(nix): add harmonia cache to nix.settings
Configure all NixOS machines to use the internal harmonia binary cache: - Add nix-cache.johnogle.info as substituter - Add harmonia signing public key to trusted-public-keys - Enable fallback for local builds when cache unreachable - Set 5s connect-timeout for faster fallback Refs: x-qdkuu Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-02-08 20:17:15 -08:00 · 2026-02-08 20:17:08 -08:00 · 2026-02-08 20:16:42 -08:00 · 2026-02-08 16:49:12 -08:00 · 2026-02-08 14:58:17 -08:00 · 2026-02-08 14:58:05 -08:00
4 changed files with 35 additions and 4 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -258,6 +258,22 @@
        "type": "github"
      }
    },
+    "nixpkgs-qt": {
+      "locked": {
+        "lastModified": 1770464364,
+        "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "nixpkgs-unstable": {
      "locked": {
        "lastModified": 1769170682,
@@ -347,6 +363,7 @@
        "nix-darwin": "nix-darwin",
        "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened",
        "nixpkgs": "nixpkgs",
+        "nixpkgs-qt": "nixpkgs-qt",
        "nixpkgs-unstable": "nixpkgs-unstable",
        "perles": "perles",
        "plasma-manager": "plasma-manager",
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,9 @@
  inputs = {
    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    # Separate nixpkgs for qt5webengine-dependent packages (jellyfin-media-player, etc.)
+    # Updates on separate Renovate schedule to avoid massive qt rebuilds
+    nixpkgs-qt.url = "github:nixos/nixpkgs/nixos-25.11";

    nix-darwin = {
      url = "github:nix-darwin/nix-darwin/nix-darwin-25.11";
@@ -76,6 +79,11 @@
        config.allowUnfree = true;
        overlays = unstableOverlays;
      };
+      # Separate nixpkgs for qt5webengine-heavy packages to avoid rebuild churn
+      qt-pinned = import inputs.nixpkgs-qt {
+        system = prev.stdenv.hostPlatform.system;
+        config.allowUnfree = true;
+      };
      custom = prev.callPackage ./packages {};
      # Compatibility: bitwarden renamed to bitwarden-desktop in unstable
      bitwarden-desktop = prev.bitwarden-desktop or prev.bitwarden;
--- a/roles/common.nix
+++ b/roles/common.nix
@@ -23,7 +23,13 @@
        max-jobs = "auto";
        trusted-users = [ "johno" ];
        substituters = [
+          "https://nix-cache.johnogle.info"
        ];
+        trusted-public-keys = [
+          "nix-cache.johnogle.info-1:IC5x8BxnrqkU9XqhMdDnZLtSg9Y3rBJVXhve5DJ92J0="
+        ];
+        fallback = true;
+        connect-timeout = 5;
      };

      gc = {
--- a/roles/kodi/default.nix
+++ b/roles/kodi/default.nix
@@ -47,23 +47,23 @@ in
      if cfg.jellyfinScaleFactor != null
      then pkgs.symlinkJoin {
        name = "jellyfin-media-player-scaled";
-        paths = [ pkgs.jellyfin-media-player ];
+        paths = [ pkgs.qt-pinned.jellyfin-media-player ];
        nativeBuildInputs = [ pkgs.makeWrapper ];
        postBuild = ''
          mkdir -p $out/bin
          rm -f $out/bin/jellyfin-desktop
-          makeWrapper ${pkgs.jellyfin-media-player}/bin/jellyfin-desktop $out/bin/jellyfin-desktop \
+          makeWrapper ${pkgs.qt-pinned.jellyfin-media-player}/bin/jellyfin-desktop $out/bin/jellyfin-desktop \
            --add-flags "--tv --scale-factor ${toString cfg.jellyfinScaleFactor}"

          # Update .desktop file to include scale factor and TV mode arguments
          mkdir -p $out/share/applications
          rm -f $out/share/applications/org.jellyfin.JellyfinDesktop.desktop
-          substitute ${pkgs.jellyfin-media-player}/share/applications/org.jellyfin.JellyfinDesktop.desktop \
+          substitute ${pkgs.qt-pinned.jellyfin-media-player}/share/applications/org.jellyfin.JellyfinDesktop.desktop \
            $out/share/applications/org.jellyfin.JellyfinDesktop.desktop \
            --replace-fail "Exec=jellyfin-desktop" "Exec=jellyfin-desktop --tv --scale-factor ${toString cfg.jellyfinScaleFactor}"
        '';
      }
-      else pkgs.jellyfin-media-player;
+      else pkgs.qt-pinned.jellyfin-media-player;
  in mkIf cfg.enable
    {
      users.extraUsers.kodi = {
Author	SHA1	Message	Date
nixos_configs/refinery	8afdf287ee	Merge branch 'polecat/shiny/x-qdkuu@mlec8nfv': add harmonia cache to nix.settings Some checks failed CI / check (push) Has been cancelled Details	2026-02-08 20:17:15 -08:00
shiny	bb3cdd8046	feat(nix): add harmonia cache to nix.settings Configure all NixOS machines to use the internal harmonia binary cache: - Add nix-cache.johnogle.info as substituter - Add harmonia signing public key to trusted-public-keys - Enable fallback for local builds when cache unreachable - Set 5s connect-timeout for faster fallback Refs: x-qdkuu Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-02-08 20:17:08 -08:00
nixos_configs/refinery	1380fb307a	Merge branch 'polecat/nitro/x-xiiep@mlebx809': source jellyfin-media-player from qt-pinned namespace Some checks failed CI / check (push) Has been cancelled Details	2026-02-08 20:16:42 -08:00
nitro	6ccfb5097c	feat(roles/kodi): source jellyfin-media-player from qt-pinned namespace Update kodi role to use pkgs.qt-pinned.jellyfin-media-player instead of pkgs.jellyfin-media-player. This decouples jellyfin from the main nixpkgs update cycle, avoiding massive qt5webengine rebuilds when updating other packages. The qt-pinned namespace was added in commit `03f1692`. Closes: x-xiiep Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-02-08 16:49:12 -08:00
nixos_configs/refinery	1b585847ab	Merge branch 'polecat/chrome/x-ymkgu@mlebby8e': update renovate schedules to Saturday afternoon All checks were successful CI / check (push) Successful in 16m9s Details	2026-02-08 14:58:17 -08:00
chrome	e7906331dc	feat(renovate): update schedules to Saturday afternoon - lockFileMaintenance: Saturday 2-4pm (was Monday 5am) - nix-stable-ecosystem: Saturday 2-4pm - nix-unstable-ecosystem: Saturday 2-4pm - Add nixpkgs-qt rule: Saturday 4-6pm (staggered) This allows CI builds to run overnight Saturday→Sunday, with human review Saturday evening and builds complete by Sunday morning. Closes: x-ymkgu	2026-02-08 14:58:05 -08:00
nixos_configs/refinery	dc722843a9	Merge branch 'polecat/rust/x-lnr8g@mlebamik': add nixpkgs-qt input for qt5webengine Some checks failed CI / check (push) Has been cancelled Details	2026-02-08 14:57:19 -08:00
rust	03f169284d	feat(flake): add nixpkgs-qt input for qt5webengine packages Add separate nixpkgs input for qt5webengine-dependent packages like jellyfin-media-player. This input updates on a separate Renovate schedule from main nixpkgs to avoid massive qt5webengine rebuilds when updating other packages. - Add nixpkgs-qt input pinned to nixos-25.11 - Create pkgs.qt-pinned overlay namespace Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-02-08 14:35:35 -08:00