Update flake.lock

2
fix
2026-08-06 00:03:07 +00:00 · 2026-03-25 10:25:45 +01:00 · 2026-03-25 10:19:25 +01:00 · 2026-03-25 09:52:43 +01:00 · 2026-03-14 13:42:53 +01:00 · 2026-03-14 13:14:15 +01:00
16 changed files with 68 additions and 123 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 0 * * 4"
    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
--- a/.gitea/workflows/hydra-callback.yml
+++ b/.gitea/workflows/hydra-callback.yml
@@ -1,26 +1,15 @@
-name: Hydra callback
+name: Weekly Flake Update

 on:
    pull_request:
-        types: 
-            - opened
-            - synchronize
-        paths:
-          - '**.nix'
-          - flake.lock
-    push:
-        branches:
-          - master
-        paths:
-          - '**.nix'
-          - flake.lock
+      types: 
+        - opened

 permissions:
    contents: write

 jobs:
-    on_pr:
-        if: github.event.pull_request
+    hydra_callback:
        runs-on: ubuntu-latest
        env:
            NIXPKGS_ALLOW_UNFREE: 1
@@ -35,29 +24,8 @@ jobs:
                github_access_token: ${{ secrets.AHTLONS_GITHUB_TOKEN }}
            - name: Find pr number
              run: |
-                echo PR=$(echo "${{ github.ref }}" | cut -d / -f 3) >> "$GITHUB_ENV"
+                echo 'PR=$(echo "${{ github.ref }}" | cut -d / -f 3)' >> "$GITHUB_ENV"
            - name: run hydra wait
-              timeout-minutes: 200
              run: |
                echo "Running now @ pr no $PR"
-                nix run nixpkgs#hydra-cli -- -H https://hydra.dynamicdiscord.de jobset-wait malobeo2 "$PR"
-
-    on_push:
-        if: github.event.push
-        runs-on: ubuntu-latest
-        env:
-            NIXPKGS_ALLOW_UNFREE: 1
-        steps:
-            - name: Install sudo
-              run: |
-                  apt-get update
-                  apt-get install -y sudo
-            - name: Set up Nix
-              uses: https://github.com/cachix/install-nix-action@v31
-              with: 
-                github_access_token: ${{ secrets.AHTLONS_GITHUB_TOKEN }}
-            - name: run hydra wait
-              timeout-minutes: 200
-              run: |
-                echo "Running now @ master"
-                nix run nixpkgs#hydra-cli -- -H https://hydra.dynamicdiscord.de jobset-wait malobeo2 master
+                nix run nixpkgs#hydra-cli -- -H https://hydra.dynamicdiscord.de jobset-wait malobeo2 "$PR"
--- a/.hydra/spec.json
+++ b/.hydra/spec.json
@@ -12,7 +12,7 @@
  "type": 0,
  "inputs": {
    "nixexpr": {
-      "value": "https://git.dynamicdiscord.de/malobeo/infrastructure master",
+      "value": "https://git.dynamicdiscord.de/ahtlon/infrastructure master",
      "type": "git",
      "emailresponsible": false
    },
--- 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/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": 1785843289,
+        "narHash": "sha256-H/0YgQ+3BtNbdeSVuqjU7ElneBzPPuIKcuWOi0ZUktQ=",
        "owner": "astro",
        "repo": "microvm.nix",
-        "rev": "6ad601df0a07d9855c5e8f9b81135ecaf7c287eb",
+        "rev": "e615e23267bf10d483fb44f759d4e61c354cc0f4",
        "type": "github"
      },
      "original": {
@@ -180,11 +180,11 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1781622756,
-        "narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=",
+        "lastModified": 1785232496,
+        "narHash": "sha256-65EQYIRRpTdpH8lUiB6Mvo5uBkG60aBIzAJuALfx+O0=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "08018c72174a4df5657f8d94178ac69fb9c243e5",
+        "rev": "2e790b0a6be8ec2b76174ac0931b8ff11919ec98",
        "type": "github"
      },
      "original": {
@@ -212,11 +212,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1781577229,
-        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
+        "lastModified": 1785828668,
+        "narHash": "sha256-8fsyqeO+mJqvIzeO4xIpgJe/f7MTbbVTEC6RT6WSXNs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
+        "rev": "e72e4f299401a3689d4b3d5fc6496b11db7064eb",
        "type": "github"
      },
      "original": {
@@ -241,16 +241,16 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1781216227,
-        "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
+        "lastModified": 1782847189,
+        "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
+        "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-26.05",
+        "ref": "nixos-25.11",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -280,11 +280,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1780547341,
-        "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=",
+        "lastModified": 1783174389,
+        "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
+        "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9",
        "type": "github"
      },
      "original": {
@@ -296,11 +296,11 @@
    "spectrum": {
      "flake": false,
      "locked": {
-        "lastModified": 1778940603,
-        "narHash": "sha256-voSM8dZNlaOWN3kbYFky+FNY6fFQOEw0xF+ZMpZKkCQ=",
+        "lastModified": 1785761586,
+        "narHash": "sha256-MWOMVqJJERwjQGgRIv8d6rlEBqbLM3VZWxHkNKIIZNw=",
        "ref": "refs/heads/main",
-        "rev": "367dd227f539267eae2b62770b4c17b88ac8c1f1",
-        "revCount": 1265,
+        "rev": "a7762d6f54b40560dd5255ce902e6e6a5d980fe9",
+        "revCount": 1416,
        "type": "git",
        "url": "https://spectrum-os.org/git/spectrum"
      },
--- 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
@@ -64,29 +64,29 @@ 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";
-  #     }];
-  #   };
+  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"
+      }
+    '';
  
-  #   # Optional:
-  #   network.listenAddress = "any"; # if you want to allow non-localhost connections
-  #   startWhenNeeded = true; # systemd feature: only start MPD service upon connection to its socket
-  # };
+    # Optional:
+    network.listenAddress = "any"; # if you want to allow non-localhost connections
+    startWhenNeeded = true; # systemd feature: only start MPD service upon connection to its socket
+  };

-  # ympd = {
-  #   enable = true;
-  # };
+  ympd = {
+    enable = true;
+  };

  #samba = {
  #  enable = true;
@@ -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/gitea_translator.nix
+++ b/machines/modules/malobeo/gitea_translator.nix
@@ -55,7 +55,7 @@ in

      serviceConfig = {
        ExecStart = ''
-          ${pkgs.python3}/bin/python3 ${../../../scripts/gitea_hydra_server.py} \
+          ${pkgs.python3}/bin/python3 ${inputs.self + /scripts/gitea_hydra_server.py} \
            --baseurl ${cfg.baseurl} \
            --owner ${cfg.owner} \
            --repo ${cfg.repo} \
@@ -75,4 +75,4 @@ in
      };
    };
  };
-}
+}
--- 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/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";
@@ -55,15 +55,14 @@ in
    extraApps = {
      inherit (config.services.nextcloud.package.packages.apps) contacts calendar polls registration collectives forms;
      deck = pkgs.fetchNextcloudApp {
-        sha256 = "sha256-Oc/J0Ey7f9aHhLBWoAXaDMe2t0eeEQKvpwY510qNpiI=";
-        url = "https://s3.g.megas4.com/ya5mczgkbk6bw7tcy2yr4bl2vdryfe76ok2dj/malo/deck33.tar.gz";
+        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" ];
      trusted_proxies = [ hosts.malobeo.hosts.fanny.network.address ];
-      overwriteprotocol = "https";
      "maintenance_window_start" = "1";
      "default_phone_region" = "DE";
    };
--- 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;
--- a/machines/pretalx/configuration.nix
+++ b/machines/pretalx/configuration.nix
@@ -1,4 +1,4 @@
-{ config, self, lib, pkgs, inputs,  ... }:
+{ config, self, lib, pkgs,  ... }:

 with lib;

@@ -58,7 +58,6 @@ in

  services.pretalx = {
    enable = true;
-    package = inputs.nixpkgs-unstable.legacyPackages."x86_64-linux".pretalx;
    celery.extraArgs = [
      "--concurrency=${toString config.microvm.vcpu}"
    ];
--- a/machines/ssh_keys.nix
+++ b/machines/ssh_keys.nix
@@ -4,7 +4,6 @@
   "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCxgcjNOYbza3+RfANFDXy7HXNRFlkpDOAcGyB7MKshiVlbPByWRSjfZa0BeRNjpeCd8QkIodKUzqYOCOrc8ad3kiNbdLRcDz57A5xSLD3ynakoWJo0AmJjT3Ta1JJj8inNwwykR0ig5//SrtsZb9HkWJDAF017MokM2r8AWPE1QzcQdh93kojXcgTHrJHzEqgKbEGDEk37f1RvZG4umEFeqdK2FvS5isPa7P9X7hyyoDC8bvEy7xfaDrToJAoXon6r79taxH8UWIvy//xsU0NBLYK2eE4RQe2AjF6Ri+CybI6y1SsHOvyh4nNKWlfUOEL6UnIulRn/LXFOKCJi7xuoTeJXS0+w1DNEuiGosVNXPSKbUm/eDBVnb8Iyep9wmygSZayN82xL5lRlG3Mn45ttecqfm2SJkmduBA5qXcTdDPe/lXTZaVO9tbiIcJfUgd3ttEu2+6YjLn74D965PlovzvR6EhbVUZ8IkOAt4VmuTkXIdm8SCS7jzhsiKeUXoZ4rfa375zi79SIPuIkoMasj6d16wcYOeFIUIMFFccfQ9jQjr9NTSXC2dd7sfbI9I9mF7eRQSsUdSwpP8WH1b+M1MxTbdhEUdPwpOLviTTIuk8E8K8DQDZIcOOh38mCDpyoh02nwfRxlyoYVsKAHIQH02dHTvYEa3/pMsRwGc9W1Ow== kalipso@desktop"
   "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINQg6a2EGmq+i9lfwU+SRMQ8MGN3is3VS6janzl9qOHo quaseb67@hzdr.de"
   "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICKaEcGaSKU0xC5qCwzj2oCLLG4PYjWHZ7/CXHw4urVk atlan@nixos"
-   "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDi8yxrMZoXEy7e8/MZeyihOARU2tN0TpJTUX55UO31B atlan@argon"
 ];
 backup = [
  "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDIGryhnXdmbGObONG88K+c9zeduMrwtoLHwzMDZg3UXB+Cnq2FXWOrlLZxA+95VUgHpyGZiykJmzeWrKhldDlDeGGd8QCCLeuliiOgXADTYjWaVfhd+6arPZrK2VtqqsguvH40gW1xfoGAOmAT4WFnxWxIaEip0V2u6NOoKTiH9I3bz2Qe4lfJvPXig+XwCXcukXd6XUkDFYDpiw8XNV3X7pqTus5d2RYR97bAhIYZZQ6h50ZpTY8N0lFh4RY5yfx8BhxJW3tfoi9uZvVuPx7dGPsZsSniENFPMNz3UwHGitTJMr4088cJrAGgd5lyFuLouiHiM2JMGA0wx9wWTbWJEwTLaTVQK9gSJf857ndV2zCh9vKlfko4w9bQgqxKg4U/mY8dXX1E7D51nD2ci8Ed+ZG+NEneFLyZhLsD82GkBY+YovA+4xm/pcx+hBhlyqGNxI8v+Jh+JhEyD/ZLgJfq3ZMbGIGsTiDwZ2flLLxImHHEoDoT6PHU6hDhPDJu560="
--- a/outputs.nix
+++ b/outputs.nix
@@ -118,7 +118,6 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
      users.imports = [ ./machines/modules/malobeo/users.nix ];
      backup.imports = [ ./machines/modules/malobeo/backup.nix ];
      printing.imports = [ ./machines/modules/malobeo/printing.nix ];
-      gitea-translator.imports = [ ./machines/modules/malobeo/gitea_translator.nix ];
    };

    hydraJobs = nixpkgs.lib.mapAttrs (_: nixpkgs.lib.hydraJob) (
Author	SHA1	Message	Date
malobot	e0067fa104	Update flake.lock	2026-08-06 00:03:07 +00:00
ahtlon	22e49eb5a1	2	2026-03-25 10:25:45 +01:00
ahtlon	9648ff2adc	fix	2026-03-25 10:19:25 +01:00
ahtlon	9faf4de28d	add hydra wait thingie	2026-03-25 09:52:43 +01:00
ahtlon	5634919fa6	cut var	2026-03-14 13:42:53 +01:00
ahtlon	394c0610ce	Try out workflow check	2026-03-14 13:14:15 +01:00