From 0b77bbd8a6fd46ea1f012e15a2f061ba946d60b6 Mon Sep 17 00:00:00 2001
From: ahtlon <git@ahtlon.de>
Date: Wed, 17 Jun 2026 11:23:12 +0200
Subject: [PATCH] [Nextcloud] build deck in flake Changes from a cloud filehost
 to a local build, should also be more maintainable

---
 .../0001-Patch-cards-to-be-draggable.patch    | 25 +++++++++++++++++++
 machines/nextcloud/configuration.nix          | 25 ++++++++++++++-----
 2 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 machines/nextcloud/0001-Patch-cards-to-be-draggable.patch

diff --git a/machines/nextcloud/0001-Patch-cards-to-be-draggable.patch b/machines/nextcloud/0001-Patch-cards-to-be-draggable.patch
new file mode 100644
index 0000000..d8059a6
--- /dev/null
+++ b/machines/nextcloud/0001-Patch-cards-to-be-draggable.patch
@@ -0,0 +1,25 @@
+From 0d4b14e8eb62b0f0ed01f45bbaa7c2721245f7d6 Mon Sep 17 00:00:00 2001
+From: ahtlon <git@ahtlon.de>
+Date: Thu, 9 Oct 2025 12:22:08 +0200
+Subject: [PATCH] Patch cards to be draggable
+
+---
+ src/components/cards/CardItem.vue | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/components/cards/CardItem.vue b/src/components/cards/CardItem.vue
+index 7539ac53e..aaf9f2fe0 100644
+--- a/src/components/cards/CardItem.vue
++++ b/src/components/cards/CardItem.vue
+@@ -20,7 +20,7 @@
+ 			<CardCover v-if="showCardCover" :card-id="card.id" />
+ 			<div class="card-upper">
+ 				<h4 v-if="editingTitle === 0" key="title-view" dir="auto">
+-					<span class="dragDisabled" contenteditable="false">{{ displayTitle }}</span>
++					<span contenteditable="false">{{ displayTitle }}</span>
+ 				</h4>
+ 				<h4 v-if="editingTitle >= 1"
+ 					key="title-edit"
+-- 
+2.54.0
+
diff --git a/machines/nextcloud/configuration.nix b/machines/nextcloud/configuration.nix
index e2fcac8..a697d61 100644
--- a/machines/nextcloud/configuration.nix
+++ b/machines/nextcloud/configuration.nix
@@ -39,7 +39,7 @@ in
 
   services.nextcloud = {
     enable = true;
-    package = pkgs.nextcloud32;
+    package = pkgs.nextcloud33;
     hostName = "cloud.malobeo.org";
     config.adminpassFile = config.sops.secrets.nextcloudAdminPass.path;
     maxUploadSize = "10G";
@@ -54,11 +54,24 @@ in
     extraAppsEnable = true;
     extraApps = {
       inherit (config.services.nextcloud.package.packages.apps) contacts calendar polls registration collectives forms;
-      deck = pkgs.fetchNextcloudApp {
-        sha256 = "sha256-epjwIANb6vTNx9KqaG6jZc14YPoFMBTCj+/c9JHcWkA=";
-        url = "https://link.storjshare.io/raw/jvrl62dakd6htpyxohjkiiqiw5ma/mal/deck32.tar.gz";
-        license = "agpl3Plus";
-      };
+      deck = pkgs.php.buildComposerProject2 (finalAttrs: {
+        pname = "deck";
+        version = "1.18.0";
+        src = pkgs.fetchFromGitHub {
+          owner = "nextcloud";
+          repo = "deck";
+          rev = "stable33";
+          hash = "sha256-7R0IteB34mWFwUlHptvqNlfmeFhJcGMRlKFtDqsw1Dw=";
+        };
+        composerNoDev = false;
+        composerStrictValidation = false;
+        vendorHash = "sha256-gAuG5kKVpuaOpw2HvAP/hu89lmcVWUiSwujoN++I/ZA=";
+        patches = [ ./0001-Patch-cards-to-be-draggable.patch ];
+        postInstall = ''
+          cp -r $out/share/php/deck/* $out/
+          rm -r $out/share
+        '';
+      });
     };
     settings = {
       trusted_domains = [ "cloud.malobeo.org" "cloud.hq.malobeo.org" ];