diff --git a/hosts/himalia/hardware/default.nix b/hosts/himalia/hardware/default.nix index 3de0e41..d073439 100644 --- a/hosts/himalia/hardware/default.nix +++ b/hosts/himalia/hardware/default.nix @@ -127,7 +127,8 @@ programs.gamescope.args = [ # FIXME: https://github.com/ValveSoftware/gamescope/issues/1590 - "--prefer-vk-device" "10de:2f58" + "--prefer-vk-device" + "10de:2f58" ]; environment.persistence."/persist/state"."/etc/asusd/aura_19b6.ron" = { }; diff --git a/packages/default.nix b/packages/default.nix index 5168560..aaa0846 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -53,15 +53,17 @@ ghost = import ./ghost { inherit pkgs; }; - jellyfin-plugin-bookshelf = import ./jellyfin/plugins/bookshelf { inherit pkgs; }; - jellyfin-plugin-intro-skipper = import ./jellyfin/plugins/intro-skipper { inherit pkgs; }; - jellyfin-plugin-opensubtitles = import ./jellyfin/plugins/opensubtitles { inherit pkgs; }; - jellyfin-plugin-playbackreporting = import ./jellyfin/plugins/playbackreporting { inherit pkgs; }; - jellyfin-plugin-reports = import ./jellyfin/plugins/reports { inherit pkgs; }; - jellyfin-plugin-sso = import ./jellyfin/plugins/sso { inherit pkgs; }; - jellyfin-plugin-subtitleextract = import ./jellyfin/plugins/subtitleextract { inherit pkgs; }; - jellyfin-plugin-tmdbboxsets = import ./jellyfin/plugins/tmdbboxsets { inherit pkgs; }; - jellyfin-plugin-tvdb = import ./jellyfin/plugins/tvdb { inherit pkgs; }; + jellyfin-plugin-bookshelf-bin = import ./jellyfin/plugins/bookshelf { inherit pkgs; }; + jellyfin-plugin-intro-skipper-bin = import ./jellyfin/plugins/intro-skipper { inherit pkgs; }; + jellyfin-plugin-opensubtitles-bin = import ./jellyfin/plugins/opensubtitles { inherit pkgs; }; + jellyfin-plugin-playbackreporting-bin = import ./jellyfin/plugins/playbackreporting { + inherit pkgs; + }; + jellyfin-plugin-reports-bin = import ./jellyfin/plugins/reports { inherit pkgs; }; + jellyfin-plugin-sso-bin = import ./jellyfin/plugins/sso { inherit pkgs; }; + jellyfin-plugin-subtitleextract-bin = import ./jellyfin/plugins/subtitleextract { inherit pkgs; }; + jellyfin-plugin-tmdbboxsets-bin = import ./jellyfin/plugins/tmdbboxsets { inherit pkgs; }; + jellyfin-plugin-tvdb-bin = import ./jellyfin/plugins/tvdb { inherit pkgs; }; littlelink-server = import ./littlelink-server { inherit pkgs; }; diff --git a/packages/docker/gitea-act-runner/entrypoint.sh b/packages/docker/gitea-act-runner/entrypoint.sh index fde3627..1493830 100644 --- a/packages/docker/gitea-act-runner/entrypoint.sh +++ b/packages/docker/gitea-act-runner/entrypoint.sh @@ -21,7 +21,7 @@ mkfifo "$LOG_PIPE" if [ ! -f /var/lib/gitea-act-runner/registration ]; then GITEA_API="${GITEA_INSTANCE_URL%/}/api/v1" - auth="Authorization: Basic $(echo -n "$GITEA_ADMIN_USERNAME:$GITEA_ADMIN_PASSWORD" | base64 -w 0)" + auth="Authorization: Basic $(printf '%s' "$GITEA_ADMIN_USERNAME:$GITEA_ADMIN_PASSWORD" | base64 -w 0)" runners="$(curl -sf --retry 10 --retry-connrefused -H "$auth" "$GITEA_API/admin/actions/runners")" old_runner="$(echo "$runners" | jq -r ".runners[] | select(.name == \"$GITEA_RUNNER_NAME\") | .id")" diff --git a/packages/docker/jellyfin/default.nix b/packages/docker/jellyfin/default.nix index f48e3fc..d2a6dc7 100644 --- a/packages/docker/jellyfin/default.nix +++ b/packages/docker/jellyfin/default.nix @@ -19,49 +19,53 @@ let cp -r ${pkgs.jellyfin-web}/share/jellyfin-web $out/var/www/jellyfin ''; - jellyfin-plugin-bookshelf = pkgs.runCommandLocal "jellyfin-plugin-bookshelf" { } '' + jellyfin-plugin-bookshelf-bin = pkgs.runCommandLocal "jellyfin-plugin-bookshelf-bin" { } '' mkdir -p $out/var/lib/jellyfin/plugins - cp -r ${selfPkgs.jellyfin-plugin-bookshelf} $out/var/lib/jellyfin/plugins/bookshelf + cp -r ${selfPkgs.jellyfin-plugin-bookshelf-bin} $out/var/lib/jellyfin/plugins/bookshelf ''; - jellyfin-plugin-intro-skipper = pkgs.runCommandLocal "jellyfin-plugin-intro-skipper" { } '' + jellyfin-plugin-intro-skipper-bin = pkgs.runCommandLocal "jellyfin-plugin-intro-skipper-bin" { } '' mkdir -p $out/var/lib/jellyfin/plugins - cp -r ${selfPkgs.jellyfin-plugin-intro-skipper} $out/var/lib/jellyfin/plugins/intro-skipper + cp -r ${selfPkgs.jellyfin-plugin-intro-skipper-bin} $out/var/lib/jellyfin/plugins/intro-skipper ''; - jellyfin-plugin-opensubtitles = pkgs.runCommandLocal "jellyfin-plugin-opensubtitles" { } '' + jellyfin-plugin-opensubtitles-bin = pkgs.runCommandLocal "jellyfin-plugin-opensubtitles-bin" { } '' mkdir -p $out/var/lib/jellyfin/plugins - cp -r ${selfPkgs.jellyfin-plugin-opensubtitles} $out/var/lib/jellyfin/plugins/opensubtitles + cp -r ${selfPkgs.jellyfin-plugin-opensubtitles-bin} $out/var/lib/jellyfin/plugins/opensubtitles ''; - jellyfin-plugin-playbackreporting = pkgs.runCommandLocal "jellyfin-plugin-playbackreporting" { } '' + jellyfin-plugin-playbackreporting-bin = + pkgs.runCommandLocal "jellyfin-plugin-playbackreporting-bin" { } + '' + mkdir -p $out/var/lib/jellyfin/plugins + cp -r ${selfPkgs.jellyfin-plugin-playbackreporting-bin} $out/var/lib/jellyfin/plugins/playbackreporting + ''; + + jellyfin-plugin-reports-bin = pkgs.runCommandLocal "jellyfin-plugin-reports-bin" { } '' mkdir -p $out/var/lib/jellyfin/plugins - cp -r ${selfPkgs.jellyfin-plugin-playbackreporting} $out/var/lib/jellyfin/plugins/playbackreporting + cp -r ${selfPkgs.jellyfin-plugin-reports-bin} $out/var/lib/jellyfin/plugins/reports ''; - jellyfin-plugin-reports = pkgs.runCommandLocal "jellyfin-plugin-reports" { } '' + jellyfin-plugin-sso-bin = pkgs.runCommandLocal "jellyfin-plugin-sso-bin" { } '' mkdir -p $out/var/lib/jellyfin/plugins - cp -r ${selfPkgs.jellyfin-plugin-reports} $out/var/lib/jellyfin/plugins/reports + cp -r ${selfPkgs.jellyfin-plugin-sso-bin} $out/var/lib/jellyfin/plugins/sso ''; - jellyfin-plugin-sso = pkgs.runCommandLocal "jellyfin-plugin-sso" { } '' + jellyfin-plugin-subtitleextract-bin = + pkgs.runCommandLocal "jellyfin-plugin-subtitleextract-bin" { } + '' + mkdir -p $out/var/lib/jellyfin/plugins + cp -r ${selfPkgs.jellyfin-plugin-subtitleextract-bin} $out/var/lib/jellyfin/plugins/subtitleextract + ''; + + jellyfin-plugin-tmdbboxsets-bin = pkgs.runCommandLocal "jellyfin-plugin-tmdbboxsets-bin" { } '' mkdir -p $out/var/lib/jellyfin/plugins - cp -r ${selfPkgs.jellyfin-plugin-sso} $out/var/lib/jellyfin/plugins/sso + cp -r ${selfPkgs.jellyfin-plugin-tmdbboxsets-bin} $out/var/lib/jellyfin/plugins/tmdbboxsets ''; - jellyfin-plugin-subtitleextract = pkgs.runCommandLocal "jellyfin-plugin-subtitleextract" { } '' + jellyfin-plugin-tvdb-bin = pkgs.runCommandLocal "jellyfin-plugin-tvdb-bin" { } '' mkdir -p $out/var/lib/jellyfin/plugins - cp -r ${selfPkgs.jellyfin-plugin-subtitleextract} $out/var/lib/jellyfin/plugins/subtitleextract - ''; - - jellyfin-plugin-tmdbboxsets = pkgs.runCommandLocal "jellyfin-plugin-tmdbboxsets" { } '' - mkdir -p $out/var/lib/jellyfin/plugins - cp -r ${selfPkgs.jellyfin-plugin-tmdbboxsets} $out/var/lib/jellyfin/plugins/tmdbboxsets - ''; - - jellyfin-plugin-tvdb = pkgs.runCommandLocal "jellyfin-plugin-tvdb" { } '' - mkdir -p $out/var/lib/jellyfin/plugins - cp -r ${selfPkgs.jellyfin-plugin-tvdb} $out/var/lib/jellyfin/plugins/tvdb + cp -r ${selfPkgs.jellyfin-plugin-tvdb-bin} $out/var/lib/jellyfin/plugins/tvdb ''; entrypoint = pkgs.writeTextFile { @@ -81,15 +85,15 @@ pkgs.dockerTools.buildImage { entrypoint jellyfin jellyfin-web - jellyfin-plugin-bookshelf - jellyfin-plugin-intro-skipper - jellyfin-plugin-opensubtitles - jellyfin-plugin-playbackreporting - jellyfin-plugin-reports - jellyfin-plugin-sso - jellyfin-plugin-subtitleextract - jellyfin-plugin-tmdbboxsets - jellyfin-plugin-tvdb + jellyfin-plugin-bookshelf-bin + jellyfin-plugin-intro-skipper-bin + jellyfin-plugin-opensubtitles-bin + jellyfin-plugin-playbackreporting-bin + jellyfin-plugin-reports-bin + jellyfin-plugin-sso-bin + jellyfin-plugin-subtitleextract-bin + jellyfin-plugin-tmdbboxsets-bin + jellyfin-plugin-tvdb-bin jellyfin-ffmpeg curl jq diff --git a/packages/jellyfin/plugins/bookshelf/default.nix b/packages/jellyfin/plugins/bookshelf/default.nix index 3c7b4b2..3e46cea 100644 --- a/packages/jellyfin/plugins/bookshelf/default.nix +++ b/packages/jellyfin/plugins/bookshelf/default.nix @@ -1,5 +1,5 @@ { pkgs, ... }: -# AUTO-UPDATE: nix-update --flake jellyfin-plugin-bookshelf +# AUTO-UPDATE: nix-update --flake jellyfin-plugin-bookshelf-bin pkgs.stdenv.mkDerivation (finalAttrs: { pname = "bookshelf"; version = "12"; diff --git a/packages/jellyfin/plugins/intro-skipper/default.nix b/packages/jellyfin/plugins/intro-skipper/default.nix index eac1d27..b78e36e 100644 --- a/packages/jellyfin/plugins/intro-skipper/default.nix +++ b/packages/jellyfin/plugins/intro-skipper/default.nix @@ -1,5 +1,5 @@ { pkgs, ... }: -# AUTO-UPDATE: nix-update --flake jellyfin-plugin-intro-skipper +# AUTO-UPDATE: nix-update --flake jellyfin-plugin-intro-skipper-bin pkgs.stdenv.mkDerivation (finalAttrs: { pname = "intro-skipper"; version = "10.10/v1.10.10.22"; diff --git a/packages/jellyfin/plugins/opensubtitles/default.nix b/packages/jellyfin/plugins/opensubtitles/default.nix index 8a349f0..46728ac 100644 --- a/packages/jellyfin/plugins/opensubtitles/default.nix +++ b/packages/jellyfin/plugins/opensubtitles/default.nix @@ -1,5 +1,5 @@ { pkgs, ... }: -# AUTO-UPDATE: nix-update --flake jellyfin-plugin-opensubtitles +# AUTO-UPDATE: nix-update --flake jellyfin-plugin-opensubtitles-bin pkgs.stdenv.mkDerivation (finalAttrs: { pname = "opensubtitles"; version = "20"; diff --git a/packages/jellyfin/plugins/playbackreporting/default.nix b/packages/jellyfin/plugins/playbackreporting/default.nix index 41ff600..b26d661 100644 --- a/packages/jellyfin/plugins/playbackreporting/default.nix +++ b/packages/jellyfin/plugins/playbackreporting/default.nix @@ -1,5 +1,5 @@ { pkgs, ... }: -# AUTO-UPDATE: nix-update --flake jellyfin-plugin-playbackreporting +# AUTO-UPDATE: nix-update --flake jellyfin-plugin-playbackreporting-bin pkgs.stdenv.mkDerivation (finalAttrs: { pname = "playbackreporting"; version = "16"; diff --git a/packages/jellyfin/plugins/reports/default.nix b/packages/jellyfin/plugins/reports/default.nix index 8a39570..f2e9fee 100644 --- a/packages/jellyfin/plugins/reports/default.nix +++ b/packages/jellyfin/plugins/reports/default.nix @@ -1,5 +1,5 @@ { pkgs, ... }: -# AUTO-UPDATE: nix-update --flake jellyfin-plugin-reports +# AUTO-UPDATE: nix-update --flake jellyfin-plugin-reports-bin pkgs.stdenv.mkDerivation (finalAttrs: { pname = "reports"; version = "17"; diff --git a/packages/jellyfin/plugins/sso/default.nix b/packages/jellyfin/plugins/sso/default.nix index c3af67e..464ea2b 100644 --- a/packages/jellyfin/plugins/sso/default.nix +++ b/packages/jellyfin/plugins/sso/default.nix @@ -1,5 +1,5 @@ { pkgs, ... }: -# AUTO-UPDATE: nix-update --flake jellyfin-plugin-sso +# AUTO-UPDATE: nix-update --flake jellyfin-plugin-sso-bin pkgs.stdenv.mkDerivation (finalAttrs: { pname = "sso"; version = "3.5.2.4"; diff --git a/packages/jellyfin/plugins/subtitleextract/default.nix b/packages/jellyfin/plugins/subtitleextract/default.nix index 57c24d5..8f110e9 100644 --- a/packages/jellyfin/plugins/subtitleextract/default.nix +++ b/packages/jellyfin/plugins/subtitleextract/default.nix @@ -1,5 +1,5 @@ { pkgs, ... }: -# AUTO-UPDATE: nix-update --flake jellyfin-plugin-subtitleextract +# AUTO-UPDATE: nix-update --flake jellyfin-plugin-subtitleextract-bin pkgs.stdenv.mkDerivation (finalAttrs: { pname = "subtitleextract"; version = "4"; diff --git a/packages/jellyfin/plugins/tmdbboxsets/default.nix b/packages/jellyfin/plugins/tmdbboxsets/default.nix index 844a29b..dd870f7 100644 --- a/packages/jellyfin/plugins/tmdbboxsets/default.nix +++ b/packages/jellyfin/plugins/tmdbboxsets/default.nix @@ -1,5 +1,5 @@ { pkgs, ... }: -# AUTO-UPDATE: nix-update --flake jellyfin-plugin-tmdbboxsets +# AUTO-UPDATE: nix-update --flake jellyfin-plugin-tmdbboxsets-bin pkgs.stdenv.mkDerivation (finalAttrs: { pname = "tmdbboxsets"; version = "11"; diff --git a/packages/jellyfin/plugins/tvdb/default.nix b/packages/jellyfin/plugins/tvdb/default.nix index 0d5da74..4b64b87 100644 --- a/packages/jellyfin/plugins/tvdb/default.nix +++ b/packages/jellyfin/plugins/tvdb/default.nix @@ -1,5 +1,5 @@ { pkgs, ... }: -# AUTO-UPDATE: nix-update --flake jellyfin-plugin-tvdb +# AUTO-UPDATE: nix-update --flake jellyfin-plugin-tvdb-bin pkgs.stdenv.mkDerivation (finalAttrs: { pname = "tvdb"; version = "19";