Compare commits

..

No commits in common. "09be304b8e3bc5baecc16772dd46bc5c67bde667" and "99ffdeac4c948cef91dfd97fd5cf8196a99d0ff7" have entirely different histories.

7 changed files with 37 additions and 21 deletions

View file

@ -23,8 +23,6 @@ export const updateFlakeInputs = () => {
'flake-parts', 'flake-parts',
'treefmt-nix', 'treefmt-nix',
'lib-aggregate', 'lib-aggregate',
'lib-aggregate/nixpkgs-lib',
'sops-nix/nixpkgs-stable',
].some((inputName) => input.startsWith(` Updated input '${inputName}'`))) ].some((inputName) => input.startsWith(` Updated input '${inputName}'`)))
.join('\n\n•') .join('\n\n•')
// Shorten git revs to help readability // Shorten git revs to help readability
@ -38,26 +36,27 @@ export const updateFlakeInputs = () => {
}; };
export const updateDocker = () => { export const updateDocker = () => {
const updateImages = (imagePath: string): string | undefined => {
console.log(`Updating ${imagePath.split('/').at(-1)} images`);
const out = spawnSync('updateImages', [imagePath], { shell: true }).stdout.toString();
if (out !== '# Locked') {
return out;
}
};
let updates = ''; let updates = '';
updates += updateImages(`${FLAKE}/devices/nos/modules/jellyfin`) ?? ''; console.log('Updating jfa-go image');
updates += updateImages(`${FLAKE}/devices/homie/modules/home-assistant/netdaemon`) ?? ''; updates += spawnSync('updateImages',
[`${FLAKE}/devices/nos/modules/jellyfin`],
{ shell: true })
.stdout.toString();
const DIR = `${FLAKE}/devices/nos/modules/docker`; console.log('Updating netdaemon image');
updates += spawnSync('updateImages',
[`${FLAKE}/devices/homie/modules/home-assistant/netdaemon`],
{ shell: true })
.stdout.toString();
readdirSync(DIR, { withFileTypes: true, recursive: true }).forEach((path) => { const FILE = `${FLAKE}/devices/nos/modules/docker`;
readdirSync(FILE, { withFileTypes: true, recursive: true }).forEach((path) => {
if (path.name === 'compose.nix') { if (path.name === 'compose.nix') {
updates += updateImages(path.parentPath) ?? ''; console.log(`Updating ${path.parentPath.split('/').at(-1)} images`);
updates += spawnSync('updateImages', [path.parentPath], { shell: true })
.stdout.toString();
} }
}); });

View file

@ -1,8 +1,8 @@
pkgs: pkgs:
pkgs.dockerTools.pullImage rec { pkgs.dockerTools.pullImage rec {
imageName = "rssbridge/rss-bridge"; imageName = "rssbridge/rss-bridge";
imageDigest = "sha256:27715a8921343d80e814a96675f63c0494efcae2c5628ba6f88e1626a3eb2fb0"; imageDigest = "sha256:42b4d1d1e3fb2c361a3a2fe2921a847bbdcd0d6d14a4d411482665fc4560a58d";
sha256 = "0ysycwvrwjzz3mkllcv7h2gjic89bizsz7m2n40bnz7jl8z45bwc"; sha256 = "0f0d0710k99gq4dvayjl4n0aby8gly04jp9bn6qab0j3zy0wdb0y";
finalImageName = imageName; finalImageName = imageName;
finalImageTag = "latest"; finalImageTag = "latest";
} }

View file

@ -11,7 +11,21 @@
in { in {
services.jellyfin = { services.jellyfin = {
package = jellyPkgs.jellyfin; package = jellyPkgs.jellyfin;
webPackage = jellyPkgs.jellyfin-web.override {forceEnableBackdrops = true;}; webPackage = jellyPkgs.jellyfin-web.overrideAttrs {
postInstall = ''
substituteInPlace $out/share/jellyfin-web/main.jellyfin.bundle.js --replace-fail \
'enableBackdrops:function(){return L}' 'enableBackdrops:function(){return _}'
'';
};
ffmpegPackage = jellyPkgs.jellyfin-ffmpeg; ffmpegPackage = jellyPkgs.jellyfin-ffmpeg;
}; };
environment.systemPackages = builtins.attrValues {
inherit
(config.services.jellyfin)
finalPackage
webPackage
ffmpegPackage
;
};
} }

Binary file not shown.

BIN
flake.nix

Binary file not shown.

View file

@ -113,6 +113,9 @@ let
hyprland = mkDep { hyprland = mkDep {
owner = "hyprwm"; owner = "hyprwm";
repo = "Hyprland"; repo = "Hyprland";
# FIXME: https://github.com/hyprwm/Hyprland/issues/8325
rev = "3852418d2446555509738bf1486940042107afe7";
}; };
hyprland-plugins = mkHyprDep { hyprland-plugins = mkHyprDep {

View file

@ -30,7 +30,7 @@ in
pnpmDeps = pnpm.fetchDeps { pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src; inherit (finalAttrs) pname version src;
hash = "sha256-M5PpW8bUoOPeNZefknNxcoWBYqI7AXN37fQ41rHnEa8="; hash = "sha256-kwIheATWkKnkbAEB6YMGVyRVKyVaKLw4cO8tmrtTyuw=";
}; };
passthru.update = concatTextFile { passthru.update = concatTextFile {