WIP

flake.lock

@@ -450,11 +450,11 @@
         "utils": "utils_4"
       },
       "locked": {
-        "lastModified": 1751462005,
-        "narHash": "sha256-vhr2GORiXij3mL+QIfnL0sKSbbBIglw1wnHWNmFejiA=",
+        "lastModified": 1764942243,
+        "narHash": "sha256-P02Zm0VAON9SqRxqe6h5vfxgpCBYeiz5JPWGIn6KFFg=",
         "ref": "refs/heads/master",
-        "rev": "f505fb17bf1882cc3683e1e252ce44583cbe58ce",
-        "revCount": 155,
+        "rev": "f56b7eb6887b7e0fecae4a1f4c1311392eebad8d",
+        "revCount": 156,
         "type": "git",
         "url": "https://git.dynamicdiscord.de/kalipso/zineshop"
       },

machines/bakunin/configuration.nix

@@ -48,7 +48,7 @@ in
       firefox
       thunderbird
       telegram-desktop
-      tor-browser-bundle-bin
+      tor-browser
       keepassxc
       libreoffice
       gimp

machines/louise/configuration.nix

@@ -31,7 +31,7 @@
       firefox
       thunderbird
       telegram-desktop
-      tor-browser-bundle-bin
+      tor-browser
       keepassxc
       libreoffice
       gimp

machines/nextcloud/configuration.nix

@@ -33,7 +33,7 @@ with lib;
 
   services.nextcloud = {
     enable = true;
-    package = pkgs.nextcloud31;
+    package = pkgs.nextcloud32;
     hostName = "cloud.malobeo.org";
     config.adminpassFile = config.sops.secrets.nextcloudAdminPass.path;
     maxUploadSize = "10G";
@@ -48,16 +48,39 @@ with lib;
     extraAppsEnable = true;
     extraApps = {
       inherit (config.services.nextcloud.package.packages.apps) contacts calendar polls registration collectives forms;
-      appointments = pkgs.fetchNextcloudApp {
-        sha256 = "sha256-ls1rLnsX7U9wo2WkEtzhrvliTcWUl6LWXolE/9etJ78=";
-        url = "https://github.com/SergeyMosin/Appointments/raw/refs/tags/v2.4.3/build/artifacts/appstore/appointments.tar.gz";
-        license = "agpl3Plus";
-      };
-      deck = pkgs.fetchNextcloudApp {
-        sha256 = "sha256-1sqDmJpM9SffMY2aaxwzqntdjdcUaRySyaUDv9VHuiE=";
-        url = "https://link.storjshare.io/raw/jw7pf6gct34j3pcqvlq6ddasvdwq/mal/deck.tar.gz";
-        license = "agpl3Plus";
-      };
+
+      deckWithDrag = pkgs.php.buildComposerProject (finalAttrs: {
+        pname = "deck";
+        version = "1.0.0";
+        src = pkgs.fetchzip {
+          url = "https://github.com/nextcloud/deck/archive/refs/heads/stable32.zip";
+          hash = "sha256-eMHjfki+axEtlhV6518mlAzPhZxAZqEX7HiRsJf1vxo=";
+        };
+        composerNoDev = true;
+        vendorHash = pkgs.lib.fakeHash;
+        postInstall = ''
+          cp -r $out/share/php/deck/* $out/
+          rm -r $out/share
+        '';
+      });
+      
+      #deckWithDrag = pkgs.fetchNextcloudApp {
+      #  appName = "deck";
+      #  appVersion = "1.16.2";
+      #  license = "agpl3Plus";
+      #  teams = [ pkgs.lib.teams.nextcloud ];
+      #  url = "https://github.com/nextcloud-releases/deck/releases/download/v1.16.2/deck-v1.16.2.tar.gz";
+      #  hash = "sha256-rFymTIr7pOuMES3DMIOS7cvq+CEIekLZYLqz58TOP04=";
+      #  description = "";
+      #  homepage = "https://github.com/nextcloud/deck";
+      #  unpack = true;
+      #  patches = [
+      #    (pkgs.fetchpatch {
+      #      url = "https://git.dynamicdiscord.de/ahtlon/deck/commit/77cbcf42ca80dd32e450839f02faca2e5fed3761.patch";
+      #      sha256 = "sha256-agwFMwXO8WLL0+pdeKF/pA59V9ah9t590sCl1msQonA=";
+      #    })
+      #  ];
+      #};
     };
     settings = {
       trusted_domains = ["10.0.0.13"];

outputs.nix

@@ -74,6 +74,63 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
         '';
       };
 
+      #deckWithDrag = pkgs.buildNpmPackage {
+      #  name = "deckWithDrag";
+      #  version = "1.16.2";
+      #  src = pkgs.fetchFromGitHub {
+      #    owner = "nextcloud";
+      #    repo = "deck";
+      #    rev = "v1.16.2";
+      #    hash = "sha256-NBkCdMjIY2r+AgCLBt4YnD4sUW7GTKxT5vHAmpk4wno=";
+      #    leaveDotGit = true;
+      #  };
+
+      #  makeCacheWritable = true;
+      #  npmDepsHash = "sha256-VaKfpYFtrTUvGbKORPvex1FvLz4vR7zfHAf+fdf/6OE=";
+
+      #  buildInputs = with pkgs; [
+      #    gnumake krankerl php84Packages.composer php nodejs_24
+      #  ];
+
+      #  patches = [
+      #    (pkgs.fetchpatch {
+      #      url = "https://git.dynamicdiscord.de/ahtlon/deck/commit/77cbcf42ca80dd32e450839f02faca2e5fed3761.patch";
+      #      sha256 = "sha256-agwFMwXO8WLL0+pdeKF/pA59V9ah9t590sCl1msQonA=";
+      #    })
+      #  ];
+
+      #  buildPhase = ''
+      #    ${pkgs.krankerl}/bin/krankerl package
+      #  '';
+      #};
+
+      deckWithDrag = pkgs.stdenv.mkDerivation {
+        name = "deckWithDrag";
+        src = pkgs.fetchFromGitHub {
+          owner = "nextcloud";
+          repo = "deck";
+          rev = "v1.16.2";
+          hash = "sha256-NBkCdMjIY2r+AgCLBt4YnD4sUW7GTKxT5vHAmpk4wno=";
+          leaveDotGit = true;
+        };
+
+        buildInputs = with pkgs; [
+          gnumake krankerl php84Packages.composer php nodejs_24
+        ];
+
+        patches = [
+          (pkgs.fetchpatch {
+            url = "https://git.dynamicdiscord.de/ahtlon/deck/commit/77cbcf42ca80dd32e450839f02faca2e5fed3761.patch";
+            sha256 = "sha256-agwFMwXO8WLL0+pdeKF/pA59V9ah9t590sCl1msQonA=";
+          })
+        ];
+
+        buildPhase = ''
+          make release
+          #${pkgs.krankerl}/bin/krankerl package
+        '';
+      };
+
       run-vm = pkgs.writeShellScriptBin "run-vm"  (builtins.readFile ./scripts/run-vm.sh);
     };