[docs] update nextcloud instructions

Multilingual keyword not supported
[Nextcloud] build deck in flake
2026-06-17 11:52:48 +02:00 · 2026-06-17 11:45:07 +02:00 · 2026-06-17 11:43:37 +02:00 · 2026-06-17 10:47:15 +02:00 · 2026-06-17 10:38:47 +02:00 · 2026-06-17 10:34:11 +02:00
10 changed files with 93 additions and 43 deletions
--- a/doc/book.toml
+++ b/doc/book.toml
@@ -1,6 +1,5 @@
 [book]
 authors = ["ahtlon"]
 language = "de"
-multilingual = false
 src = "src"
 title = "Malobeo Infrastruktur Dokumentation"
--- a/doc/src/anleitung/update_nextcloud.md
+++ b/doc/src/anleitung/update_nextcloud.md
@@ -1,7 +1,14 @@
 ### Updating nextcloud

 ## Updating the draggable patch
+As of 17.06.26 the patch now gets applied automaticly while building the package.   
+On a nextcloud update:
+- Change the `services.nextcloud.package` to the next version (ex.: `pkgs.nextcloud33`)
+- Change `services.nextcloud.extraApps.deck.src.rev` to the next version (ex.: `stable33`)
+- update hashes

+
+### Building the package manually 
 The draggable patch is a one line patch found in the deck repo under `src/components/cards/CardItem.vue`   
 Direct link: https://git.dynamicdiscord.de/ahtlon/deck/commit/77cbcf42ca80dd32e450839f02faca2e5fed3761   

--- a/flake.lock
+++ b/flake.lock
@@ -85,16 +85,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1763992789,
-        "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=",
+        "lastModified": 1781319724,
+        "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3",
+        "rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "release-26.05",
        "repo": "home-manager",
        "type": "github"
      }
@@ -126,11 +126,11 @@
        "spectrum": "spectrum"
      },
      "locked": {
-        "lastModified": 1780588968,
-        "narHash": "sha256-zQk+GqLO+T9taIl1UUt3swvaOksWJxL7PL8K0+Fc/Hs=",
+        "lastModified": 1781389237,
+        "narHash": "sha256-Ne1/E5XNUq0gleaQz0vW5R4xf/0h/uEZ+bOW1aNjeQk=",
        "owner": "astro",
        "repo": "microvm.nix",
-        "rev": "4d3fb17437944ea57eef2b9e6108ca777b1209ca",
+        "rev": "6ad601df0a07d9855c5e8f9b81135ecaf7c287eb",
        "type": "github"
      },
      "original": {
@@ -180,11 +180,11 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1781020964,
-        "narHash": "sha256-fS7xTi2j2iso5Hj7RNZLv/acDlCT+fgMVkVk40A7Uco=",
+        "lastModified": 1781622756,
+        "narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "32c2cd9e46286c4eced3dc6b613c659126bf3cca",
+        "rev": "08018c72174a4df5657f8d94178ac69fb9c243e5",
        "type": "github"
      },
      "original": {
@@ -212,11 +212,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1780749050,
-        "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
+        "lastModified": 1781577229,
+        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
+        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
        "type": "github"
      },
      "original": {
@@ -241,16 +241,16 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1780952837,
-        "narHash": "sha256-Fwd1+spDtQ0hDyBwme6ufG3n4mY0UrjjFdYHv+G/Hds=",
+        "lastModified": 1781216227,
+        "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e820eb4a444b46a19b2e03e8dfd2359439ff30fe",
+        "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
        "repo": "nixpkgs",
        "type": "github"
      }
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@

  inputs = {
    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
    sops-nix.url = "github:Mic92/sops-nix";
    sops-nix.inputs.nixpkgs.follows = "nixpkgs";
@@ -43,7 +43,7 @@
    };

    home-manager=  {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager/release-26.05";
      inputs = {
        nixpkgs.follows = "nixpkgs";
      };
--- a/machines/fanny/configuration.nix
+++ b/machines/fanny/configuration.nix
@@ -165,7 +165,7 @@ in
    defaults.email = "malobeo@systemli.org";
    defaults = {
      dnsProvider = "njalla";
-      credentialsFile = config.sops.secrets.njala_api_key.path;
+      environmentFile = config.sops.secrets.njala_api_key.path;
      dnsPropagationCheck = false;
    };
  };
--- a/machines/lucia/configuration.nix
+++ b/machines/lucia/configuration.nix
@@ -67,17 +67,17 @@ in
  mpd = {
    enable = true;
    musicDirectory = "/var/lib/mpd/music";
-    extraConfig = ''
-      audio_output {
-        type "alsa"
-        name "My ALSA"
-        device			"hw:0,0"	# optional 
-        format			"44100:16:2"	# optional
-        mixer_type		"hardware"
-        mixer_device	"default"
-        mixer_control	"PCM"
-      }
-    '';
+    settings = {
+      audio_output = [{
+        type = "alsa";
+        name = "My ALSA";
+        device = "hw:0,0";	# optional 
+        format = "44100:16:2";	# optional
+        mixer_type = "hardware";
+        mixer_device = "default";
+        mixer_control = "PCM";
+      }];
+    };
  
    # Optional:
    network.listenAddress = "any"; # if you want to allow non-localhost connections
@@ -199,7 +199,7 @@ in
    defaults.email = "malobeo@systemli.org";
    defaults = {
      dnsProvider = "njalla";
-      credentialsFile = config.sops.secrets.njala_api_key.path;
+      environmentFile = config.sops.secrets.njala_api_key.path;
      dnsPropagationCheck = false;
    };
  };
--- a/machines/modules/malobeo/metrics.nix
+++ b/machines/modules/malobeo/metrics.nix
@@ -41,17 +41,22 @@ in
      };
    };

-    services.promtail = {
+    services.alloy = {
      enable = cfg.enablePromtail;
-      configFile = import ./promtail_config.nix { 
+      extraFlags = ["--config.format=promtail"]; #TODO please change this to native alloy config later
+      configPath = import ./promtail_config.nix { 
        lokiAddress = cfg.lokiHost;
        logNginx = cfg.logNginx;
        config = config;
        pkgs = pkgs;
      };
    };
-
-    users.users.promtail.extraGroups = [ "systemd-journal" ] ++ (lib.optionals cfg.logNginx [ "nginx" ]) ;
+    users.groups.promtail = {};
+    users.users.promtail = {
+      isNormalUser = true;
+      group = "promtail";
+      extraGroups = [ "systemd-journal" ] ++ (lib.optionals cfg.logNginx [ "nginx" ]) ;
+    };

  };
 }
--- a/machines/nextcloud/0001-Patch-cards-to-be-draggable.patch
+++ 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
+
--- 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" ];
--- a/machines/overwatch/configuration.nix
+++ b/machines/overwatch/configuration.nix
@@ -37,6 +37,7 @@ in
  services.grafana = {
    enable = true;
    settings = {
+      security.secret_key = "SW2YcwTIb9zpOOhoPsMm";
      server = {
        domain = "grafana.malobeo.org";
        http_port = 2342;
Author	SHA1	Message	Date
ahtlon	529848d89e	[docs] update nextcloud instructions Some checks are pending Hydra callback / on_pr (pull_request) Waiting to run Details Hydra callback / on_push (pull_request) Waiting to run Details Check flake syntax / flake-check (push) Waiting to run Details	2026-06-17 11:52:48 +02:00
ahtlon	cf89ece4d6	Multilingual keyword not supported Some checks failed Check flake syntax / flake-check (push) Has been cancelled Details Hydra callback / on_push (pull_request) Has been cancelled Details Hydra callback / on_pr (pull_request) Has been cancelled Details	2026-06-17 11:45:07 +02:00
ahtlon	0b77bbd8a6	[Nextcloud] build deck in flake Changes from a cloud filehost to a local build, should also be more maintainable	2026-06-17 11:43:37 +02:00
ahtlon	b5b84e2ec8	change mpd config to declarative Some checks failed Check flake syntax / flake-check (push) Has been cancelled Details Hydra callback / on_push (pull_request) Has been cancelled Details Hydra callback / on_pr (pull_request) Has been cancelled Details	2026-06-17 10:47:15 +02:00
ahtlon	90d631f73c	Change credentialsFile to environmentFile Some checks failed Check flake syntax / flake-check (push) Has been cancelled Details Hydra callback / on_push (pull_request) Has been cancelled Details Hydra callback / on_pr (pull_request) Has been cancelled Details	2026-06-17 10:38:47 +02:00
ahtlon	8c9b49f5c3	Hardcode grafana security key Grafana's secret key (services.grafana.settings.security.secret_key) doesn't have a default value anymore. Please generate your own and use a file-provider on this option! See also https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#secret_key for more information. See https://grafana.com/docs/grafana/latest/setup-grafana/configure-security/configure-database-encryption/#re-encrypt-secrets on how to re-encrypt. As stated in the NixOS changelog for 26.05, there's no official way to rotate. Either hard-code the old key ("SW2YcwTIb9zpOOhoPsMm") if your setup doesn't have any secrets in the DB that need special protection or perform a rotation with a 3rd-party tool (`d9dc788902`).	2026-06-17 10:34:11 +02:00
ahtlon	a575d16ec0	Promtail is EOL Recomended migtration to grafana-alloy (https://grafana.com/docs/alloy/latest/set-up/migrate/from-promtail/) or fluent-bit (https://docs.fluentbit.io/manual/data-pipeline/outputs/loki) I chose alloy because of the compatability. This needs to be reworked to a native implementation later	2026-06-17 10:29:03 +02:00
ahtlon	1cc93d5dc2	Update to 26.05 Some checks failed Hydra callback / on_pr (pull_request) Waiting to run Details Check flake syntax / flake-check (push) Failing after 3m41s Details Hydra callback / on_push (pull_request) Has been skipped Details	2026-06-17 09:56:13 +02:00