diff --git a/hosts/nachtigall/default.nix b/hosts/nachtigall/default.nix
index d452af54..2b21af40 100644
--- a/hosts/nachtigall/default.nix
+++ b/hosts/nachtigall/default.nix
@@ -14,6 +14,7 @@
       ./apps/keycloak.nix
       ./apps/mailman.nix
       ./apps/mastodon.nix
+      ./apps/nextcloud.nix
       ./apps/nginx-mastodon.nix
       ./apps/nginx-mastodon-files.nix
       ./apps/nginx-website.nix
diff --git a/hosts/nachtigall/nextcloud.nix b/hosts/nachtigall/nextcloud.nix
new file mode 100644
index 00000000..6206806c
--- /dev/null
+++ b/hosts/nachtigall/nextcloud.nix
@@ -0,0 +1,37 @@
+{ config, pkgs, ... }:
+{
+  services.caddy.virtualHosts."cloud.pub.solar" = {
+    # logFormat = lib.mkForce ''
+    #   output discard
+    # '';
+    extraConfig = ''
+      reverse_proxy :8080
+    '';
+  };
+
+  services.nginx.virtualHosts."localhost".listen = [ { addr = "127.0.0.1"; port = 8080; } ];
+
+  services.nextcloud = {
+    enable = true;
+    https = true;
+    secretFile = ""; # secret
+
+    notify_push = {
+      enable = true;
+    };
+
+    config = {
+      adminuser = "admin";
+      dbuser = "nextcloud";
+      dbtype = "pgsql";
+      dbname = "nextcloud";
+      dbtableprefix = "oc_";
+      trustedProxies = [
+        "cloud.pub.solar"
+      ];
+    };
+
+    autoUpdateApps.enable = true;
+    database.createLocally = true;
+  };
+}