cut var

Flake lock file updates:

• Updated input 'microvm':
    'github:astro/microvm.nix/f6dcfb7c16cc3775536c825dc0698d4ede13d063' (2026-02-25)
  → 'github:astro/microvm.nix/25ebda3c558e923720c965832dc9a04f559a055c' (2026-03-09)
• Updated input 'microvm/spectrum':
    'git+https://spectrum-os.org/git/spectrum?ref=refs/heads/main&rev=c5d5786d3dc938af0b279c542d1e43bce381b4b9' (2025-10-03)
  → 'git+https://spectrum-os.org/git/spectrum?ref=refs/heads/main&rev=fe39e122d898f66e89ffa17d4f4209989ccb5358' (2026-02-27)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/41c6b421bdc301b2624486e11905c9af7b8ec68e' (2026-02-24)
  → 'github:NixOS/nixos-hardware/3966ce987e1a9a164205ac8259a5fe8a64528f72' (2026-03-08)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/e764fc9a405871f1f6ca3d1394fb422e0a0c3951' (2026-02-24)
  → 'github:NixOS/nixpkgs/3e20095fe3c6cbb1ddcef89b26969a69a1570776' (2026-03-13)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/2fc6539b481e1d2569f25f8799236694180c0993' (2026-02-23)
  → 'github:NixOS/nixpkgs/fe416aaedd397cacb33a610b33d60ff2b431b127' (2026-03-12)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/334daa7c273dd8bf7a0cd370e4e16022b64e55e9' (2026-02-25)
  → 'github:Mic92/sops-nix/d1ff3b1034d5bab5d7d8086a7803c5a5968cd784' (2026-03-09)

.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

.gitea/workflows/comment-diff.yml

@@ -0,0 +1,33 @@
+name: Weekly Flake Update
+
+on:
+    pull_request:
+      types: 
+        - opened
+        - synchronize
+        - edited
+        - reopened
+
+permissions:
+    contents: write
+
+jobs:
+  Explore-Gitea-Actions:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
+      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!"
+      - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
+      - run: echo "🖥️ The workflow is now ready to test your code on the runner."
+      - name: List files in the repository
+        run: |
+          ls ${{ github.workspace }}
+      - run: echo "🍏 This job's status is ${{ job.status }}."
+      - name: Check for string parsing
+        run: |
+          var=$(echo "${{ github.ref }}" | cut -d / -f 3)
+          echo "$var"
+

.gitea/workflows/hydra-callback.yml

@@ -1,63 +0,0 @@
-name: Hydra callback
-
-on:
-    pull_request:
-        types: 
-            - opened
-            - synchronize
-        paths:
-          - '**.nix'
-          - flake.lock
-    push:
-        branches:
-          - master
-        paths:
-          - '**.nix'
-          - flake.lock
-
-permissions:
-    contents: write
-
-jobs:
-    on_pr:
-        if: github.event.pull_request
-        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: Find pr number
-              run: |
-                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

.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
     },

doc/book.toml

@@ -1,5 +1,6 @@
 [book]
 authors = ["ahtlon"]
 language = "de"
+multilingual = false
 src = "src"
 title = "Malobeo Infrastruktur Dokumentation"

dont merge this/gitea2.json

@@ -0,0 +1,350 @@
+{
+  "allow_maintainer_edit": false,
+  "assignee": null,
+  "assignees": null,
+  "base": {
+    "label": "master",
+    "ref": "master",
+    "repo": {
+      "allow_fast_forward_only_merge": false,
+      "allow_manual_merge": false,
+      "allow_merge_commits": true,
+      "allow_rebase": true,
+      "allow_rebase_explicit": true,
+      "allow_rebase_update": true,
+      "allow_squash_merge": true,
+      "archived": false,
+      "archived_at": "1970-01-01T01:00:00+01:00",
+      "autodetect_manual_merge": false,
+      "avatar_url": "",
+      "clone_url": "https://git.dynamicdiscord.de/ahtlon/infrastructure.git",
+      "created_at": "2024-10-24T19:38:14+02:00",
+      "default_allow_maintainer_edit": false,
+      "default_branch": "master",
+      "default_delete_branch_after_merge": false,
+      "default_merge_style": "merge",
+      "description": "",
+      "empty": false,
+      "fork": true,
+      "forks_count": 0,
+      "full_name": "ahtlon/infrastructure",
+      "has_actions": true,
+      "has_code": true,
+      "has_issues": false,
+      "has_packages": false,
+      "has_projects": false,
+      "has_pull_requests": true,
+      "has_releases": false,
+      "has_wiki": false,
+      "html_url": "https://git.dynamicdiscord.de/ahtlon/infrastructure",
+      "id": 29,
+      "ignore_whitespace_conflicts": false,
+      "internal": false,
+      "language": "",
+      "languages_url": "https://git.dynamicdiscord.de/api/v1/repos/ahtlon/infrastructure/languages",
+      "licenses": [],
+      "link": "",
+      "mirror": false,
+      "mirror_interval": "",
+      "mirror_updated": "0001-01-01T00:00:00Z",
+      "name": "infrastructure",
+      "object_format_name": "sha1",
+      "open_issues_count": 0,
+      "open_pr_counter": 5,
+      "original_url": "",
+      "owner": {
+        "active": false,
+        "avatar_url": "https://git.dynamicdiscord.de/avatars/7399d018a0bcee0f2da113bdeeafec029316d8e8ce774b829de4125b026c0599",
+        "created": "2024-10-23T17:19:18+02:00",
+        "description": "",
+        "email": "ahtlon@noreply.git.dynamicdiscord.de",
+        "followers_count": 0,
+        "following_count": 0,
+        "full_name": "",
+        "html_url": "https://git.dynamicdiscord.de/ahtlon",
+        "id": 8,
+        "is_admin": false,
+        "language": "",
+        "last_login": "0001-01-01T00:00:00Z",
+        "location": "",
+        "login": "ahtlon",
+        "login_name": "",
+        "prohibit_login": false,
+        "restricted": false,
+        "source_id": 0,
+        "starred_repos_count": 0,
+        "username": "ahtlon",
+        "visibility": "public",
+        "website": ""
+      },
+      "parent": {
+        "allow_fast_forward_only_merge": false,
+        "allow_manual_merge": false,
+        "allow_merge_commits": true,
+        "allow_rebase": true,
+        "allow_rebase_explicit": true,
+        "allow_rebase_update": true,
+        "allow_squash_merge": true,
+        "archived": false,
+        "archived_at": "1970-01-01T01:00:00+01:00",
+        "autodetect_manual_merge": false,
+        "avatar_url": "",
+        "clone_url": "https://git.dynamicdiscord.de/malobeo/infrastructure.git",
+        "created_at": "2022-10-04T18:35:43+02:00",
+        "default_allow_maintainer_edit": false,
+        "default_branch": "master",
+        "default_delete_branch_after_merge": false,
+        "default_merge_style": "merge",
+        "description": "",
+        "empty": false,
+        "fork": false,
+        "forks_count": 1,
+        "full_name": "malobeo/infrastructure",
+        "has_actions": true,
+        "has_code": true,
+        "has_issues": true,
+        "has_packages": false,
+        "has_projects": true,
+        "has_pull_requests": true,
+        "has_releases": true,
+        "has_wiki": true,
+        "html_url": "https://git.dynamicdiscord.de/malobeo/infrastructure",
+        "id": 15,
+        "ignore_whitespace_conflicts": false,
+        "internal": false,
+        "internal_tracker": {
+          "allow_only_contributors_to_track_time": true,
+          "enable_issue_dependencies": true,
+          "enable_time_tracker": true
+        },
+        "language": "",
+        "languages_url": "https://git.dynamicdiscord.de/api/v1/repos/malobeo/infrastructure/languages",
+        "licenses": [],
+        "link": "",
+        "mirror": false,
+        "mirror_interval": "",
+        "mirror_updated": "0001-01-01T00:00:00Z",
+        "name": "infrastructure",
+        "object_format_name": "sha1",
+        "open_issues_count": 40,
+        "open_pr_counter": 4,
+        "original_url": "",
+        "owner": {
+          "active": false,
+          "avatar_url": "https://git.dynamicdiscord.de/avatars/9ea8af20ca015cb078b2971cd4e91e6d",
+          "created": "2023-03-29T17:26:16+02:00",
+          "description": "",
+          "email": "",
+          "followers_count": 0,
+          "following_count": 0,
+          "full_name": "",
+          "html_url": "https://git.dynamicdiscord.de/malobeo",
+          "id": 7,
+          "is_admin": false,
+          "language": "",
+          "last_login": "0001-01-01T00:00:00Z",
+          "location": "",
+          "login": "malobeo",
+          "login_name": "",
+          "prohibit_login": false,
+          "restricted": false,
+          "source_id": 0,
+          "starred_repos_count": 0,
+          "username": "malobeo",
+          "visibility": "public",
+          "website": ""
+        },
+        "permissions": {
+          "admin": false,
+          "pull": true,
+          "push": false
+        },
+        "private": false,
+        "projects_mode": "",
+        "release_counter": 0,
+        "size": 2878,
+        "ssh_url": "ssh://gitea@git.dynamicdiscord.de:23428/malobeo/infrastructure.git",
+        "stars_count": 1,
+        "template": false,
+        "topics": [],
+        "updated_at": "2026-03-12T01:11:13+01:00",
+        "url": "https://git.dynamicdiscord.de/api/v1/repos/malobeo/infrastructure",
+        "watchers_count": 2,
+        "website": ""
+      },
+      "permissions": {
+        "admin": false,
+        "pull": true,
+        "push": false
+      },
+      "private": false,
+      "projects_mode": "all",
+      "release_counter": 0,
+      "size": 14507,
+      "ssh_url": "ssh://gitea@git.dynamicdiscord.de:23428/ahtlon/infrastructure.git",
+      "stars_count": 0,
+      "template": false,
+      "topics": [],
+      "updated_at": "2026-03-12T01:05:43+01:00",
+      "url": "https://git.dynamicdiscord.de/api/v1/repos/ahtlon/infrastructure",
+      "watchers_count": 1,
+      "website": ""
+    },
+    "repo_id": 29,
+    "sha": "dacdb2214ea6ff645c444ce0eaab68c317f0a616"
+  },
+  "body": "",
+  "closed_at": null,
+  "comments": 0,
+  "created_at": "2026-03-11T17:29:55+01:00",
+  "diff_url": "https://git.dynamicdiscord.de/ahtlon/infrastructure/pulls/8.diff",
+  "draft": false,
+  "due_date": null,
+  "head": {
+    "label": "nixpkgs_bump_20260305",
+    "ref": "nixpkgs_bump_20260305",
+    "repo": {
+      "allow_fast_forward_only_merge": false,
+      "allow_manual_merge": false,
+      "allow_merge_commits": true,
+      "allow_rebase": true,
+      "allow_rebase_explicit": true,
+      "allow_rebase_update": true,
+      "allow_squash_merge": true,
+      "archived": false,
+      "archived_at": "1970-01-01T01:00:00+01:00",
+      "autodetect_manual_merge": false,
+      "avatar_url": "",
+      "clone_url": "https://git.dynamicdiscord.de/malobeo/infrastructure.git",
+      "created_at": "2022-10-04T18:35:43+02:00",
+      "default_allow_maintainer_edit": false,
+      "default_branch": "master",
+      "default_delete_branch_after_merge": false,
+      "default_merge_style": "merge",
+      "description": "",
+      "empty": false,
+      "fork": false,
+      "forks_count": 1,
+      "full_name": "malobeo/infrastructure",
+      "has_actions": true,
+      "has_code": true,
+      "has_issues": true,
+      "has_packages": false,
+      "has_projects": true,
+      "has_pull_requests": true,
+      "has_releases": true,
+      "has_wiki": true,
+      "html_url": "https://git.dynamicdiscord.de/malobeo/infrastructure",
+      "id": 15,
+      "ignore_whitespace_conflicts": false,
+      "internal": false,
+      "internal_tracker": {
+        "allow_only_contributors_to_track_time": true,
+        "enable_issue_dependencies": true,
+        "enable_time_tracker": true
+      },
+      "language": "",
+      "languages_url": "https://git.dynamicdiscord.de/api/v1/repos/malobeo/infrastructure/languages",
+      "licenses": [],
+      "link": "",
+      "mirror": false,
+      "mirror_interval": "",
+      "mirror_updated": "0001-01-01T00:00:00Z",
+      "name": "infrastructure",
+      "object_format_name": "sha1",
+      "open_issues_count": 40,
+      "open_pr_counter": 4,
+      "original_url": "",
+      "owner": {
+        "active": false,
+        "avatar_url": "https://git.dynamicdiscord.de/avatars/9ea8af20ca015cb078b2971cd4e91e6d",
+        "created": "2023-03-29T17:26:16+02:00",
+        "description": "",
+        "email": "",
+        "followers_count": 0,
+        "following_count": 0,
+        "full_name": "",
+        "html_url": "https://git.dynamicdiscord.de/malobeo",
+        "id": 7,
+        "is_admin": false,
+        "language": "",
+        "last_login": "0001-01-01T00:00:00Z",
+        "location": "",
+        "login": "malobeo",
+        "login_name": "",
+        "prohibit_login": false,
+        "restricted": false,
+        "source_id": 0,
+        "starred_repos_count": 0,
+        "username": "malobeo",
+        "visibility": "public",
+        "website": ""
+      },
+      "permissions": {
+        "admin": false,
+        "pull": true,
+        "push": false
+      },
+      "private": false,
+      "projects_mode": "",
+      "release_counter": 0,
+      "size": 2878,
+      "ssh_url": "ssh://gitea@git.dynamicdiscord.de:23428/malobeo/infrastructure.git",
+      "stars_count": 1,
+      "template": false,
+      "topics": [],
+      "updated_at": "2026-03-12T01:11:13+01:00",
+      "url": "https://git.dynamicdiscord.de/api/v1/repos/malobeo/infrastructure",
+      "watchers_count": 2,
+      "website": ""
+    },
+    "repo_id": 15,
+    "sha": "7c66a24563d0e95c292aafeaa08056effc6152d9"
+  },
+  "html_url": "https://git.dynamicdiscord.de/ahtlon/infrastructure/pulls/8",
+  "id": 66,
+  "is_locked": false,
+  "labels": [],
+  "merge_base": "344eeb437b0aa29baee1227e48878f987e21e296",
+  "merge_commit_sha": null,
+  "mergeable": true,
+  "merged": false,
+  "merged_at": null,
+  "merged_by": null,
+  "milestone": null,
+  "number": 8,
+  "patch_url": "https://git.dynamicdiscord.de/ahtlon/infrastructure/pulls/8.patch",
+  "pin_order": 0,
+  "requested_reviewers": null,
+  "requested_reviewers_teams": null,
+  "state": "open",
+  "target_repo_url": "https://git.dynamicdiscord.de/ahtlon/infrastructure.git",
+  "title": "Update flake.lock",
+  "updated_at": "2026-03-11T17:29:55+01:00",
+  "url": "https://git.dynamicdiscord.de/ahtlon/infrastructure/pulls/8",
+  "user": {
+    "active": false,
+    "avatar_url": "https://git.dynamicdiscord.de/avatars/7399d018a0bcee0f2da113bdeeafec029316d8e8ce774b829de4125b026c0599",
+    "created": "2024-10-23T17:19:18+02:00",
+    "description": "",
+    "email": "ahtlon@noreply.git.dynamicdiscord.de",
+    "followers_count": 0,
+    "following_count": 0,
+    "full_name": "",
+    "html_url": "https://git.dynamicdiscord.de/ahtlon",
+    "id": 8,
+    "is_admin": false,
+    "language": "",
+    "last_login": "0001-01-01T00:00:00Z",
+    "location": "",
+    "login": "ahtlon",
+    "login_name": "",
+    "prohibit_login": false,
+    "restricted": false,
+    "source_id": 0,
+    "starred_repos_count": 0,
+    "username": "ahtlon",
+    "visibility": "public",
+    "website": ""
+  }
+}

flake.lock

@@ -85,16 +85,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1781319724,
+        "lastModified": 1763992789,
-        "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
+        "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,
+        "lastModified": 1773018425,
-        "narHash": "sha256-Ne1/E5XNUq0gleaQz0vW5R4xf/0h/uEZ+bOW1aNjeQk=",
+        "narHash": "sha256-fpgZBmZpKoEXEowBK/6m8g9FcOLWQ4UxhXHqCw2CpSM=",
         "owner": "astro",
         "repo": "microvm.nix",
-        "rev": "6ad601df0a07d9855c5e8f9b81135ecaf7c287eb",
+        "rev": "25ebda3c558e923720c965832dc9a04f559a055c",
         "type": "github"
       },
       "original": {
@@ -176,15 +176,12 @@
       }
     },
     "nixos-hardware": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
       "locked": {
-        "lastModified": 1781622756,
+        "lastModified": 1772972630,
-        "narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=",
+        "narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "08018c72174a4df5657f8d94178ac69fb9c243e5",
+        "rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72",
         "type": "github"
       },
       "original": {
@@ -212,11 +209,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1781577229,
+        "lastModified": 1773282481,
-        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
+        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
+        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
         "type": "github"
       },
       "original": {
@@ -228,29 +225,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1767892417,
+        "lastModified": 1773375660,
-        "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
+        "narHash": "sha256-SEzUWw2Rf5Ki3bcM26nSKgbeoqi2uYy8IHVBqOKjX3w=",
-        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1781216227,
-        "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
+        "rev": "3e20095fe3c6cbb1ddcef89b26969a69a1570776",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-26.05",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -265,7 +249,7 @@
         "microvm": "microvm",
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "sops-nix": "sops-nix",
         "tasklist": "tasklist",
@@ -280,11 +264,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780547341,
+        "lastModified": 1773096132,
-        "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=",
+        "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
+        "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784",
         "type": "github"
       },
       "original": {
@@ -296,11 +280,11 @@
     "spectrum": {
       "flake": false,
       "locked": {
-        "lastModified": 1778940603,
+        "lastModified": 1772189877,
-        "narHash": "sha256-voSM8dZNlaOWN3kbYFky+FNY6fFQOEw0xF+ZMpZKkCQ=",
+        "narHash": "sha256-i1p90Rgssb//aNiTDFq46ZG/fk3LmyRLChtp/9lddyA=",
         "ref": "refs/heads/main",
-        "rev": "367dd227f539267eae2b62770b4c17b88ac8c1f1",
+        "rev": "fe39e122d898f66e89ffa17d4f4209989ccb5358",
-        "revCount": 1265,
+        "revCount": 1255,
         "type": "git",
         "url": "https://spectrum-os.org/git/spectrum"
       },

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";
       };

gitea2.json

@@ -0,0 +1,350 @@
+AAAAAA{
+  "allow_maintainer_edit": false,
+  "assignee": null,
+  "assignees": null,
+  "base": {
+    "label": "master",
+    "ref": "master",dd
+    "repo": {
+      "allow_fast_ddasdad_only_merge": false,
+      "allow_manual_merge": false,
+      "allow_merge_commits": true,
+      "allow_rebase": true,
+      "allow_rebase_explicit": true,
+      "allow_rebase_update": true,
+      "allow_squash_merge": true,
+      "archived": false,
+      "archived_at": "1970-01-01T01:00:00+01:00",
+      "autodetect_manual_merge": false,
+      "avatar_url": "",
+      "clone_url": "https://git.dynamicdiscord.de/ahtlon/infrastructure.git",
+      "created_at": "2024-10-24T19:38:14+02:00",
+      "default_allow_maintainer_edit": false,
+      "default_branch": "master",
+      "default_delete_branch_after_merge": false,
+      "default_merge_style": "merge",
+      "description": "",
+      "empty": false,
+      "fork": true,
+      "forks_count": 0,
+      "full_name": "ahtlon/infrastructure",
+      "has_actions": true,
+      "has_code": true,
+      "has_issues": false,
+      "has_packages": false,
+      "has_projects": false,
+      "has_pull_requests": true,
+      "has_releases": false,
+      "has_wiki": false,
+      "html_url": "https://git.dynamicdiscord.de/ahtlon/infrastructure",
+      "id": 29,
+      "ignore_whitespace_conflicts": false,
+      "internal": false,
+      "language": "",
+      "languages_url": "https://git.dynamicdiscord.de/api/v1/repos/ahtlon/infrastructure/languages",
+      "licenses": [],
+      "link": "",
+      "mirror": false,
+      "mirror_interval": "",
+      "mirror_updated": "0001-01-01T00:00:00Z",
+      "name": "infrastructure",
+      "object_format_name": "sha1",
+      "open_issues_count": 0,
+      "open_pr_counter": 6,
+      "original_url": "",
+      "owner": {
+        "active": false,
+        "avatar_url": "https://git.dynamicdiscord.de/avatars/7399d018a0bcee0f2da113bdeeafec029316d8e8ce774b829de4125b026c0599",
+        "created": "2024-10-23T17:19:18+02:00",
+        "description": "",
+        "email": "ahtlon@noreply.git.dynamicdiscord.de",
+        "followers_count": 0,
+        "following_count": 0,
+        "full_name": "",
+        "html_url": "https://git.dynamicdiscord.de/ahtlon",
+        "id": 8,
+        "is_admin": false,
+        "language": "",
+        "last_login": "0001-01-01T00:00:00Z",
+        "location": "",
+        "login": "ahtlon",
+        "login_name": "",
+        "prohibit_login": false,
+        "restricted": false,
+        "source_id": 0,
+        "starred_repos_count": 0,
+        "username": "ahtlon",
+        "visibility": "public",
+        "website": ""
+      },
+      "parent": {
+        "allow_fast_forward_only_merge": false,
+        "allow_manual_merge": false,
+        "allow_merge_commits": true,
+        "allow_rebase": true,
+        "allow_rebase_explicit": true,
+        "allow_rebase_update": true,
+        "allow_squash_merge": true,
+        "archived": false,
+        "archived_at": "1970-01-01T01:00:00+01:00",
+        "autodetect_manual_merge": false,
+        "avatar_url": "",
+        "clone_url": "https://git.dynamicdiscord.de/malobeo/infrastructure.git",
+        "created_at": "2022-10-04T18:35:43+02:00",
+        "default_allow_maintainer_edit": false,
+        "default_branch": "master",
+        "default_delete_branch_after_merge": false,
+        "default_merge_style": "merge",
+        "description": "",
+        "empty": false,
+        "fork": false,
+        "forks_count": 1,
+        "full_name": "malobeo/infrastructure",
+        "has_actions": true,
+        "has_code": true,
+        "has_issues": true,
+        "has_packages": false,
+        "has_projects": true,
+        "has_pull_requests": true,
+        "has_releases": true,
+        "has_wiki": true,
+        "html_url": "https://git.dynamicdiscord.de/malobeo/infrastructure",
+        "id": 15,
+        "ignore_whitespace_conflicts": false,
+        "internal": false,
+        "internal_tracker": {
+          "allow_only_contributors_to_track_time": true,
+          "enable_issue_dependencies": true,
+          "enable_time_tracker": true
+        },
+        "language": "",
+        "languages_url": "https://git.dynamicdiscord.de/api/v1/repos/malobeo/infrastructure/languages",
+        "licenses": [],
+        "link": "",
+        "mirror": false,
+        "mirror_interval": "",
+        "mirror_updated": "0001-01-01T00:00:00Z",
+        "name": "infrastructure",
+        "object_format_name": "sha1",
+        "open_issues_count": 40,
+        "open_pr_counter": 4,
+        "original_url": "",
+        "owner": {
+          "active": false,
+          "avatar_url": "https://git.dynamicdiscord.de/avatars/9ea8af20ca015cb078b2971cd4e91e6d",
+          "created": "2023-03-29T17:26:16+02:00",
+          "description": "",
+          "email": "",
+          "followers_count": 0,
+          "following_count": 0,
+          "full_name": "",
+          "html_url": "https://git.dynamicdiscord.de/malobeo",
+          "id": 7,
+          "is_admin": false,
+          "language": "",
+          "last_login": "0001-01-01T00:00:00Z",
+          "location": "",
+          "login": "malobeo",
+          "login_name": "",
+          "prohibit_login": false,
+          "restricted": false,
+          "source_id": 0,
+          "starred_repos_count": 0,
+          "username": "malobeo",
+          "visibility": "public",
+          "website": ""
+        },
+        "permissions": {
+          "admin": false,
+          "pull": true,
+          "push": false
+        },
+        "private": false,
+        "projects_mode": "",
+        "release_counter": 0,
+        "size": 2878,
+        "ssh_url": "ssh://gitea@git.dynamicdiscord.de:23428/malobeo/infrastructure.git",
+        "stars_count": 1,
+        "template": false,
+        "topics": [],
+        "updated_at": "2026-03-12T01:11:13+01:00",
+        "url": "https://git.dynamicdiscord.de/api/v1/repos/malobeo/infrastructure",
+        "watchers_count": 2,
+        "website": ""
+      },
+      "permissions": {
+        "admin": false,
+        "pull": true,
+        "push": false
+      },
+      "private": false,
+      "projects_mode": "all",
+      "release_counter": 0,
+      "size": 14584,
+      "ssh_url": "ssh://gitea@git.dynamicdiscord.de:23428/ahtlon/infrastructure.git",
+      "stars_count": 0,
+      "template": false,
+      "topics": [],
+      "updated_at": "2026-03-13T16:33:51+01:00",
+      "url": "https://git.dynamicdiscord.de/api/v1/repos/ahtlon/infrastructure",
+      "watchers_count": 1,
+      "website": ""
+    },
+    "repo_id": 29,
+    "sha": "e73516fbe79022d12608e9616b75b3a388bd0e5f"
+  },
+  "body": "",
+  "closed_at": null,
+  "comments": 0,
+  "created_at": "2026-03-11T17:29:55+01:00",
+  "diff_url": "https://git.dynamicdiscord.de/ahtlon/infrastructure/pulls/8.diff",
+  "draft": false,
+  "due_date": null,
+  "head": {
+    "label": "nixpkgs_bump_20260305",
+    "ref": "nixpkgs_bump_20260305",
+    "repo": {
+      "allow_fast_forward_only_merge": false,
+      "allow_manual_merge": false,
+      "allow_merge_commits": true,
+      "allow_rebase": true,
+      "allow_rebase_explicit": true,
+      "allow_rebase_update": true,
+      "allow_squash_merge": true,
+      "archived": false,
+      "archived_at": "1970-01-01T01:00:00+01:00",
+      "autodetect_manual_merge": false,
+      "avatar_url": "",
+      "clone_url": "https://git.dynamicdiscord.de/malobeo/infrastructure.git",
+      "created_at": "2022-10-04T18:35:43+02:00",
+      "default_allow_maintainer_edit": false,
+      "default_branch": "master",
+      "default_delete_branch_after_merge": false,
+      "default_merge_style": "merge",
+      "description": "",
+      "empty": false,
+      "fork": false,
+      "forks_count": 1,
+      "full_name": "malobeo/infrastructure",
+      "has_actions": true,
+      "has_code": true,
+      "has_issues": true,
+      "has_packages": false,
+      "has_projects": true,
+      "has_pull_requests": true,
+      "has_releases": true,
+      "has_wiki": true,
+      "html_url": "https://git.dynamicdiscord.de/malobeo/infrastructure",
+      "id": 15,
+      "ignore_whitespace_conflicts": false,
+      "internal": false,
+      "internal_tracker": {
+        "allow_only_contributors_to_track_time": true,
+        "enable_issue_dependencies": true,
+        "enable_time_tracker": true
+      },
+      "language": "",
+      "languages_url": "https://git.dynamicdiscord.de/api/v1/repos/malobeo/infrastructure/languages",
+      "licenses": [],
+      "link": "",
+      "mirror": false,
+      "mirror_interval": "",
+      "mirror_updated": "0001-01-01T00:00:00Z",
+      "name": "infrastructure",
+      "object_format_name": "sha1",
+      "open_issues_count": 40,
+      "open_pr_counter": 4,
+      "original_url": "",
+      "owner": {
+        "active": false,
+        "avatar_url": "https://git.dynamicdiscord.de/avatars/9ea8af20ca015cb078b2971cd4e91e6d",
+        "created": "2023-03-29T17:26:16+02:00",
+        "description": "",
+        "email": "",
+        "followers_count": 0,
+        "following_count": 0,
+        "full_name": "",
+        "html_url": "https://git.dynamicdiscord.de/malobeo",
+        "id": 7,
+        "is_admin": false,
+        "language": "",
+        "last_login": "0001-01-01T00:00:00Z",
+        "location": "",
+        "login": "malobeo",
+        "login_name": "",
+        "prohibit_login": false,
+        "restricted": false,
+        "source_id": 0,
+        "starred_repos_count": 0,
+        "username": "malobeo",
+        "visibility": "public",
+        "website": ""
+      },
+      "permissions": {
+        "admin": false,
+        "pull": true,
+        "push": false
+      },
+      "private": false,
+      "projects_mode": "",
+      "release_counter": 0,
+      "size": 2878,
+      "ssh_url": "ssh://gitea@git.dynamicdiscord.de:23428/malobeo/infrastructure.git",
+      "stars_count": 1,
+      "template": false,
+      "topics": [],
+      "updated_at": "2026-03-12T01:11:13+01:00",
+      "url": "https://git.dynamicdiscord.de/api/v1/repos/malobeo/infrastructure",
+      "watchers_count": 2,
+      "website": ""
+    },
+    "repo_id": 15,
+    "sha": "7c66a24563d0e95c292aafeaa08056effc6152d9"
+  },
+  "html_url": "https://git.dynamicdiscord.de/ahtlon/infrastructure/pulls/8",
+  "id": 66,
+  "is_locked": false,
+  "labels": [],
+  "merge_base": "344eeb437b0aa29baee1227e48878f987e21e296",
+  "merge_commit_sha": null,
+  "mergeable": true,
+  "merged": false,
+  "merged_at": null,
+  "merged_by": null,
+  "milestone": null,
+  "number": 8,
+  "patch_url": "https://git.dynamicdiscord.de/ahtlon/infrastructure/pulls/8.patch",
+  "pin_order": 0,
+  "requested_reviewers": null,
+  "requested_reviewers_teams": null,
+  "state": "open",
+  "target_repo_url": "https://git.dynamicdiscord.de/ahtlon/infrastructure.git",
+  "title": "Update flake.lock",
+  "updated_at": "2026-03-11T17:29:55+01:00",
+  "url": "https://git.dynamicdiscord.de/ahtlon/infrastructure/pulls/8",
+  "user": {
+    "active": false,
+    "avatar_url": "https://git.dynamicdiscord.de/avatars/7399d018a0bcee0f2da113bdeeafec029316d8e8ce774b829de4125b026c0599",
+    "created": "2024-10-23T17:19:18+02:00",
+    "description": "",
+    "email": "ahtlon@noreply.git.dynamicdiscord.de",
+    "followers_count": 0,
+    "following_count": 0,
+    "full_name": "",
+    "html_url": "https://git.dynamicdiscord.de/ahtlon",
+    "id": 8,
+    "is_admin": false,
+    "language": "",
+    "last_login": "0001-01-01T00:00:00Z",
+    "location": "",
+    "login": "ahtlon",
+    "login_name": "",
+    "prohibit_login": false,
+    "restricted": false,
+    "source_id": 0,
+    "starred_repos_count": 0,
+    "username": "ahtlon",
+    "visibility": "public",
+    "website": ""
+  }
+}

machines/antamap/configuration.nix

@@ -1,52 +0,0 @@
-{ self, config, lib, pkgs, inputs, ... }:
-
-with lib;
-
-let
-  antamap-pkg = pkgs.stdenv.mkDerivation {
-    name = "antamap";
-    src = pkgs.fetchgit {
-      url = "https://0xacab.org/AND/antamap.git";
-      branchName = "master";
-      rev = "f62cc588df661e089d4ffb17adb78e667bda8f87";
-      sha256 = "sha256-vMAk2pphApkp1YkFBtX4cQDAyxDgMLnrhI4DTVgBYdE=";
-    };
-
-    installPhase = "mkdir -p $out; cp -R * $out/";
-  };
-in
-{
-  networking = {
-    hostName = mkDefault "antamap";
-    useDHCP = false;
-  };
-
-  imports = [
-    ../modules/malobeo_user.nix
-    ../modules/sshd.nix
-  ];
-
-  services.nginx = {
-    enable = true;
-    virtualHosts."_" = {
-      listen = [ 
-        { addr = "0.0.0.0"; port = 80; } 
-      ];
-      root = "${antamap-pkg}";
-      extraConfig = ''
-        proxy_buffering off;
-        proxy_cache off;
-        proxy_http_version 1.1; 
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-      '';
-    };
-  };
-
-  networking.firewall.allowedTCPPorts = [ 80 ];
-
-  system.stateVersion = "22.11"; # Did you read the comment?
-}
-

machines/fanny/configuration.nix

@@ -146,7 +146,6 @@ in
     "zineshop"
     "vaultwarden"
     "pretalx"
-    "antamap" 
   ];
 
   networking = {
@@ -166,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;
     };
   };
@@ -287,15 +286,6 @@ in
         '';
       };
     };
-
-    virtualHosts."antamap.malobeo.org" = {
-      locations."/" = {
-        proxyPass = "http://${hosts.malobeo.hosts.antamap.network.address}:80";
-        extraConfig = ''
-          proxy_set_header Host $host;
-        '';
-      };
-    };
   };
 
   services.tor = {

machines/fanny/dyndns.nix

@@ -2,15 +2,12 @@
 {
   sops.secrets.njalacloud = {};
   sops.secrets.njalazines = {};
-  sops.secrets.njalaantamap = {};
   systemd.services."dyndns" = {
     script = ''
       KEYCLOUD=$(cat /run/secrets/njalacloud)
       KEYZINES=$(cat /run/secrets/njalazines)
-      KEYANATAMAP=$(cat /run/secrets/njalaantamap)
       ${pkgs.curl}/bin/curl --fail --silent --show-error "https://njal.la/update/?h=cloud.malobeo.org&k="$KEYCLOUD"&auto"
       ${pkgs.curl}/bin/curl --fail --silent --show-error "https://njal.la/update/?h=zines.malobeo.org&k="$KEYZINES"&auto"
-      ${pkgs.curl}/bin/curl --fail --silent --show-error "https://njal.la/update/?h=antamap.malobeo.org&k="$KEYANATAMAP"&auto"
     '';
     serviceConfig = {
       Type = "oneshot";

machines/fanny/secrets.yaml

@@ -3,11 +3,11 @@ shop_cleartext: ENC[AES256_GCM,data:sifpX/R6JCcNKgwN2M4Dbflgnfs5CqB8ez5fULPohuFS
 shop_auth: ENC[AES256_GCM,data:0NDIRjmGwlSFls12sCb5OlgyGTCHpPQIjycEJGhYlZsWKhEYXV2u3g1RHMkF8Ny913jarjf0BgwSq5pBD9rgPL9t8X8=,iv:3jgCv/Gg93Mhdm4eYzwF9QrK14QL2bcC4wwSajCA88o=,tag:h8dhMK46hABv9gYW4johkA==,type:str]
 njalacloud: ENC[AES256_GCM,data:sp79Ij1vd9pQZuPUR1phmw==,iv:AWKZoOfBA/n16pWQCfA0dZmH1KajCztnLvYItoZZbgA=,tag:BIUrobBoO96pxUz1sjIYIw==,type:str]
 njalazines: ENC[AES256_GCM,data:fnObUEnXYvdj9HtkZNzXVA==,iv:0Zj2n2we9w4fj/n7e1ayd9XgFEMAGCHk4QLTu1IlRnQ=,tag:zeOLAB0oE6XbxqdqhdRNxw==,type:str]
-njalaantamap: ENC[AES256_GCM,data:nUc+E7HNbW0EDclzNDV6+w==,iv:H8nqeuOrvvu8O8QhGWkBkYWAQXwkBehf/jU6u/grs1A=,tag:mqX6jn47DyeSuk8xzG0e/Q==,type:str]
 njala_api_key: ENC[AES256_GCM,data:ohSVzQUvFjia/s9WceqnZCdLyk3N1Lm2BCBmXeBlkWD2dyrohKCnd9GiJ499IORpuYcOXyM=,iv:Uczk8op5mgqe8gefxgU9YuTqOsYvjzHCKvzA7GDsgio=,tag:XA7JRq/LsGkpHcQSO36Whg==,type:str]
 sops:
     age:
-        - enc: |
+        - recipient: age136sz3lzhxf74ryruvq34d4tmmxnezkqkgu6zqa3dm582c22fgejqagrqxk
+          enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2ZFBYMHMzTFRMLzhCbnBE
             MXkreklWSUVOckl5OTJ0VzlWS2tIOFBRRVVJCk90OXJoMHQza0hTSGt5VUphNjY1
@@ -15,8 +15,8 @@ sops:
             TStjbTBkMTNOcHBja0JRYUdvSWJUN00KtOPBH8xZy/GD9Ua3H6jisoluCR+UzaeE
             pAWM9Y6Gn6f7jv2BPKVTaWsyrafsYP7cDabQe2ancAuuKvkng/jrEw==
             -----END AGE ENCRYPTED FILE-----
-          recipient: age136sz3lzhxf74ryruvq34d4tmmxnezkqkgu6zqa3dm582c22fgejqagrqxk
+        - recipient: age1ljpdczmg5ctqyeezn739hv589fwhssjjnuqf7276fqun6kc62v3qmhkd0c
-        - enc: |
+          enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhc282T2VVamFGcG1Ub3hp
             S1VwKzVsWW1sRXczZnRNdkxDWE5Sd0hhVUJRCkovNGZ1ZlN0c1VyMXV0WThJMGFi
@@ -24,9 +24,8 @@ sops:
             QVZyNWVOMTh3ejBha21Qb2xCRkFERGMKH9nMQUoS5bGcLUx2T1dOmKd9jshttTrP
             SKFx7MXcjFRLKS2Ij12V8ftjL3Uod6be5zoMibkxK19KmXY/514Jww==
             -----END AGE ENCRYPTED FILE-----
-          recipient: age1ljpdczmg5ctqyeezn739hv589fwhssjjnuqf7276fqun6kc62v3qmhkd0c
+    lastmodified: "2026-02-20T19:25:05Z"
-    lastmodified: "2026-08-28T12:19:14Z"
+    mac: ENC[AES256_GCM,data:g+bFYqJN1X8F52tpIO60S2WKxLG27ZrP399fsfE6o7rPtIMimZou/4oUo7i+kpNtygEuCr3+suP8TPas4x5zMXhRjnjJuwJwL/NwdciHZU0O3rPJgucCEWqr9OdAtxezDM9c2vv+jzqZxWT9t0fIpB9RxO5oy1pHZs0RCgjAJR4=,iv:v6RdTMeQUxSdjIVNFbx2HtxCsdVgFTQTzMXS5Fj62is=,tag:pLoZMBRIXYElO5rY+xX9zg==,type:str]
-    mac: ENC[AES256_GCM,data:TnElCRaL/b238clfFVEq+Ot1lwg5MLMchCkmhi5PmADRn2exA42Zeq5v1M/IM5sHt4xEyFLn5R/88Y49DAfehRFwu6rddV+3lnFV40k2rWRtMfQOUXSrCd7lGxZdFbMU0eIXF5jaATFbcP0wO03FohNA69/u6kNsS0y0jK3vuLQ=,iv:xPeNXUIavVYFfAv1fs5TXCHXmvnXQDs4mJZMHOX7qG8=,tag:85hrBTKMh1ckTtXpOxj5lg==,type:str]
     pgp:
         - created_at: "2025-02-11T18:32:49Z"
           enc: |-
@@ -67,4 +66,4 @@ sops:
             -----END PGP MESSAGE-----
           fp: aef8d6c7e4761fc297cda833df13aebb1011b5d4
     unencrypted_suffix: _unencrypted
-    version: 3.13.1
+    version: 3.11.0

machines/hosts.nix

@@ -108,11 +108,6 @@ in
         type = "microvm";
         network = createMaloNet "18" "52:DA:0D:F9:EF:F4";
       };
-
-      antamap = {
-        type = "microvm";
-        network = createMaloNet "20" "52:DA:0D:F9:EF:F6";
-      };
     };
   };
 }

machines/louise/configuration.nix

@@ -46,8 +46,6 @@
     ];
   };
 
-  nixpkgs.config.permittedInsecurePackages = [ "electron-39.8.10" ];
-
   services.tor = {
     enable = true;
     client.enable = true;

machines/lucia/configuration.nix

@@ -64,29 +64,29 @@ in
   };
 
 
-  # mpd = {
+  mpd = {
-  #   enable = true;
+    enable = true;
-  #   musicDirectory = "/var/lib/mpd/music";
+    musicDirectory = "/var/lib/mpd/music";
-  #   settings = {
+    extraConfig = ''
-  #     audio_output = [{
+      audio_output {
-  #       type = "alsa";
+        type "alsa"
-  #       name = "My ALSA";
+        name "My ALSA"
-  #       device = "hw:0,0";	# optional 
+        device			"hw:0,0"	# optional 
-  #       format = "44100:16:2";	# optional
+        format			"44100:16:2"	# optional
-  #       mixer_type = "hardware";
+        mixer_type		"hardware"
-  #       mixer_device = "default";
+        mixer_device	"default"
-  #       mixer_control = "PCM";
+        mixer_control	"PCM"
-  #     }];
+      }
-  #   };
+    '';
   
-  #   # Optional:
+    # Optional:
-  #   network.listenAddress = "any"; # if you want to allow non-localhost connections
+    network.listenAddress = "any"; # if you want to allow non-localhost connections
-  #   startWhenNeeded = true; # systemd feature: only start MPD service upon connection to its socket
+    startWhenNeeded = true; # systemd feature: only start MPD service upon connection to its socket
-  # };
+  };
 
-  # ympd = {
+  ympd = {
-  #   enable = true;
+    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;
     };
   };

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} \

machines/modules/malobeo/initssh.nix

@@ -58,7 +58,7 @@ in
               networkctl down wg-initrd
             '';
             serviceConfig.Type = "oneshot";
-          };
+      };
         };
         network = {
           flushBeforeStage2 = true;

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
+      configFile = import ./promtail_config.nix { 
-      configPath = import ./promtail_config.nix { 
         lokiAddress = cfg.lokiHost;
         logNginx = cfg.logNginx;
         config = config;
         pkgs = pkgs;
       };
     };
-    users.groups.promtail = {};
+
-    users.users.promtail = {
+    users.users.promtail.extraGroups = [ "systemd-journal" ] ++ (lib.optionals cfg.logNginx [ "nginx" ]) ;
-      isNormalUser = true;
-      group = "promtail";
-      extraGroups = [ "systemd-journal" ] ++ (lib.optionals cfg.logNginx [ "nginx" ]) ;
-    };
 
   };
 }

machines/modules/malobeo/peers.nix

@@ -32,7 +32,7 @@
 
   "hetzner" = {
     role = "client";
-    address = "10.100.0.6";
+    address = "10.100.0.7";
     allowedIPs = [ "10.100.0.6/32" ];
     publicKey = "csRzgwtnzmSLeLkSwTwEOrdKq55UOxZacR5D3GopCTQ=";
   };

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=";
+        sha256 = "sha256-epjwIANb6vTNx9KqaG6jZc14YPoFMBTCj+/c9JHcWkA=";
-        url = "https://s3.g.megas4.com/ya5mczgkbk6bw7tcy2yr4bl2vdryfe76ok2dj/malo/deck33.tar.gz";
+        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";
     };

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;

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}"
     ];

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="

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) (

test

@@ -0,0 +1 @@
+1