Update flake.lock

2026-06-04 13:22:43 +00:00
12 changed files with 56 additions and 108 deletions
--- a/.gitea/workflows/autoupdate.yml
+++ b/.gitea/workflows/autoupdate.yml
@@ -2,7 +2,7 @@ name: Weekly Flake Update

 on:
    schedule:
-        - cron: "0 4 1/14 * *"
+        - cron: "0 4 /14 * *"
    workflow_dispatch:

 permissions:
@@ -89,18 +89,6 @@ jobs:
                grep -q ${{ github.ref_name }} &&
                exit 1 ||
                exit 0
-            - name: close other bump requests
-              run: |
-                for i in $(tea pr -o simple | grep "Automatic Nixpkgs update" | awk '{print $1}')
-                do
-                  if [ "$i" = "" ]
-                  then
-                    echo "No bumps to close"
-                    exit 0
-                  else
-                    tea pr close $i
-                  fi
-                done
            - name: Force push branch
              run: git push --force -u origin nixpkgs_bump_$(date +%Y%m%d)
            - name: Create pull request
@@ -114,6 +102,18 @@ jobs:
                -L "bump"
                -t "$COMMIT_MSG"
                -d "$COMMIT_DESC"
+            - name: close other bump requests
+              run: |
+                for i in $(tea pr -o simple | grep "Automatic Nixpkgs update" | awk '{print $1}')
+                do
+                  if [ "$i" = "" ]
+                  then
+                    echo "No bumps to close"
+                    exit 0
+                  else
+                    tea pr close $i
+                  fi
+                done
            - name: Skip pull request
              if: steps.no-pr.outcome == 'failure'
              shell: bash
--- a/doc/book.toml
+++ b/doc/book.toml
@@ -1,5 +1,6 @@
 [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,14 +1,7 @@
 ### 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": 1781319724,
-        "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
+        "lastModified": 1763992789,
+        "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
+        "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-26.05",
+        "ref": "release-25.05",
        "repo": "home-manager",
        "type": "github"
      }
@@ -126,11 +126,11 @@
        "spectrum": "spectrum"
      },
      "locked": {
-        "lastModified": 1781389237,
-        "narHash": "sha256-Ne1/E5XNUq0gleaQz0vW5R4xf/0h/uEZ+bOW1aNjeQk=",
+        "lastModified": 1780522662,
+        "narHash": "sha256-fsiLQSfMmWSUB5KQeKIvaXJv4Dzf24MSl1uB3t4O7eA=",
        "owner": "astro",
        "repo": "microvm.nix",
-        "rev": "6ad601df0a07d9855c5e8f9b81135ecaf7c287eb",
+        "rev": "84b2dedfd03da111a001182ac8c962f1a79007fb",
        "type": "github"
      },
      "original": {
@@ -180,11 +180,11 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1781622756,
-        "narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=",
+        "lastModified": 1780310866,
+        "narHash": "sha256-fPBRVf6A5xlACYcOI59shGrjURuvwu0lRsDoSCEXt/I=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "08018c72174a4df5657f8d94178ac69fb9c243e5",
+        "rev": "4ed851c979641e28597a05086332d75cdc9e395f",
        "type": "github"
      },
      "original": {
@@ -212,11 +212,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1781577229,
-        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
+        "lastModified": 1780243769,
+        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
+        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
        "type": "github"
      },
      "original": {
@@ -241,16 +241,16 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1781216227,
-        "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
+        "lastModified": 1779796641,
+        "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
+        "rev": "25f538306313eae3927264466c70d7001dcea1df",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-26.05",
+        "ref": "nixos-25.11",
        "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-26.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
    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-26.05";
+      url = "github:nix-community/home-manager/release-25.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";
-      environmentFile = config.sops.secrets.njala_api_key.path;
+      credentialsFile = config.sops.secrets.njala_api_key.path;
      dnsPropagationCheck = false;
    };
  };
--- a/machines/louise/configuration.nix
+++ b/machines/louise/configuration.nix
@@ -46,8 +46,6 @@
    ];
  };

-  nixpkgs.config.permittedInsecurePackages = [ "electron-39.8.10" ];
-
  services.tor = {
    enable = true;
    client.enable = true;
--- a/machines/lucia/configuration.nix
+++ b/machines/lucia/configuration.nix
@@ -67,17 +67,17 @@ in
  mpd = {
    enable = true;
    musicDirectory = "/var/lib/mpd/music";
-    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";
-      }];
-    };
+    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"
+      }
+    '';
  
    # 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";
-      environmentFile = config.sops.secrets.njala_api_key.path;
+      credentialsFile = config.sops.secrets.njala_api_key.path;
      dnsPropagationCheck = false;
    };
  };
--- a/machines/modules/malobeo/metrics.nix
+++ b/machines/modules/malobeo/metrics.nix
@@ -41,22 +41,17 @@ in
      };
    };

-    services.alloy = {
+    services.promtail = {
      enable = cfg.enablePromtail;
-      extraFlags = ["--config.format=promtail"]; #TODO please change this to native alloy config later
-      configPath = import ./promtail_config.nix { 
+      configFile = import ./promtail_config.nix { 
        lokiAddress = cfg.lokiHost;
        logNginx = cfg.logNginx;
        config = config;
        pkgs = pkgs;
      };
    };
-    users.groups.promtail = {};
-    users.users.promtail = {
-      isNormalUser = true;
-      group = "promtail";
-      extraGroups = [ "systemd-journal" ] ++ (lib.optionals cfg.logNginx [ "nginx" ]) ;
-    };
+
+    users.users.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
@@ -1,25 +0,0 @@
-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.nextcloud33;
+    package = pkgs.nextcloud32;
    hostName = "cloud.malobeo.org";
    config.adminpassFile = config.sops.secrets.nextcloudAdminPass.path;
    maxUploadSize = "10G";
@@ -54,24 +54,11 @@ in
    extraAppsEnable = true;
    extraApps = {
      inherit (config.services.nextcloud.package.packages.apps) contacts calendar polls registration collectives forms;
-      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
-        '';
-      });
+      deck = pkgs.fetchNextcloudApp {
+        sha256 = "sha256-epjwIANb6vTNx9KqaG6jZc14YPoFMBTCj+/c9JHcWkA=";
+        url = "https://link.storjshare.io/raw/jvrl62dakd6htpyxohjkiiqiw5ma/mal/deck32.tar.gz";
+        license = "agpl3Plus";
+      };
    };
    settings = {
      trusted_domains = [ "cloud.malobeo.org" "cloud.hq.malobeo.org" ];
--- a/machines/overwatch/configuration.nix
+++ b/machines/overwatch/configuration.nix
@@ -37,7 +37,6 @@ in
  services.grafana = {
    enable = true;
    settings = {
-      security.secret_key = "SW2YcwTIb9zpOOhoPsMm";
      server = {
        domain = "grafana.malobeo.org";
        http_port = 2342;