Compare commits

..

8 Commits

Author SHA1 Message Date
7610a9c0e1 feat(john-endesktop): add harmonia binary cache service
Replace broken k8s harmonia deployment with native NixOS service.

Configuration:
- services.harmonia.enable = true
- Bind to [::]:5000 (IPv4 and IPv6)
- Sign key at /etc/harmonia/signing-key.private
- Open firewall port 5000

The signing key must be placed manually on john-endesktop at
/etc/harmonia/signing-key.private using the key generated earlier.

Closes: x-fqaob
2026-02-09 08:10:17 -08:00
mayor
ff57d3c043 fix: update harmonia signing public key
Some checks failed
CI / check (push) Successful in 6m48s
CI / build-and-cache (boxy) (push) Failing after 27m9s
CI / build-and-cache (john-endesktop) (push) Failing after 9m35s
CI / build-and-cache (live-usb) (push) Failing after 18m27s
CI / build-and-cache (nix-book) (push) Failing after 29m17s
CI / build-and-cache (nix-deck) (push) Failing after 1h12m5s
CI / build-and-cache (zix790prors) (push) Failing after 20m0s
2026-02-08 20:26:48 -08:00
3a36594dc9 Merge branch 'polecat/fury/x-iyz0w@mlecbczk': add build-and-cache job for all nixosConfigurations
Some checks failed
CI / build-and-cache (boxy) (push) Has been cancelled
CI / build-and-cache (john-endesktop) (push) Has been cancelled
CI / check (push) Has been cancelled
CI / build-and-cache (live-usb) (push) Has been cancelled
CI / build-and-cache (nix-book) (push) Has been cancelled
CI / build-and-cache (nix-deck) (push) Has been cancelled
CI / build-and-cache (zix790prors) (push) Has been cancelled
2026-02-08 20:17:44 -08:00
5a7064d07b feat(ci): add build-and-cache job for all nixosConfigurations
- Build all 6 machines (nix-book, boxy, zix790prors, nix-deck, john-endesktop, live-usb) in parallel matrix
- Only runs on push to main after check passes
- Signs closures with NIX_SIGNING_KEY secret
- Pushes to cache via SSH using CACHE_SSH_KEY, CACHE_HOST, CACHE_USER secrets
- Skips Darwin as no builder available

Required Gitea secrets:
- NIX_SIGNING_KEY: Cache signing private key
- CACHE_SSH_KEY: SSH key for cache server access
- CACHE_HOST: Cache server hostname
- CACHE_USER: SSH user for cache server

Closes: x-iyz0w

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-02-08 20:17:40 -08:00
8afdf287ee Merge branch 'polecat/shiny/x-qdkuu@mlec8nfv': add harmonia cache to nix.settings
Some checks failed
CI / check (push) Has been cancelled
2026-02-08 20:17:15 -08:00
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
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
2026-02-08 20:16:42 -08:00
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
3 changed files with 21 additions and 4 deletions

View File

@@ -54,6 +54,7 @@ with lib;
4000 # nfs callback
4001 # nlockmgr
4002 # mountd
5000 # harmonia binary cache
20048 # mountd
];
allowedUDPPorts = [
@@ -148,6 +149,16 @@ with lib;
};
};
# Harmonia binary cache server
# Replaces the broken k8s deployment with native NixOS service
services.harmonia = {
enable = true;
signKeyPath = "/etc/harmonia/signing-key.private";
settings = {
bind = "[::]:5000";
};
};
# Time zone
time.timeZone = "America/Los_Angeles"; # Adjust as needed

View File

@@ -23,7 +23,13 @@
max-jobs = "auto";
trusted-users = [ "johno" ];
substituters = [
"https://nix-cache.johnogle.info"
];
trusted-public-keys = [
"nix-cache.johnogle.info-1:G0ZGQwcSC4+4SDDFHZI/ZX3a6uFrs/5cjA5Jvaypj0I="
];
fallback = true;
connect-timeout = 5;
};
gc = {

View File

@@ -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 = {