chore: update flake.lock
All checks were successful
Discord / discord commits (push) Has been skipped

This commit is contained in:
matt1432 2024-08-08 23:27:42 -04:00
parent f06b0d9c5b
commit 6bcbadfdb1
16 changed files with 28 additions and 105 deletions

View file

@ -15,7 +15,6 @@ in {
./wg-easy/compose.nix ./wg-easy/compose.nix
./media/bazarr/compose.nix ./media/bazarr/compose.nix
./media/calibre/compose.nix
./media/joal/compose.nix ./media/joal/compose.nix
./media/prowlarr/compose.nix ./media/prowlarr/compose.nix
./media/radarr/compose.nix ./media/radarr/compose.nix

View file

@ -1,8 +1,8 @@
pkgs: pkgs:
pkgs.dockerTools.pullImage { pkgs.dockerTools.pullImage {
imageName = "vegardit/gitea-act-runner"; imageName = "vegardit/gitea-act-runner";
imageDigest = "sha256:a69efce45a138217a87e24fe0197519a95ec60fc35bfcaffaced9fed5e86a1ec"; imageDigest = "sha256:0f2cedb38b779319f005dea39b1ac532757aa52bf327d93e2a2d8d82a50b04eb";
sha256 = "05b5r4ncbx228cc3s4b4k5n9kh9krwh20r81lbpzdbyk3m8hjfw6"; sha256 = "06gm6q8ss4dkmj8vp02wmfsw4bjy8v2n4wk2n8l7ydi6qadd4w3d";
finalImageName = "vegardit/gitea-act-runner"; finalImageName = "vegardit/gitea-act-runner";
finalImageTag = "dind-latest"; finalImageTag = "dind-latest";
} }

View file

@ -1,8 +1,8 @@
pkgs: pkgs:
pkgs.dockerTools.pullImage { pkgs.dockerTools.pullImage {
imageName = "postgres"; imageName = "postgres";
imageDigest = "sha256:f055b09e632d40c562d80e1078c21362d720d3c8c040f65edf6cb609229f09d3"; imageDigest = "sha256:b4d7cd7bd1bc275e8862271531e2180b6c3e9bd92f09e2f53f6c87836183235a";
sha256 = "0rsqcxqx77r4z8xw15sqydp1r2mz129r36c7p43vjv6p2cxyl8sg"; sha256 = "0391kqxi9yi2kkh8zm5q4fl4xsris68qzwvdqmpcycxr1dgpwqhj";
finalImageName = "postgres"; finalImageName = "postgres";
finalImageTag = "14"; finalImageTag = "14";
} }

View file

@ -1,8 +1,8 @@
pkgs: pkgs:
pkgs.dockerTools.pullImage { pkgs.dockerTools.pullImage {
imageName = "postgres"; imageName = "postgres";
imageDigest = "sha256:f055b09e632d40c562d80e1078c21362d720d3c8c040f65edf6cb609229f09d3"; imageDigest = "sha256:b4d7cd7bd1bc275e8862271531e2180b6c3e9bd92f09e2f53f6c87836183235a";
sha256 = "0rsqcxqx77r4z8xw15sqydp1r2mz129r36c7p43vjv6p2cxyl8sg"; sha256 = "0391kqxi9yi2kkh8zm5q4fl4xsris68qzwvdqmpcycxr1dgpwqhj";
finalImageName = "postgres"; finalImageName = "postgres";
finalImageTag = "14"; finalImageTag = "14";
} }

View file

@ -1,8 +1,8 @@
pkgs: pkgs:
pkgs.dockerTools.pullImage { pkgs.dockerTools.pullImage {
imageName = "rssbridge/rss-bridge"; imageName = "rssbridge/rss-bridge";
imageDigest = "sha256:5b080be160ac5e5c5a0d450f9e431a472b2ee9e95353d905628ed804efd96783"; imageDigest = "sha256:2ed2ac1c2308f929947b363d0866aa48543600368f6df4f29a004aa0869d9f22";
sha256 = "06pzkyyballg5z6ycgfr7biskncayc8asgr3918dmy1mhj7zrmbd"; sha256 = "075ymqv5z3h902yr32w1dxcpp2az79xqam0lb97c0lkq2dc5hxgb";
finalImageName = "rssbridge/rss-bridge"; finalImageName = "rssbridge/rss-bridge";
finalImageTag = "latest"; finalImageTag = "latest";
} }

View file

@ -1,62 +0,0 @@
{
config,
pkgs,
...
}: let
inherit (config.khepri) rwDataDir;
rwPath = rwDataDir + "/media/calibre";
in {
khepri.compositions."calibre" = {
networks.proxy_net = {external = true;};
services = {
"calibre" = {
image = import ./images/calibre.nix pkgs;
restart = "always";
environment = {
PUID = "1000";
PGID = "1000";
TZ = "America/New_York";
# WebUI vars
SUBFOLDER = "/calibre/";
TITLE = "CalibreDB";
NO_DECOR = "true";
};
volumes = ["${rwPath}/data-db:/config"];
extraHosts = ["lan.nelim.org:10.0.0.130"];
ports = [
"8580:8080"
#"8081:8081"
];
networks = ["proxy_net"];
#network_mode = "host";
};
"calibre-web" = {
image = import ./images/calibre-web.nix pkgs;
restart = "always";
environment = {
PUID = "1000";
PGID = "1000";
TZ = "America/New_York";
DOCKER_MODS = "linuxserver/mods:universal-calibre";
};
volumes = [
"${rwPath}/data-web:/config"
"${rwPath}/data-db/Calibre Library:/books"
];
extraHosts = ["lan.nelim.org:10.0.0.130"];
ports = ["8083:8083"];
networks = ["proxy_net"];
};
};
};
}

View file

@ -1,8 +0,0 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "ghcr.io/linuxserver/calibre-web";
imageDigest = "sha256:ff7e870dec503f5bd02c5a528ba1f96617900cb4853ef05176bfbc278b5d263d";
sha256 = "00g07x609rf9wdipxw260jmc3y2wkhawgzmlqsk9h60jbhxpck57";
finalImageName = "ghcr.io/linuxserver/calibre-web";
finalImageTag = "latest";
}

View file

@ -1,8 +0,0 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "ghcr.io/linuxserver/calibre";
imageDigest = "sha256:e179e32b1ed42814816e5379d08ee9d9f957f6e704c8695bd1ffece9668a9192";
sha256 = "13n3rw7w6a6nkq578qjhypkwh2xm7a79lmi57klzx1gsxddp5r04";
finalImageName = "ghcr.io/linuxserver/calibre";
finalImageTag = "latest";
}

View file

@ -1,8 +1,8 @@
pkgs: pkgs:
pkgs.dockerTools.pullImage { pkgs.dockerTools.pullImage {
imageName = "ghcr.io/linuxserver/prowlarr"; imageName = "ghcr.io/linuxserver/prowlarr";
imageDigest = "sha256:7fe57565907f4f776d43c15b2e020a0e4a62fe1e04e80e25b85a3ae4ca49e5d0"; imageDigest = "sha256:c80a2dcfefd85c62da2373c5bf0138bb9d1c647c4b3d8f994ce263f5e8b1db81";
sha256 = "0mcsjkzjjyn53zv3id7jdkk0x1w5h6hz1sp2cpizsh444cznr2gd"; sha256 = "1yyjjh53n9a1n2czy1a3l9diak960dxf0wy185khhdjyg26grl2m";
finalImageName = "ghcr.io/linuxserver/prowlarr"; finalImageName = "ghcr.io/linuxserver/prowlarr";
finalImageTag = "latest"; finalImageTag = "latest";
} }

View file

@ -1,8 +1,8 @@
pkgs: pkgs:
pkgs.dockerTools.pullImage { pkgs.dockerTools.pullImage {
imageName = "ghcr.io/linuxserver/sabnzbd"; imageName = "ghcr.io/linuxserver/sabnzbd";
imageDigest = "sha256:dda700370ad4281d8ffda4fbdad8ac3f720a2829936eafc794fca652095ed4be"; imageDigest = "sha256:aad79c7a696a8743b87f9a0429bf5fa0be1edc8bbf00b962008dfa9893efd28e";
sha256 = "1cgjkja9zl8s76g0x258gism7ah1p2ni72nlx0jp0skdpm7y1irx"; sha256 = "0dangx6v4nhz80n3viwblb5qh6xa809vd20r6ryp9xd5nblf4326";
finalImageName = "ghcr.io/linuxserver/sabnzbd"; finalImageName = "ghcr.io/linuxserver/sabnzbd";
finalImageTag = "latest"; finalImageTag = "latest";
} }

View file

@ -1,8 +1,8 @@
pkgs: pkgs:
pkgs.dockerTools.pullImage { pkgs.dockerTools.pullImage {
imageName = "ghcr.io/fallenbagel/jellyseerr"; imageName = "docker.io/fallenbagel/jellyseerr";
imageDigest = "sha256:e32de15c6f35ba0cabdd728d29f35de4774bc6107ffc34203843237c33a5cf90"; imageDigest = "sha256:8f708df0ce3f202056bde5d7bff625eb59efe38f4ee47bdddc7560b6e4a5a214";
sha256 = "1l3njzhsaapcs0fbmd1dkgb24ray87i11pbd5x22s2mckcnsladc"; sha256 = "04ala5cpkv1rhq609yxvyf8wv6ql8ism9zyrxyiil6b1gfgcsfxz";
finalImageName = "ghcr.io/fallenbagel/jellyseerr"; finalImageName = "docker.io/fallenbagel/jellyseerr";
finalImageTag = "develop"; finalImageTag = "1.9.2";
} }

View file

@ -1,8 +1,8 @@
pkgs: pkgs:
pkgs.dockerTools.pullImage { pkgs.dockerTools.pullImage {
imageName = "postgres"; imageName = "postgres";
imageDigest = "sha256:468d34fefd6338031787c7b8e94078975b3aaf4d66c7ead25c39cd3ba46a15c6"; imageDigest = "sha256:fa484d844b88ac34811daf3da66af1fd17e34b0e1ff5d1b6f904269c85890dc0";
sha256 = "1pg0rwqyzlhrik4x4bkx416qb034xrd0nmsckqd9w6ncsmppibvm"; sha256 = "18bljw3bydqx9vmhqnky5xp2k2fmbpzw5569hnmj261nxq5n6dws";
finalImageName = "postgres"; finalImageName = "postgres";
finalImageTag = "15-alpine"; finalImageTag = "15-alpine";
} }

Binary file not shown.

BIN
flake.nix

Binary file not shown.

View file

@ -118,7 +118,8 @@ let
hyprlandInputs = { hyprlandInputs = {
hyprland = mkDep { hyprland = mkDep {
type = "git"; type = "git";
url = "https://github.com/hyprwm/Hyprland"; # FIXME: switch back to hyprwm when build issue fixed
url = "https://github.com/matt1432/Hyprland";
submodules = true; submodules = true;
}; };

View file

@ -3,13 +3,14 @@ lib: lock: let
recursiveUpdateList = list: foldl' recursiveUpdate {} list; recursiveUpdateList = list: foldl' recursiveUpdate {} list;
in rec { in rec {
/** /*
From an attrset, returns a flake input that has its type defaulted *
to `github` and has some of its inputs following this flake's input From an attrset, returns a flake input that has its type defaulted
of the same name. to `github` and has some of its inputs following this flake's input
of the same name.
It gets information from the `flake.lock` file and can be used thanks It gets information from the `flake.lock` file and can be used thanks
to flakegen to flakegen
*/ */
mkInput = {type ? "github", ...} @ info: let mkInput = {type ? "github", ...} @ info: let
input = input =