6 Commits

Author SHA1 Message Date
669b355d99 WIP
All checks were successful
Check flake syntax / flake-check (push) Successful in 12m34s
2026-01-12 14:02:14 +01:00
03846d5e7f [zineshop] re-enable
All checks were successful
Check flake syntax / flake-check (push) Successful in 6m9s
2025-12-05 14:46:18 +01:00
add299c242 Fix nix check; Also i disabled the zineshop temporairly
All checks were successful
Check flake syntax / flake-check (push) Successful in 13m44s
2025-12-03 16:38:31 +01:00
e8f929a35a [nixpkgs] 25.05 -> 25.11
Some checks failed
Check flake syntax / flake-check (push) Failing after 4m31s
2025-12-01 19:14:06 +01:00
42f2c91b8e Merge branch 'master' into staging 2025-12-01 19:08:53 +01:00
7bee418e79 [nixpkgs] update
All checks were successful
Check flake syntax / flake-check (push) Successful in 7m9s
2025-08-14 14:08:54 +02:00
5 changed files with 91 additions and 21 deletions

View File

@@ -49,10 +49,6 @@ in
locations."/" = {
proxyPass = "http://10.0.0.10";
extraConfig = ''
client_max_body_size 10G;
client_body_timeout 3600s;
send_timeout 3600s;
fastcgi_buffers 64 4K;
'';
};
};

View File

@@ -165,10 +165,7 @@ in
proxyPass = "http://10.0.0.13";
extraConfig = ''
proxy_set_header Host $host;
client_max_body_size ${inputs.self.nixosConfigurations.nextcloud.config.services.nextcloud.maxUploadSize};
client_body_timeout 3600s;
send_timeout 3600s;
fastcgi_buffers 64 4K;
client_max_body_size 10G;
'';
};
};

View File

@@ -31,10 +31,6 @@ with lib;
lokiHost = "10.0.0.14";
};
services.postgresqlBackup = {
enable = true;
};
services.nextcloud = {
enable = true;
package = pkgs.nextcloud32;
@@ -52,11 +48,39 @@ with lib;
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";
};
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"];

View File

@@ -45,10 +45,6 @@ with lib;
proxyPass = "http://10.100.0.101";
extraConfig = ''
proxy_set_header Host $host;
client_max_body_size ${inputs.self.nixosConfigurations.nextcloud.config.services.nextcloud.maxUploadSize};
client_body_timeout 3600s;
send_timeout 3600s;
fastcgi_buffers 64 4K;
'';
};
};

View File

@@ -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);
};