Compare commits
2 commits
99ffdeac4c
...
09be304b8e
| Author | SHA1 | Date | |
|---|---|---|---|
| 09be304b8e | |||
| c11fe8867c |
7 changed files with 21 additions and 37 deletions
|
|
@ -23,6 +23,8 @@ 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
|
||||||
|
|
@ -36,27 +38,26 @@ 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 = '';
|
||||||
|
|
||||||
console.log('Updating jfa-go image');
|
updates += updateImages(`${FLAKE}/devices/nos/modules/jellyfin`) ?? '';
|
||||||
updates += spawnSync('updateImages',
|
updates += updateImages(`${FLAKE}/devices/homie/modules/home-assistant/netdaemon`) ?? '';
|
||||||
[`${FLAKE}/devices/nos/modules/jellyfin`],
|
|
||||||
{ shell: true })
|
|
||||||
.stdout.toString();
|
|
||||||
|
|
||||||
console.log('Updating netdaemon image');
|
const DIR = `${FLAKE}/devices/nos/modules/docker`;
|
||||||
updates += spawnSync('updateImages',
|
|
||||||
[`${FLAKE}/devices/homie/modules/home-assistant/netdaemon`],
|
|
||||||
{ shell: true })
|
|
||||||
.stdout.toString();
|
|
||||||
|
|
||||||
const FILE = `${FLAKE}/devices/nos/modules/docker`;
|
readdirSync(DIR, { withFileTypes: true, recursive: true }).forEach((path) => {
|
||||||
|
|
||||||
readdirSync(FILE, { withFileTypes: true, recursive: true }).forEach((path) => {
|
|
||||||
if (path.name === 'compose.nix') {
|
if (path.name === 'compose.nix') {
|
||||||
console.log(`Updating ${path.parentPath.split('/').at(-1)} images`);
|
updates += updateImages(path.parentPath) ?? '';
|
||||||
updates += spawnSync('updateImages', [path.parentPath], { shell: true })
|
|
||||||
.stdout.toString();
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
pkgs:
|
pkgs:
|
||||||
pkgs.dockerTools.pullImage rec {
|
pkgs.dockerTools.pullImage rec {
|
||||||
imageName = "rssbridge/rss-bridge";
|
imageName = "rssbridge/rss-bridge";
|
||||||
imageDigest = "sha256:42b4d1d1e3fb2c361a3a2fe2921a847bbdcd0d6d14a4d411482665fc4560a58d";
|
imageDigest = "sha256:27715a8921343d80e814a96675f63c0494efcae2c5628ba6f88e1626a3eb2fb0";
|
||||||
sha256 = "0f0d0710k99gq4dvayjl4n0aby8gly04jp9bn6qab0j3zy0wdb0y";
|
sha256 = "0ysycwvrwjzz3mkllcv7h2gjic89bizsz7m2n40bnz7jl8z45bwc";
|
||||||
finalImageName = imageName;
|
finalImageName = imageName;
|
||||||
finalImageTag = "latest";
|
finalImageTag = "latest";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,21 +11,7 @@
|
||||||
in {
|
in {
|
||||||
services.jellyfin = {
|
services.jellyfin = {
|
||||||
package = jellyPkgs.jellyfin;
|
package = jellyPkgs.jellyfin;
|
||||||
webPackage = jellyPkgs.jellyfin-web.overrideAttrs {
|
webPackage = jellyPkgs.jellyfin-web.override {forceEnableBackdrops = true;};
|
||||||
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
|
|
||||||
;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
BIN
flake.lock
BIN
flake.lock
Binary file not shown.
BIN
flake.nix
BIN
flake.nix
Binary file not shown.
|
|
@ -113,9 +113,6 @@ 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 {
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ in
|
||||||
|
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm.fetchDeps {
|
||||||
inherit (finalAttrs) pname version src;
|
inherit (finalAttrs) pname version src;
|
||||||
hash = "sha256-kwIheATWkKnkbAEB6YMGVyRVKyVaKLw4cO8tmrtTyuw=";
|
hash = "sha256-M5PpW8bUoOPeNZefknNxcoWBYqI7AXN37fQ41rHnEa8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
passthru.update = concatTextFile {
|
passthru.update = concatTextFile {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue