Compare commits

...

3 Commits

Author SHA1 Message Date
7a38934145
minor changes 2024-02-10 02:07:28 +03:00
bc161bf6db
update ocis 2024-02-10 02:07:10 +03:00
c610aabf50
update containers 2024-02-10 02:07:01 +03:00
17 changed files with 31 additions and 55 deletions

6
flake.lock generated
View File

@ -42,11 +42,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1707239778, "lastModified": 1707510244,
"narHash": "sha256-DhGEDhtPcnxjc9jBOzdg+bf7o8btCAL+W7QNgl6jamI=", "narHash": "sha256-lZpCFv1fmj6/7WsTRxiffko/dOoQ4/5z7z58yuD/MdI=",
"owner": "AtaraxiaSjel", "owner": "AtaraxiaSjel",
"repo": "nur", "repo": "nur",
"rev": "d09bfe6ae85bfc06919c1fa892cd1bc316fd14a8", "rev": "0f4911bdd7c8f3c4dc2328c8c1420122233a6e02",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -170,6 +170,7 @@ in {
dig.dnsutils dig.dnsutils
fd fd
kitty kitty
lnav
micro micro
nix-index-update nix-index-update
p7zip p7zip

View File

@ -31,7 +31,6 @@ with lib; {
nix-fast-build = inputs.nix-fast-build.packages.${system}.default; nix-fast-build = inputs.nix-fast-build.packages.${system}.default;
nix-index-update = inputs.nix-alien.packages.${system}.nix-index-update; nix-index-update = inputs.nix-alien.packages.${system}.nix-index-update;
prismlauncher = inputs.prismlauncher.packages.${system}.default; prismlauncher = inputs.prismlauncher.packages.${system}.default;
ripgrep-all = stable.ripgrep-all;
wine = prev.wineWowPackages.staging; wine = prev.wineWowPackages.staging;
xray = master.xray; xray = master.xray;
youtube-to-mpv = prev.callPackage ./packages/youtube-to-mpv.nix { term = config.defaultApplications.term.cmd; }; youtube-to-mpv = prev.callPackage ./packages/youtube-to-mpv.nix { term = config.defaultApplications.term.cmd; };

View File

@ -1,8 +1,7 @@
{ ... }: { { ... }: {
virtualisation.oci-containers.containers.it-tools = { virtualisation.oci-containers.containers.it-tools = {
autoStart = true; autoStart = true;
image = "docker.io/corentinth/it-tools:latest"; image = "docker.io/corentinth/it-tools:2023.12.21-5ed3693";
extraOptions = [ "--pull=newer" ];
ports = [ "127.0.0.1:8070:80/tcp" ]; ports = [ "127.0.0.1:8070:80/tcp" ];
}; };
} }

View File

@ -37,7 +37,7 @@ let
in { in {
virtualisation.oci-containers.containers.media-caddy = { virtualisation.oci-containers.containers.media-caddy = {
autoStart = true; autoStart = true;
image = "ghcr.io/hotio/caddy:release-2.7.4"; image = "ghcr.io/hotio/caddy:release-2.7.6";
environment = { environment = {
PUID = "1000"; PUID = "1000";
PGID = "100"; PGID = "100";

View File

@ -43,7 +43,6 @@ in {
"${backend}-sonarr.service" "${backend}-sonarr.service"
]; ];
requiredBy = before; requiredBy = before;
partOf = before;
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = "yes"; RemainAfterExit = "yes";

View File

@ -11,7 +11,7 @@ in {
TZ = "Europe/Moscow"; TZ = "Europe/Moscow";
}; };
extraOptions = [ "--pod=media-stack" ]; extraOptions = [ "--pod=media-stack" ];
image = "ghcr.io/hotio/jackett:release-0.21.946"; image = "docker.io/linuxserver/jackett:0.21.1712";
volumes = [ volumes = [
"${nas-path}/configs/jackett:/config" "${nas-path}/configs/jackett:/config"
]; ];

View File

@ -7,7 +7,7 @@ let
in { in {
virtualisation.oci-containers.containers.jellyfin = { virtualisation.oci-containers.containers.jellyfin = {
autoStart = true; autoStart = true;
image = "lscr.io/linuxserver/jellyfin:version-10.8.11-1"; image = "docker.io/linuxserver/jellyfin:10.8.13";
environment = { environment = {
PUID = "1000"; PUID = "1000";
PGID = "100"; PGID = "100";

View File

@ -1,41 +1,21 @@
{ config, inputs, ... }: { ... }:
let let
backend = config.virtualisation.oci-containers.backend;
nas-path = "/media/nas/media-stack"; nas-path = "/media/nas/media-stack";
in { in {
sops.secrets.kavita-mail.sopsFile = inputs.self.secretsDir + /home-hypervisor/kavita.yaml; virtualisation.oci-containers.containers.kavita = {
sops.secrets.kavita-mail.restartUnits = [ "${backend}-kavitaemail.service" ]; autoStart = true;
image = "docker.io/jvmilazz0/kavita:0.7.14";
virtualisation.oci-containers.containers = { environment = {
kavita = { PUID = "1000";
autoStart = true; PGID = "100";
image = "docker.io/kizaing/kavita:0.7.8";
environment = {
PUID = "1000";
PGID = "100";
};
extraOptions = [ "--pod=media-stack" ];
volumes = [
"/etc/localtime:/etc/localtime:ro"
"${nas-path}/configs/kavita:/kavita/config"
"${nas-path}/media/manga:/manga/manga"
"${nas-path}/media/books:/manga/books"
"${nas-path}/media/comics:/manga/comics"
];
};
kavitaemail = {
autoStart = true;
image = "docker.io/kizaing/kavitaemail:0.1.20";
environment = {
SMTP_HOST = "https://mail.ataraxiadev.com";
SMTP_PORT = "587";
SMTP_USER = "kavita@ataraxiadev.com";
SEND_ADDR = "kavita@ataraxiadev.com";
DISP_NAME = "Kavita <no-reply>";
ALLOW_SENDTO = "false";
};
environmentFiles = [ config.sops.secrets.kavita-mail.path ];
extraOptions = [ "--pod=media-stack" ];
}; };
extraOptions = [ "--pod=media-stack" ];
volumes = [
"/etc/localtime:/etc/localtime:ro"
"${nas-path}/configs/kavita:/kavita/config"
"${nas-path}/media/manga:/manga/manga"
"${nas-path}/media/books:/manga/books"
"${nas-path}/media/comics:/manga/comics"
];
}; };
} }

View File

@ -10,7 +10,7 @@ in {
TZ = "Europe/Moscow"; TZ = "Europe/Moscow";
}; };
extraOptions = [ "--pod=media-stack" ]; extraOptions = [ "--pod=media-stack" ];
image = "docker.io/linuxserver/lidarr:version-1.3.5.3530"; image = "docker.io/linuxserver/lidarr:2.0.7";
volumes = [ volumes = [
"${nas-path}/configs/lidarr/config:/config" "${nas-path}/configs/lidarr/config:/config"
"${nas-path}/configs/lidarr/custom-services.d:/custom-services.d" "${nas-path}/configs/lidarr/custom-services.d:/custom-services.d"

View File

@ -4,13 +4,11 @@ let
in { in {
virtualisation.oci-containers.containers.medusa = { virtualisation.oci-containers.containers.medusa = {
autoStart = true; autoStart = true;
image = "docker.io/linuxserver/medusa:v1.0.17-ls155"; image = "docker.io/linuxserver/medusa:1.0.19";
environment = { environment = {
PUID = "1000"; PUID = "1000";
PGID = "100"; PGID = "100";
TZ = "Europe/Moscow"; TZ = "Europe/Moscow";
# HTTP_PROXY = "http://192.168.0.6:8888";
# HTTPS_PROXY = "http://192.168.0.6:8888";
}; };
extraOptions = [ "--pod=media-stack" ]; extraOptions = [ "--pod=media-stack" ];
volumes = [ volumes = [

View File

@ -4,7 +4,7 @@ let
in { in {
virtualisation.oci-containers.containers.qbittorrent = { virtualisation.oci-containers.containers.qbittorrent = {
autoStart = true; autoStart = true;
image = "ghcr.io/hotio/qbittorrent:release-4.5.5"; image = "docker.io/linuxserver/qbittorrent:4.6.3";
environment = { environment = {
PUID = "1000"; PUID = "1000";
PGID = "100"; PGID = "100";

View File

@ -13,7 +13,7 @@ in {
HTTPS_PROXY = "http://192.168.0.6:8888"; HTTPS_PROXY = "http://192.168.0.6:8888";
}; };
extraOptions = [ "--pod=media-stack" ]; extraOptions = [ "--pod=media-stack" ];
image = "ghcr.io/hotio/radarr:release-4.7.5.7809"; image = "docker.io/linuxserver/radarr:5.2.6";
volumes = [ volumes = [
"${nas-path}/configs/radarr:/config" "${nas-path}/configs/radarr:/config"
"${nas-path}:/data" "${nas-path}:/data"

View File

@ -9,7 +9,7 @@ in {
TZ = "Europe/Moscow"; TZ = "Europe/Moscow";
}; };
extraOptions = [ "--pod=media-stack" ]; extraOptions = [ "--pod=media-stack" ];
image = "ghcr.io/recyclarr/recyclarr:5.4.3"; image = "ghcr.io/recyclarr/recyclarr:6.0.2";
volumes = [ volumes = [
"${nas-path}/configs/recyclarr:/config" "${nas-path}/configs/recyclarr:/config"
]; ];

View File

@ -11,7 +11,7 @@ in {
TZ = "Europe/Moscow"; TZ = "Europe/Moscow";
}; };
extraOptions = [ "--pod=media-stack" ]; extraOptions = [ "--pod=media-stack" ];
image = "ghcr.io/hotio/sonarr:nightly-4.0.0.688"; image = "docker.io/linuxserver/sonarr:version-4.0.1.929";
volumes = [ volumes = [
"${nas-path}/configs/sonarr:/config" "${nas-path}/configs/sonarr:/config"
"${nas-path}:/data" "${nas-path}:/data"

View File

@ -3,7 +3,7 @@
in { in {
virtualisation.oci-containers.containers.spdf = { virtualisation.oci-containers.containers.spdf = {
autoStart = true; autoStart = true;
image = "docker.io/frooodle/s-pdf:0.17.2"; image = "docker.io/frooodle/s-pdf:0.20.2";
environment = { environment = {
PUID = "1000"; PUID = "1000";
PGID = "100"; PGID = "100";

View File

@ -9,7 +9,7 @@ in {
settings = { settings = {
dir = "${homeDir}/Downloads/aria2"; dir = "${homeDir}/Downloads/aria2";
listen-port = "6881-6999"; listen-port = "6881-6999";
rpc-listen-port = 6800; # rpc-listen-port = 6800;
}; };
}; };
}; };