From d9c5af566bb165639e4be5b235e41937829c15e6 Mon Sep 17 00:00:00 2001
From: materus <materus@podkos.pl>
Date: Mon, 17 Jun 2024 13:41:18 +0200
Subject: [PATCH] waffentrager: update nextcloud

---
 configurations/host/waffentrager/configuration.nix   |  2 +-
 .../host/waffentrager/services/nextcloud.nix         | 12 ++++++------
 configurations/profile/os/nix.nix                    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configurations/host/waffentrager/configuration.nix b/configurations/host/waffentrager/configuration.nix
index 6d95557..969a86b 100644
--- a/configurations/host/waffentrager/configuration.nix
+++ b/configurations/host/waffentrager/configuration.nix
@@ -48,7 +48,7 @@
   nix = {
     settings = {
       auto-optimise-store = true;
-      experimental-features = [ "nix-command" "flakes" "repl-flake" "no-url-literals" ];
+      experimental-features = [ "nix-command" "flakes" "no-url-literals" ];
       trusted-users = [ "root" "@wheel" ];
       substituters = [
         "https://nix-community.cachix.org"
diff --git a/configurations/host/waffentrager/services/nextcloud.nix b/configurations/host/waffentrager/services/nextcloud.nix
index 0aab744..20e41a5 100644
--- a/configurations/host/waffentrager/services/nextcloud.nix
+++ b/configurations/host/waffentrager/services/nextcloud.nix
@@ -22,14 +22,12 @@
       services.nextcloud = {
         enable = true;
         notify_push.enable = true;
-        package = pkgs.nextcloud28;
+        package = pkgs.nextcloud29;
         hostName = "waffentrager.materus.pl";
         home = config.waffentragerService.elements.nextcloudDir;
         config.adminuser = "master";
         config.adminpassFile = config.sops.secrets.nextcloud-adminpass.path;
         config.dbtype = "pgsql";
-        config.defaultPhoneRegion = "PL";
-        config.trustedProxies = [ materusArg.ips.valkyrie materusArg.ips.wireguard.valkyrie materusArg.ips.wireguard.waffentrager ];
         extraAppsEnable = true;
         maxUploadSize = "4G";
         https = true;
@@ -39,10 +37,13 @@
         appstoreEnable = true;
         database.createLocally = true;
         nginx.recommendedHttpHeaders = true;
-        extraApps = with pkgs.nextcloud28Packages.apps; {
+        extraApps = with pkgs.nextcloud29Packages.apps; {
           inherit notify_push previewgenerator;
         };
-        extraOptions = {
+        settings = {
+          "profile.enabled" = true;
+          default_phone_region = "PL";
+          trusted_proxies = [ materusArg.ips.valkyrie materusArg.ips.wireguard.valkyrie materusArg.ips.wireguard.waffentrager ];
           mail_smtpmode = "sendmail";
           mail_sendmailmode = "pipe";
           enable_previews = true;
@@ -66,7 +67,6 @@
           ];
           "overwrite.cli.url" = "https://${config.services.nextcloud.hostName}";
         };
-        globalProfiles = true;
 
         phpOptions = {
           "opcache.memory_consumption" = "512";
diff --git a/configurations/profile/os/nix.nix b/configurations/profile/os/nix.nix
index 03e27ee..b2527dc 100644
--- a/configurations/profile/os/nix.nix
+++ b/configurations/profile/os/nix.nix
@@ -7,7 +7,7 @@ in
   config.nix = lib.mkIf cfg.enable {
 
     settings = {
-      experimental-features = lib.mkMerge [[ "nix-command" "flakes" "no-url-literals" ] (lib.mkIf (materusCfg.stable) ["repl-flake"])];
+      experimental-features = lib.mkMerge [[ "nix-command" "flakes" "no-url-literals" ]];
       auto-optimise-store = true;
       trusted-users = [ "root" "@wheel" ];