add extraOCCCommands option

flake.lock

@@ -35,11 +35,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1719426051,
+        "lastModified": 1720954236,
-        "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=",
+        "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd",
+        "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27",
         "type": "github"
       },
       "original": {

nextcloud-extras.nix

@@ -73,6 +73,14 @@ in {
         '';
       };
 
+      extraOCCCommands = mkOption {
+        default = "";
+        type = types.lines;
+        example = "nextcloud-occ app:enable cleanup";
+        description = lib.mdDoc ''
+          Extra OCC commands which get executed after setup.
+        '';
+      };
     };
   };
 
@@ -97,6 +105,15 @@ in {
       after = ["nextcloud-setup.service"];
     };
 
+    systemd.services.nextcloud-extra-occ-commands = {
+      enable = true;
+      script = ''
+        ${cfg.extraOCCCommands}
+      '';
+      wantedBy = [ "multi-user.target" ];
+      after = ["nextcloud-setup.service"];
+    };
+
     services.phpfpm.pools.nextcloud.settings = {
       "listen.owner" = webserver.user;
       "listen.group" = webserver.group;

vm-nextcloud.nix

@@ -5,14 +5,7 @@
     cores = 4;
   };
 
-  # Workaround for bug, disable pretty urls
-  # https://github.com/nextcloud/server/issues/44685
-  disabledModules = [
-    "services/web-apps/nextcloud.nix"
-  ];
-
   imports = [
-    ./nextcloud.nix
     ./nextcloud-extras.nix
   ];
 
@@ -93,8 +86,12 @@
     };
     appstoreEnable = true;
     configureRedis = true;
+    extraOCCCommands = ''
+      ${config.services.nextcloud.occ}/bin/nextcloud-occ app:enable cleanup
+    '';
     settings = {
-      log_type = "syslog";
+      log_type = "file";
+      loglevel = 1;
       mail_smtpmode = "sendmail";
       mail_sendmailmode = "pipe";
       trusted_domains = [ "10.100.100.1" ];