Upgrade to nixos 25.05 #4

Merged
felixalb merged 15 commits from nixos-25.05 into main 2025-06-08 22:12:40 +02:00
3 changed files with 11 additions and 5 deletions
Showing only changes of commit c4ea7efc9c - Show all commits

View File

@ -45,6 +45,8 @@
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
virtualisation.oci-containers.backend = "docker"; virtualisation.oci-containers.backend = "docker";
security.polkit.enable = true; # Required for nextcloud
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"nvidia-x11" "nvidia-x11"
"nvidia-settings" "nvidia-settings"

View File

@ -1,16 +1,18 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
domain = "komga.home.feal.no"; domain = "komga.home.feal.no";
cfg = config.services.komga; port = 5001;
in { in {
services.komga = { services.komga = {
enable = true; enable = true;
stateDir = "/tank/media/komga"; stateDir = "/tank/media/komga";
port = 5001; settings.server = {
inherit port;
};
}; };
services.nginx.virtualHosts.${domain} = { services.nginx.virtualHosts.${domain} = {
locations."/".proxyPass = "http://127.0.0.1:${toString cfg.port}"; locations."/".proxyPass = "http://127.0.0.1:${toString port}";
extraConfig = '' extraConfig = ''
client_max_body_size 512M; client_max_body_size 512M;

View File

@ -5,7 +5,7 @@ let
in { in {
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud30; package = pkgs.nextcloud31;
inherit hostName; inherit hostName;
home = "/tank/nextcloud"; home = "/tank/nextcloud";
https = true; https = true;
@ -46,7 +46,9 @@ in {
oidc_login_filter_allowed_values = [ "nextcloud-user" ]; oidc_login_filter_allowed_values = [ "nextcloud-user" ];
oidc_login_disable_registration = false; oidc_login_disable_registration = false;
"memories.exiftool" = "${cfg.home}/store-apps/memories/bin-ext/exiftool-amd64-glibc"; "memories.exiftool" = pkgs.writeShellScript "exiftool-perl" ''
${lib.getExe pkgs.perl} ${cfg.home}/store-apps/memories/bin-ext/exiftool/exiftool "$@"
'';
"memories.exiftool_no_local" = false; "memories.exiftool_no_local" = false;
"memories.vod.disable" = false; "memories.vod.disable" = false;
"memories.vod.ffmpeg" = "${lib.getExe pkgs.ffmpeg-headless}"; "memories.vod.ffmpeg" = "${lib.getExe pkgs.ffmpeg-headless}";