Compare commits
8 Commits
216fd3302b
...
f5ea3e6236
| Author | SHA1 | Date | |
|---|---|---|---|
| f5ea3e6236 | |||
|
|
ff57d3c043 | ||
| 3a36594dc9 | |||
| 5a7064d07b | |||
| 8afdf287ee | |||
| bb3cdd8046 | |||
| 1380fb307a | |||
| 6ccfb5097c |
@@ -18,3 +18,50 @@ jobs:
|
|||||||
run: nix flake check
|
run: nix flake check
|
||||||
env:
|
env:
|
||||||
NIX_CONFIG: "access-tokens = git.johnogle.info=${{ secrets.GITEA_ACCESS_TOKEN }}"
|
NIX_CONFIG: "access-tokens = git.johnogle.info=${{ secrets.GITEA_ACCESS_TOKEN }}"
|
||||||
|
|
||||||
|
build-and-cache:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: check
|
||||||
|
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
machine:
|
||||||
|
- nix-book
|
||||||
|
- boxy
|
||||||
|
- zix790prors
|
||||||
|
- nix-deck
|
||||||
|
- john-endesktop
|
||||||
|
- live-usb
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- uses: https://git.johnogle.info/johno/gitea-actions/nix-setup@v1
|
||||||
|
|
||||||
|
- name: Build ${{ matrix.machine }}
|
||||||
|
id: build
|
||||||
|
run: |
|
||||||
|
OUT_PATH=$(nix build .#nixosConfigurations.${{ matrix.machine }}.config.system.build.toplevel --no-link --print-out-paths)
|
||||||
|
echo "out_path=$OUT_PATH" >> "$GITHUB_OUTPUT"
|
||||||
|
env:
|
||||||
|
NIX_CONFIG: "access-tokens = git.johnogle.info=${{ secrets.GITEA_ACCESS_TOKEN }}"
|
||||||
|
|
||||||
|
- name: Sign and push to cache
|
||||||
|
run: |
|
||||||
|
# Write signing key
|
||||||
|
echo "${{ secrets.NIX_SIGNING_KEY }}" > /tmp/signing-key
|
||||||
|
chmod 600 /tmp/signing-key
|
||||||
|
|
||||||
|
# Sign the closure
|
||||||
|
nix store sign --key-file /tmp/signing-key -r "${{ steps.build.outputs.out_path }}"
|
||||||
|
|
||||||
|
# Setup SSH key for cache push
|
||||||
|
mkdir -p ~/.ssh
|
||||||
|
echo "${{ secrets.CACHE_SSH_KEY }}" > ~/.ssh/cache_key
|
||||||
|
chmod 600 ~/.ssh/cache_key
|
||||||
|
ssh-keyscan -H ${{ secrets.CACHE_HOST }} >> ~/.ssh/known_hosts 2>/dev/null || true
|
||||||
|
|
||||||
|
# Push to cache
|
||||||
|
nix copy --to "ssh-ng://${{ secrets.CACHE_USER }}@${{ secrets.CACHE_HOST }}?ssh-key=$HOME/.ssh/cache_key" "${{ steps.build.outputs.out_path }}"
|
||||||
|
env:
|
||||||
|
NIX_CONFIG: "access-tokens = git.johnogle.info=${{ secrets.GITEA_ACCESS_TOKEN }}"
|
||||||
|
|||||||
8
flake.lock
generated
8
flake.lock
generated
@@ -8,17 +8,17 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770601353,
|
"lastModified": 1770604276,
|
||||||
"narHash": "sha256-PalPrOXi2ZkGak4hZzFE8lazfOFnMV/A2cKOCgKA4AY=",
|
"narHash": "sha256-U5u6LI8KyKf4J5fl3BfOT7woLa2tJ4JVR3y33Fa6UAs=",
|
||||||
"owner": "steveyegge",
|
"owner": "steveyegge",
|
||||||
"repo": "beads",
|
"repo": "beads",
|
||||||
"rev": "28d64861937bb1acd72829828d6f710b1fb53604",
|
"rev": "bcfaed92f67238b9f4844445dca8b9fcb7abeaf3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "steveyegge",
|
"owner": "steveyegge",
|
||||||
"repo": "beads",
|
"repo": "beads",
|
||||||
"rev": "28d64861937bb1acd72829828d6f710b1fb53604",
|
"rev": "bcfaed92f67238b9f4844445dca8b9fcb7abeaf3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -48,7 +48,7 @@
|
|||||||
beads = {
|
beads = {
|
||||||
# v0.49.1 has dolt server mode support (gt-1mf.3)
|
# v0.49.1 has dolt server mode support (gt-1mf.3)
|
||||||
# Pinned to 259ddd92 - uses Go 1.24 compatible with nixpkgs
|
# Pinned to 259ddd92 - uses Go 1.24 compatible with nixpkgs
|
||||||
url = "github:steveyegge/beads/28d64861937bb1acd72829828d6f710b1fb53604";
|
url = "github:steveyegge/beads/bcfaed92f67238b9f4844445dca8b9fcb7abeaf3";
|
||||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,13 @@
|
|||||||
max-jobs = "auto";
|
max-jobs = "auto";
|
||||||
trusted-users = [ "johno" ];
|
trusted-users = [ "johno" ];
|
||||||
substituters = [
|
substituters = [
|
||||||
|
"https://nix-cache.johnogle.info"
|
||||||
];
|
];
|
||||||
|
trusted-public-keys = [
|
||||||
|
"nix-cache.johnogle.info-1:G0ZGQwcSC4+4SDDFHZI/ZX3a6uFrs/5cjA5Jvaypj0I="
|
||||||
|
];
|
||||||
|
fallback = true;
|
||||||
|
connect-timeout = 5;
|
||||||
};
|
};
|
||||||
|
|
||||||
gc = {
|
gc = {
|
||||||
|
|||||||
@@ -47,23 +47,23 @@ in
|
|||||||
if cfg.jellyfinScaleFactor != null
|
if cfg.jellyfinScaleFactor != null
|
||||||
then pkgs.symlinkJoin {
|
then pkgs.symlinkJoin {
|
||||||
name = "jellyfin-media-player-scaled";
|
name = "jellyfin-media-player-scaled";
|
||||||
paths = [ pkgs.jellyfin-media-player ];
|
paths = [ pkgs.qt-pinned.jellyfin-media-player ];
|
||||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
rm -f $out/bin/jellyfin-desktop
|
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}"
|
--add-flags "--tv --scale-factor ${toString cfg.jellyfinScaleFactor}"
|
||||||
|
|
||||||
# Update .desktop file to include scale factor and TV mode arguments
|
# Update .desktop file to include scale factor and TV mode arguments
|
||||||
mkdir -p $out/share/applications
|
mkdir -p $out/share/applications
|
||||||
rm -f $out/share/applications/org.jellyfin.JellyfinDesktop.desktop
|
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 \
|
$out/share/applications/org.jellyfin.JellyfinDesktop.desktop \
|
||||||
--replace-fail "Exec=jellyfin-desktop" "Exec=jellyfin-desktop --tv --scale-factor ${toString cfg.jellyfinScaleFactor}"
|
--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
|
in mkIf cfg.enable
|
||||||
{
|
{
|
||||||
users.extraUsers.kodi = {
|
users.extraUsers.kodi = {
|
||||||
|
|||||||
Reference in New Issue
Block a user