Compare commits
4
Commits
15279c5a56
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
13bcb887e7 | ||
|
|
13a361112e | ||
|
|
bd49bc0536 | ||
|
|
4202202786 |
Generated
+9
-9
@@ -83,11 +83,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1787146702,
|
"lastModified": 1788642154,
|
||||||
"narHash": "sha256-YbRcLdU/yK4gWsQg7V8WTKZHfXL33g8+wSFUX3wyevs=",
|
"narHash": "sha256-sPpQFVaFTDqO/4vvCAhuAhqTgqN/ygu+9eJcs5eB0js=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "173b7e8d40fdc8c296a9c99854314f17a3a1704c",
|
"rev": "fd0956c99c41ae3c13a73a638f1f7e963aebc4ab",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -487,11 +487,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1787204541,
|
"lastModified": 1788807765,
|
||||||
"narHash": "sha256-OURZPknrTjQrlNyxPdqzyqmU/81Wes1CUP/Ft1Rv/YI=",
|
"narHash": "sha256-J9oC0bKnkXUrMegqRTXVkyDFJ0gn2U/Qpoo9HgGMQmA=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5880666fd9eb563038431edb35c2d0aa595884e6",
|
"rev": "93108a538f079596c9a16c72cf03e9322782b6dd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -540,11 +540,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1786629091,
|
"lastModified": 1788337237,
|
||||||
"narHash": "sha256-gkig4nPi1CWc4Z50GBsjE4ygSE7hMpl/TwID2an2Cck=",
|
"narHash": "sha256-gkSH8VUtCo6hnysNmb9DbTuDepH2t5pv+QWjP75xKAk=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "a8627b21b9107c5711c96b84f32a9a4b3d45295f",
|
"rev": "fbf759290e0cb0a98dfc813a4eb7d53ad1dacb57",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -47,12 +47,18 @@
|
|||||||
example = "/var/run/docker.sock";
|
example = "/var/run/docker.sock";
|
||||||
description = "Path to the container management deamon's socket";
|
description = "Path to the container management deamon's socket";
|
||||||
};
|
};
|
||||||
container-bin = mkOption {
|
container-pkg = mkOption {
|
||||||
type = with types; uniq package;
|
type = with types; uniq package;
|
||||||
default = pkgs.docker;
|
default = pkgs.docker;
|
||||||
example = "pkgs.docker";
|
example = "pkgs.docker";
|
||||||
description = "The package used to interact with the container system";
|
description = "The package used to interact with the container system";
|
||||||
};
|
};
|
||||||
|
container-bin = mkOption {
|
||||||
|
type = with types; uniq str;
|
||||||
|
default = "${pkgs.docker}/bin/docker";
|
||||||
|
example = "${pkgs.docker}/bin/docker";
|
||||||
|
description = "The path to the binary used to interact with the container system";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
@@ -63,7 +69,8 @@
|
|||||||
# };
|
# };
|
||||||
local = {
|
local = {
|
||||||
container-backend = "podman";
|
container-backend = "podman";
|
||||||
container-bin = pkgs.podman;
|
container-pkg = pkgs.podman;
|
||||||
|
container-bin = "${pkgs.podman}/bin/podman";
|
||||||
container-socket = "/var/run/podman/podman.sock";
|
container-socket = "/var/run/podman/podman.sock";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -152,6 +159,7 @@
|
|||||||
HOMEPAGE_FILE_SONARR_KEY = "/app/config/secrets/sonarr.key";
|
HOMEPAGE_FILE_SONARR_KEY = "/app/config/secrets/sonarr.key";
|
||||||
HOMEPAGE_FILE_READARR_KEY = "/app/config/secrets/readarr.key";
|
HOMEPAGE_FILE_READARR_KEY = "/app/config/secrets/readarr.key";
|
||||||
HOMEPAGE_FILE_DELUGE_PASSWORD = "/app/config/secrets/deluge.pass";
|
HOMEPAGE_FILE_DELUGE_PASSWORD = "/app/config/secrets/deluge.pass";
|
||||||
|
HOMEPAGE_ALLOWED_HOSTS = "start.${havenisms}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
scrutiny = {
|
scrutiny = {
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ in
|
|||||||
description = "Hourly wargame-vods import";
|
description = "Hourly wargame-vods import";
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
ExecStart = "${config.local.container-bin}/bin/docker exec wargame-vods /proc/1/exe sync";
|
ExecStart = "${config.local.container-bin} exec wargame-vods /proc/1/exe sync";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -172,23 +172,26 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
# Currently broken and doesn't work. :(
|
# Currently broken and doesn't work. :(
|
||||||
# flaresolverr = {
|
flaresolverr = {
|
||||||
# image = "ghcr.io/flaresolverr/flaresolverr:latest";
|
image = "ghcr.io/flaresolverr/flaresolverr:latest";
|
||||||
# autoStart = true;
|
autoStart = true;
|
||||||
# extraOptions = [
|
extraOptions = [
|
||||||
# "-l=homepage.group=Infra"
|
"-l=traefik.enable=true"
|
||||||
# "-l=homepage.name=FlareSolverr"
|
"-l=traefik.http.routers.flaresolverr.rule=${localHostRuleHavenisms "flaresolverr"}"
|
||||||
# "-l=homepage.icon=flaresolverr.svg"
|
"-l=traefik.http.services.flaresolverr.loadbalancer.server.port=8191"
|
||||||
# "-l=homepage.href=https://flaresolverr.${domain}"
|
"-l=homepage.group=Infra"
|
||||||
# "-l=homepage.description=Cloudflare bypass"
|
"-l=homepage.name=FlareSolverr"
|
||||||
# ];
|
"-l=homepage.icon=flaresolverr.svg"
|
||||||
# volumes = [
|
"-l=homepage.href=https://flaresolverr.${havenisms}"
|
||||||
# "/tank/config/flaresolverr:/config"
|
"-l=homepage.description=Cloudflare bypass"
|
||||||
# ];
|
];
|
||||||
# environment = {
|
volumes = [
|
||||||
# UMASK = "002";
|
"/tank/config/flaresolverr:/config"
|
||||||
# };
|
];
|
||||||
# };
|
environment = {
|
||||||
|
UMASK = "002";
|
||||||
|
};
|
||||||
|
};
|
||||||
radarr = {
|
radarr = {
|
||||||
image = "lscr.io/linuxserver/radarr";
|
image = "lscr.io/linuxserver/radarr";
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user