From db24ef998f493d597f58df7cf8d0ba395caa3618 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 11 Feb 2025 13:15:30 +0100
Subject: [PATCH 1/3] nextcloud: add memories app + previews tuning
Thanks to SuperSandro2000 for config snippets:
https://github.com/NuschtOS/nixos-modules/blob/main/modules/nextcloud.nix
---
modules/nextcloud/default.nix | 115 ++++++++++++++++++++++++++++++++--
1 file changed, 109 insertions(+), 6 deletions(-)
diff --git a/modules/nextcloud/default.nix b/modules/nextcloud/default.nix
index 592652e..10fbd9d 100644
--- a/modules/nextcloud/default.nix
+++ b/modules/nextcloud/default.nix
@@ -2,6 +2,7 @@
config,
pkgs,
flake,
+ lib,
...
}:
{
@@ -22,7 +23,24 @@
forceSSL = true;
};
- services.nextcloud = {
+ services.nextcloud =
+ let
+ exiftool_1270 = pkgs.perlPackages.buildPerlPackage rec {
+ # NOTE nextcloud-memories needs this specific version of exiftool
+ pname = "Image-ExifTool";
+ version = "12.70";
+ src = pkgs.fetchFromGitHub {
+ owner = "exiftool";
+ repo = "exiftool";
+ rev = version;
+ hash = "sha256-YMWYPI2SDi3s4KCpSNwovemS5MDj5W9ai0sOkvMa8Zg=";
+ };
+ nativeBuildInputs = lib.optional pkgs.stdenv.hostPlatform.isDarwin pkgs.shortenPerlShebang;
+ postInstall = lib.optionalString pkgs.stdenv.hostPlatform.isDarwin ''
+ shortenPerlShebang $out/bin/exiftool
+ '';
+ };
+ in {
hostName = "cloud.${config.pub-solar-os.networking.domain}";
home = "/var/lib/nextcloud";
@@ -74,21 +92,39 @@
allow_local_remote_servers = true;
enable_previews = true;
+ jpeg_quality = 60;
enabledPreviewProviders = [
"OC\\Preview\\PNG"
"OC\\Preview\\JPEG"
"OC\\Preview\\GIF"
"OC\\Preview\\BMP"
+ "OC\\Preview\\HEIC"
+ "OC\\Preview\\TIFF"
"OC\\Preview\\XBitmap"
+ "OC\\Preview\\SVG"
+ "OC\\Preview\\WebP"
+ "OC\\Preview\\Font"
"OC\\Preview\\Movie"
- "OC\\Preview\\PDF"
+ "OC\\Preview\\ImaginaryPDF"
"OC\\Preview\\MP3"
+ "OC\\Preview\\OpenDocument"
+ "OC\\Preview\\Krita"
"OC\\Preview\\TXT"
"OC\\Preview\\MarkDown"
+ "OC\\Preview\\Imaginary"
];
- preview_max_x = "1024";
- preview_max_y = "768";
- preview_max_scale_factor = "1";
+ preview_imaginary_url = "http://127.0.0.1:${toString config.services.imaginary.port}/";
+ preview_max_filesize_image = 128; # MB
+ preview_max_memory = 512; # MB
+ preview_max_x = 2048; # px
+ preview_max_y = 2048; # px
+ preview_max_scale_factor = 1;
+ "preview_ffmpeg_path" = lib.getExe pkgs.ffmpeg-headless;
+
+ "memories.exiftool_no_local" = false;
+ "memories.exiftool" = "${exiftool_1270}/bin/exiftool";
+ "memories.vod.ffmpeg" = lib.getExe pkgs.ffmpeg;
+ "memories.vod.ffprobe" = lib.getExe' pkgs.ffmpeg-headless "ffprobe";
auth.bruteforce.protection.enabled = true;
trashbin_retention_obligation = "auto,7";
@@ -136,11 +172,78 @@
appstoreEnable = true;
autoUpdateApps.enable = true;
extraApps = {
- inherit (pkgs.nextcloud30Packages.apps) recognize;
+ inherit (pkgs.nextcloud30Packages.apps) memories recognize;
};
database.createLocally = true;
};
+ # https://docs.nextcloud.com/server/30/admin_manual/installation/server_tuning.html#previews
+ services.imaginary = {
+ enable = true;
+ address = "127.0.0.1";
+ settings.return-size = true;
+ };
+
+ systemd = {
+ services =
+ let
+ occ = "/run/current-system/sw/bin/nextcloud-occ";
+ in
+ {
+ nextcloud-cron-preview-generator = {
+ environment.NEXTCLOUD_CONFIG_DIR = "${config.services.nextcloud.home}/config";
+ serviceConfig = {
+ ExecStart = "${occ} preview:pre-generate";
+ Type = "oneshot";
+ User = "nextcloud";
+ };
+ };
+
+ nextcloud-preview-generator-setup = {
+ wantedBy = [ "multi-user.target" ];
+ requires = [ "phpfpm-nextcloud.service" ];
+ after = [ "phpfpm-nextcloud.service" ];
+ environment.NEXTCLOUD_CONFIG_DIR = "${config.services.nextcloud.home}/config";
+ script = # bash
+ ''
+ # check with:
+ # for size in squareSizes widthSizes heightSizes; do echo -n "$size: "; nextcloud-occ config:app:get previewgenerator $size; done
+
+ # extra commands run for preview generator:
+ # 32 icon file list
+ # 64 icon file list android app, photos app
+ # 96 nextcloud client VFS windows file preview
+ # 256 file app grid view, many requests
+ # 512 photos app tags
+ ${occ} config:app:set --value="32 64 96 256 512" previewgenerator squareSizes
+
+ # 341 hover in maps app
+ # 1920 files/photos app when viewing picture
+ ${occ} config:app:set --value="341 1920" previewgenerator widthSizes
+
+ # 256 hover in maps app
+ # 1080 files/photos app when viewing picture
+ ${occ} config:app:set --value="256 1080" previewgenerator heightSizes
+ '';
+ serviceConfig = {
+ Type = "oneshot";
+ User = "nextcloud";
+ };
+ };
+ };
+ timers.nextcloud-cron-preview-generator = {
+ after = [ "nextcloud-setup.service" ];
+ timerConfig = {
+ OnCalendar = "*:0/10";
+ OnUnitActiveSec = "9m";
+ Persistent = true;
+ RandomizedDelaySec = 60;
+ Unit = "nextcloud-cron-preview-generator.service";
+ };
+ wantedBy = [ "timers.target" ];
+ };
+ };
+
services.restic.backups.nextcloud-storagebox = {
paths = [
"/var/lib/nextcloud/data"
From fcbcbe755f8b80efe46465aa2f7c7cfda62f95a9 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 11 Feb 2025 13:17:08 +0100
Subject: [PATCH 2/3] nextcloud(style): fix formatting
---
modules/nextcloud/default.nix | 267 +++++++++++++++++-----------------
1 file changed, 134 insertions(+), 133 deletions(-)
diff --git a/modules/nextcloud/default.nix b/modules/nextcloud/default.nix
index 10fbd9d..569b19c 100644
--- a/modules/nextcloud/default.nix
+++ b/modules/nextcloud/default.nix
@@ -40,143 +40,144 @@
shortenPerlShebang $out/bin/exiftool
'';
};
- in {
- hostName = "cloud.${config.pub-solar-os.networking.domain}";
- home = "/var/lib/nextcloud";
+ in
+ {
+ hostName = "cloud.${config.pub-solar-os.networking.domain}";
+ home = "/var/lib/nextcloud";
- enable = true;
- # When updating package, remember to update nextcloud30Packages in
- # services.nextcloud.extraApps
- package = pkgs.nextcloud30;
- https = true;
- secretFile = config.age.secrets."nextcloud-secrets".path; # secret
- maxUploadSize = "1G";
-
- configureRedis = true;
-
- notify_push = {
enable = true;
- bendDomainToLocalhost = true;
+ # When updating package, remember to update nextcloud30Packages in
+ # services.nextcloud.extraApps
+ package = pkgs.nextcloud30;
+ https = true;
+ secretFile = config.age.secrets."nextcloud-secrets".path; # secret
+ maxUploadSize = "1G";
+
+ configureRedis = true;
+
+ notify_push = {
+ enable = true;
+ bendDomainToLocalhost = true;
+ };
+
+ config = {
+ adminuser = "admin";
+ adminpassFile = config.age.secrets."nextcloud-admin-pass".path;
+ dbuser = "nextcloud";
+ dbtype = "pgsql";
+ dbname = "nextcloud";
+ };
+
+ settings = {
+ overwrite.cli.url = "http://cloud.${config.pub-solar-os.networking.domain}";
+ overwriteprotocol = "https";
+
+ installed = true;
+ default_phone_region = "+49";
+ mail_sendmailmode = "smtp";
+ mail_from_address = "nextcloud";
+ mail_smtpmode = "smtp";
+ mail_smtpauthtype = "PLAIN";
+ mail_domain = "pub.solar";
+ mail_smtpname = "admins@pub.solar";
+ mail_smtpsecure = "ssl";
+ mail_smtpauth = true;
+ mail_smtphost = "mail.pub.solar";
+ mail_smtpport = "465";
+
+ # This is to allow connections to collabora and keycloak, among other services
+ # running on the same host
+ #
+ # https://docs.nextcloud.com/server/stable/admin_manual/configuration_server/config_sample_php_parameters.html?highlight=allow_local_remote_servers%20true
+ # https://github.com/ONLYOFFICE/onlyoffice-nextcloud/issues/293
+ allow_local_remote_servers = true;
+
+ enable_previews = true;
+ jpeg_quality = 60;
+ enabledPreviewProviders = [
+ "OC\\Preview\\PNG"
+ "OC\\Preview\\JPEG"
+ "OC\\Preview\\GIF"
+ "OC\\Preview\\BMP"
+ "OC\\Preview\\HEIC"
+ "OC\\Preview\\TIFF"
+ "OC\\Preview\\XBitmap"
+ "OC\\Preview\\SVG"
+ "OC\\Preview\\WebP"
+ "OC\\Preview\\Font"
+ "OC\\Preview\\Movie"
+ "OC\\Preview\\ImaginaryPDF"
+ "OC\\Preview\\MP3"
+ "OC\\Preview\\OpenDocument"
+ "OC\\Preview\\Krita"
+ "OC\\Preview\\TXT"
+ "OC\\Preview\\MarkDown"
+ "OC\\Preview\\Imaginary"
+ ];
+ preview_imaginary_url = "http://127.0.0.1:${toString config.services.imaginary.port}/";
+ preview_max_filesize_image = 128; # MB
+ preview_max_memory = 512; # MB
+ preview_max_x = 2048; # px
+ preview_max_y = 2048; # px
+ preview_max_scale_factor = 1;
+ "preview_ffmpeg_path" = lib.getExe pkgs.ffmpeg-headless;
+
+ "memories.exiftool_no_local" = false;
+ "memories.exiftool" = "${exiftool_1270}/bin/exiftool";
+ "memories.vod.ffmpeg" = lib.getExe pkgs.ffmpeg;
+ "memories.vod.ffprobe" = lib.getExe' pkgs.ffmpeg-headless "ffprobe";
+
+ auth.bruteforce.protection.enabled = true;
+ trashbin_retention_obligation = "auto,7";
+ skeletondirectory = "./nextcloud-skeleton";
+ defaultapp = "file";
+ activity_expire_days = "14";
+ integrity.check.disabled = false;
+ updater.release.channel = "stable";
+ loglevel = 2;
+ debug = false;
+ maintenance_window_start = "1";
+ # maintenance = false;
+ app_install_overwrite = [
+ "pdfdraw"
+ "integration_whiteboard"
+ ];
+ htaccess.RewriteBase = "/";
+ theme = "";
+ simpleSignUpLink.shown = false;
+ };
+
+ phpOptions = {
+ "opcache.interned_strings_buffer" = "32";
+ "opcache.max_accelerated_files" = "16229";
+ "opcache.memory_consumption" = "256";
+ # https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
+ "opcache.revalidate_freq" = "60";
+ # https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#:~:text=opcache.jit%20%3D%201255%20opcache.jit_buffer_size%20%3D%20128m
+ "opcache.jit" = "1255";
+ "opcache.jit_buffer_size" = "128M";
+ };
+
+ # Calculated with 4GiB RAM, 80MiB process size available on
+ # https://spot13.com/pmcalculator/
+ poolSettings = {
+ pm = "dynamic";
+ "pm.max_children" = "52";
+ "pm.max_requests" = "500";
+ "pm.max_spare_servers" = "39";
+ "pm.min_spare_servers" = "13";
+ "pm.start_servers" = "13";
+ };
+
+ caching.redis = true;
+ appstoreEnable = true;
+ autoUpdateApps.enable = true;
+ extraApps = {
+ inherit (pkgs.nextcloud30Packages.apps) memories recognize;
+ };
+ database.createLocally = true;
};
- config = {
- adminuser = "admin";
- adminpassFile = config.age.secrets."nextcloud-admin-pass".path;
- dbuser = "nextcloud";
- dbtype = "pgsql";
- dbname = "nextcloud";
- };
-
- settings = {
- overwrite.cli.url = "http://cloud.${config.pub-solar-os.networking.domain}";
- overwriteprotocol = "https";
-
- installed = true;
- default_phone_region = "+49";
- mail_sendmailmode = "smtp";
- mail_from_address = "nextcloud";
- mail_smtpmode = "smtp";
- mail_smtpauthtype = "PLAIN";
- mail_domain = "pub.solar";
- mail_smtpname = "admins@pub.solar";
- mail_smtpsecure = "ssl";
- mail_smtpauth = true;
- mail_smtphost = "mail.pub.solar";
- mail_smtpport = "465";
-
- # This is to allow connections to collabora and keycloak, among other services
- # running on the same host
- #
- # https://docs.nextcloud.com/server/stable/admin_manual/configuration_server/config_sample_php_parameters.html?highlight=allow_local_remote_servers%20true
- # https://github.com/ONLYOFFICE/onlyoffice-nextcloud/issues/293
- allow_local_remote_servers = true;
-
- enable_previews = true;
- jpeg_quality = 60;
- enabledPreviewProviders = [
- "OC\\Preview\\PNG"
- "OC\\Preview\\JPEG"
- "OC\\Preview\\GIF"
- "OC\\Preview\\BMP"
- "OC\\Preview\\HEIC"
- "OC\\Preview\\TIFF"
- "OC\\Preview\\XBitmap"
- "OC\\Preview\\SVG"
- "OC\\Preview\\WebP"
- "OC\\Preview\\Font"
- "OC\\Preview\\Movie"
- "OC\\Preview\\ImaginaryPDF"
- "OC\\Preview\\MP3"
- "OC\\Preview\\OpenDocument"
- "OC\\Preview\\Krita"
- "OC\\Preview\\TXT"
- "OC\\Preview\\MarkDown"
- "OC\\Preview\\Imaginary"
- ];
- preview_imaginary_url = "http://127.0.0.1:${toString config.services.imaginary.port}/";
- preview_max_filesize_image = 128; # MB
- preview_max_memory = 512; # MB
- preview_max_x = 2048; # px
- preview_max_y = 2048; # px
- preview_max_scale_factor = 1;
- "preview_ffmpeg_path" = lib.getExe pkgs.ffmpeg-headless;
-
- "memories.exiftool_no_local" = false;
- "memories.exiftool" = "${exiftool_1270}/bin/exiftool";
- "memories.vod.ffmpeg" = lib.getExe pkgs.ffmpeg;
- "memories.vod.ffprobe" = lib.getExe' pkgs.ffmpeg-headless "ffprobe";
-
- auth.bruteforce.protection.enabled = true;
- trashbin_retention_obligation = "auto,7";
- skeletondirectory = "./nextcloud-skeleton";
- defaultapp = "file";
- activity_expire_days = "14";
- integrity.check.disabled = false;
- updater.release.channel = "stable";
- loglevel = 2;
- debug = false;
- maintenance_window_start = "1";
- # maintenance = false;
- app_install_overwrite = [
- "pdfdraw"
- "integration_whiteboard"
- ];
- htaccess.RewriteBase = "/";
- theme = "";
- simpleSignUpLink.shown = false;
- };
-
- phpOptions = {
- "opcache.interned_strings_buffer" = "32";
- "opcache.max_accelerated_files" = "16229";
- "opcache.memory_consumption" = "256";
- # https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
- "opcache.revalidate_freq" = "60";
- # https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#:~:text=opcache.jit%20%3D%201255%20opcache.jit_buffer_size%20%3D%20128m
- "opcache.jit" = "1255";
- "opcache.jit_buffer_size" = "128M";
- };
-
- # Calculated with 4GiB RAM, 80MiB process size available on
- # https://spot13.com/pmcalculator/
- poolSettings = {
- pm = "dynamic";
- "pm.max_children" = "52";
- "pm.max_requests" = "500";
- "pm.max_spare_servers" = "39";
- "pm.min_spare_servers" = "13";
- "pm.start_servers" = "13";
- };
-
- caching.redis = true;
- appstoreEnable = true;
- autoUpdateApps.enable = true;
- extraApps = {
- inherit (pkgs.nextcloud30Packages.apps) memories recognize;
- };
- database.createLocally = true;
- };
-
# https://docs.nextcloud.com/server/30/admin_manual/installation/server_tuning.html#previews
services.imaginary = {
enable = true;
From 87071633245fec670dc49c4f49b53de4d31e6eef Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 11 Feb 2025 18:56:40 +0100
Subject: [PATCH 3/3] nextcloud: add previewgenerator to extraApps
---
modules/nextcloud/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/nextcloud/default.nix b/modules/nextcloud/default.nix
index 569b19c..b27cb4e 100644
--- a/modules/nextcloud/default.nix
+++ b/modules/nextcloud/default.nix
@@ -173,7 +173,7 @@
appstoreEnable = true;
autoUpdateApps.enable = true;
extraApps = {
- inherit (pkgs.nextcloud30Packages.apps) memories recognize;
+ inherit (pkgs.nextcloud30Packages.apps) memories previewgenerator recognize;
};
database.createLocally = true;
};