12 changed files with 177 additions and 146 deletions
--- a/LICENSE.md
+++ b/LICENSE.md
@ -1,18 +1,7 @@
 Copyright 2023 Clan contributers

-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/README.md
+++ b/README.md
@ -4,10 +4,8 @@ This repository contains nixos modules and terraform code that powers clan.lol.
 The website and git hosting is currently on [hetzner](https://www.hetzner.com/).

 ## Servers
-
 - web01:
-  - Instance type:
-    [ex101](https://www.hetzner.com/de/dedicated-rootserver/ex101)
+  - Instance type: [ex101](https://www.hetzner.com/de/dedicated-rootserver/ex101)
  - CPU: Intel Core i9-13900 (24 cores / 32 threads)
  - RAM: 64GB DDR5
  - Drives: 2 x 1.92 TB NVME
@ -28,7 +26,5 @@ $ ./tf.sh apply

 ## To add a new project to CI

-1. Add the 'buildbot-clan' topic to the repository using the "Manage topics"
-   button below the project description
-2. Go to https://buildbot.clan.lol/#/builders/2 and press "Update projects"
-   after you have logged in.
+1. Add the 'buildbot-clan' topic to the repository using the "Manage topics" button below the project description
+2. Go to https://buildbot.clan.lol/#/builders/2 and press "Update projects" after you have logged in.
--- a/flake.lock
+++ b/flake.lock
@ -29,11 +29,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1719712463,
-        "narHash": "sha256-O2f16m1wnJtl3OldhucFuZpcF/cQ/xwtF7YQqVIoq0c=",
+        "lastModified": 1718502800,
+        "narHash": "sha256-Arnuj2v9HCrmV9ZU5fln/MoKhQfICO6o9ia8xQ386CY=",
        "owner": "Mic92",
        "repo": "buildbot-nix",
-        "rev": "8d972a1a7675ab7429c6378b0203dc9408995e74",
+        "rev": "c3b59dac3ee3b4c1dd9cabb2f850e2d8bcfaf417",
        "type": "github"
      },
      "original": {
@ -59,11 +59,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1719728739,
-        "narHash": "sha256-Gf46MC7uCK1YKlGfiYH3coAyAacoRsLRpu7ijW939mI=",
-        "rev": "0f95bfd279b12865382f0ffd3459086090217fa1",
+        "lastModified": 1718900431,
+        "narHash": "sha256-iEpESD8Hywek3lkGgvTjG5C25UTaAAjnqX9R0lIvhSI=",
+        "rev": "b3123b150ff7a287d36efd1cce29bd4d1e7e4d86",
        "type": "tarball",
-        "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/0f95bfd279b12865382f0ffd3459086090217fa1.tar.gz"
+        "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/b3123b150ff7a287d36efd1cce29bd4d1e7e4d86.tar.gz"
      },
      "original": {
        "type": "tarball",
@ -78,11 +78,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718846788,
-        "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=",
+        "lastModified": 1717915259,
+        "narHash": "sha256-VsGPboaleIlPELHY5cNTrXK4jHVmgUra8uC6h7KVC5c=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e",
+        "rev": "1bbdb06f14e2621290b250e631cf3d8948e4d19b",
        "type": "github"
      },
      "original": {
@ -113,11 +113,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1719745305,
-        "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=",
+        "lastModified": 1717285511,
+        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9",
+        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
        "type": "github"
      },
      "original": {
@ -144,23 +144,35 @@
        "type": "github"
      }
    },
+    "nixlib": {
+      "locked": {
+        "lastModified": 1712450863,
+        "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
    "nixos-generators": {
      "inputs": {
-        "nixlib": [
-          "clan-core",
-          "nixpkgs"
-        ],
+        "nixlib": "nixlib",
        "nixpkgs": [
          "clan-core",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1718025593,
-        "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=",
+        "lastModified": 1716210724,
+        "narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3",
+        "rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94",
        "type": "github"
      },
      "original": {
@ -180,11 +192,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718845599,
-        "narHash": "sha256-HbQ0iKohKJC5grC95HNjLxGPdgsc/BJgoENDYNbzkLo=",
+        "lastModified": 1717770332,
+        "narHash": "sha256-NQmFHj0hTCUgnMAsaNTu6sNTRyo0rFQEe+/lVgV5yxU=",
        "owner": "nix-community",
        "repo": "nixos-images",
-        "rev": "c1e6a5f7b08f1c9993de1cfc5f15f838bf783b88",
+        "rev": "72771bd35f4e19e32d6f652528483b5e07fc317b",
        "type": "github"
      },
      "original": {
@ -202,14 +214,17 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "nixpkgs-24_05": []
+        "nixpkgs-24_05": "nixpkgs-24_05",
+        "utils": [
+          "flake-utils"
+        ]
      },
      "locked": {
-        "lastModified": 1718697807,
-        "narHash": "sha256-Enla61WFisytTYbWygPynEbu8vozjeGc6Obkj2GRj7o=",
+        "lastModified": 1718084203,
+        "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=",
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
-        "rev": "290a995de5c3d3f08468fa548f0d55ab2efc7b6b",
+        "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b",
        "type": "gitlab"
      },
      "original": {
@ -220,11 +235,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1719760900,
-        "narHash": "sha256-NkvFphHXKtQQ8F0XrqGlqkOhjHbE3671F8oLxwtTHhk=",
+        "lastModified": 1718396522,
+        "narHash": "sha256-C0re6ZtCqC1ndL7ib7vOqmgwvZDhOhJ1W0wQgX1tTIo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "12a9c0004bc987afb1ff511ebb97b67497a68e22",
+        "rev": "3e6b9369165397184774a4b7c5e8e5e46531b53f",
        "type": "github"
      },
      "original": {
@ -234,6 +249,21 @@
        "type": "github"
      }
    },
+    "nixpkgs-24_05": {
+      "locked": {
+        "lastModified": 1717144377,
+        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-24.05",
+        "type": "indirect"
+      }
+    },
    "root": {
      "inputs": {
        "buildbot-nix": "buildbot-nix",
@ -258,11 +288,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1719111739,
-        "narHash": "sha256-kr2QzRrplzlCP87ddayCZQS+dhGW98kw2zy7+jUXtF4=",
+        "lastModified": 1717902109,
+        "narHash": "sha256-OQTjaEZcByyVmHwJlKp/8SE9ikC4w+mFd3X0jJs6wiA=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "5e2e9421e9ed2b918be0a441c4535cfa45e04811",
+        "rev": "f0922ad001829b400f0160ba85b47d252fa3d925",
        "type": "github"
      },
      "original": {
@ -278,11 +308,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1719753014,
-        "narHash": "sha256-Lfv5qtltKuO5+HNqOKZPlEuEZo7WaLiZjAI+sTqpwws=",
+        "lastModified": 1718585173,
+        "narHash": "sha256-G5DB6D3p8ucyGfmWt3JmiWcVW55DeuUoiT230wQ9Am4=",
        "owner": "numtide",
        "repo": "srvos",
-        "rev": "22155bc76855f28a681b1d6987ea2420b899ad7e",
+        "rev": "c607ffef7c234d88f37ed12d75b2c48de3f4b3fe",
        "type": "github"
      },
      "original": {
@ -313,16 +343,15 @@
        ]
      },
      "locked": {
-        "lastModified": 1719836491,
-        "narHash": "sha256-0kZeCwwYe51lN/9X2eCcBaAxFHeHTN1ieyuq/4UG8xg=",
+        "lastModified": 1718522839,
+        "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "e78a4ce2041d5179f84b9a91001d9d35e72d3d21",
+        "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81",
        "type": "github"
      },
      "original": {
        "owner": "numtide",
-        "ref": "opentofu",
        "repo": "treefmt-nix",
        "type": "github"
      }
--- a/flake.nix
+++ b/flake.nix
@ -12,13 +12,13 @@
    flake-compat.url = "github:edolstra/flake-compat";
    flake-parts.url = "github:hercules-ci/flake-parts";
    flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
-    treefmt-nix.url = "github:numtide/treefmt-nix/opentofu";
+    treefmt-nix.url = "github:numtide/treefmt-nix";
    treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";

    nixos-mailserver = {
      url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs-24_05.follows = "";
+      inputs.utils.follows = "flake-utils";
      inputs.flake-compat.follows = "flake-compat";
    };

@ -58,29 +58,12 @@
            lib,
            self',
            system,
-            pkgs,
            ...
          }:
          {
            treefmt = {
-              package = pkgs.treefmt.overrideAttrs (_old: {
-                # https://github.com/numtide/treefmt/pull/325
-                patches = [ ./treefmt-config.patch ];
-              });
              projectRootFile = ".git/config";
-              programs.terraform.enable = true;
-              programs.shellcheck.enable = true;
-
-              programs.deno.enable = true;
-              settings.global.excludes = [
-                # generated files
-                "sops/*"
-                "terraform.tfstate"
-                "*.tfvars.sops.json"
-                "*nixos-vars.json"
-                "secrets.yaml"
-              ];
-
+              programs.hclfmt.enable = true;
              programs.nixfmt-rfc-style.enable = true;
              settings.formatter.nixfmt-rfc-style.excludes = [
                # generated files
--- a/modules/web01/matrix-synapse.nix
+++ b/modules/web01/matrix-synapse.nix
@ -8,23 +8,4 @@
  };
  clan.matrix-synapse.users.monitoring = { };
  clan.matrix-synapse.users.clan-bot = { };
-
-  # Rate limiting settings
-  # we need to up this to be able to support matrix bots
-  services.matrix-synapse.settings = {
-    rc_login = {
-      address = {
-        per_second = 20;
-        burst_count = 200;
-      };
-      account = {
-        per_second = 20;
-        burst_count = 200;
-      };
-      failed_attempts = {
-        per_second = 3;
-        burst_count = 15;
-      };
-    };
-  };
 }
--- a/pkgs/action-flake-update-pr-clan/script.sh
+++ b/pkgs/action-flake-update-pr-clan/script.sh
@ -5,10 +5,10 @@ set -euo pipefail
 export KEEP_VARS="GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GITEA_URL GITEA_USER PR_TITLE REMOTE_BRANCH REPO_DIR${KEEP_VARS:+ $KEEP_VARS}"

 # configure variables for actions
-today=$(date --iso-8601)
-today_minutes=$(date --iso-8601=minutes)
-export PR_TITLE="Automatic flake update - ${today_minutes}"
-export REMOTE_BRANCH="flake-update-${today}"
+PR_TITLE="Automatic flake update - $(date --iso-8601=minutes)"
+export PR_TITLE 
+REMOTE_BRANCH="flake-update-$(date --iso-8601)"
+export REMOTE_BRANCH
 export REPO_DIR=$TMPDIR/repo
 export GIT_AUTHOR_NAME="Clan Merge Bot"
 export GIT_AUTHOR_EMAIL="clan-bot@git.clan.lol"
--- a/targets/web01/decrypt.sh
+++ b/targets/web01/decrypt.sh
@ -1,6 +1,5 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i bash -p coreutils sops openssh
-# shellcheck shell=bash

 # shellcheck disable=SC1008,SC1128

--- a/targets/web01/deploy.sh
+++ b/targets/web01/deploy.sh
@ -1,6 +1,5 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i bash -p nix jq bash rsync
-# shellcheck shell=bash

 # shellcheck disable=SC1008,SC1128

--- a/terraform/web01/dns.tf
+++ b/terraform/web01/dns.tf
@ -4,31 +4,31 @@ resource "hetznerdns_zone" "server" {
 }

 resource "hetznerdns_record" "root_a" {
-  zone_id = hetznerdns_zone.server.id
-  name    = "@"
-  type    = "A"
-  value   = var.ipv4_address
+  zone_id  = hetznerdns_zone.server.id
+  name     = "@"
+  type     = "A"
+  value    = var.ipv4_address
 }

 resource "hetznerdns_record" "root_aaaa" {
-  zone_id = hetznerdns_zone.server.id
-  name    = "@"
-  type    = "AAAA"
-  value   = var.ipv6_address
+  zone_id  = hetznerdns_zone.server.id
+  name     = "@"
+  type     = "AAAA"
+  value    = var.ipv6_address
 }

 resource "hetznerdns_record" "wildcard_a" {
-  zone_id = hetznerdns_zone.server.id
-  name    = "*"
-  type    = "A"
-  value   = var.ipv4_address
+  zone_id  = hetznerdns_zone.server.id
+  name     = "*"
+  type     = "A"
+  value    = var.ipv4_address
 }

 resource "hetznerdns_record" "wildcard_aaaa" {
-  zone_id = hetznerdns_zone.server.id
-  name    = "*"
-  type    = "AAAA"
-  value   = var.ipv6_address
+  zone_id  = hetznerdns_zone.server.id
+  name     = "*"
+  type     = "AAAA"
+  value    = var.ipv6_address
 }

 # for sending emails
--- a/terraform/web01/install.sh
+++ b/terraform/web01/install.sh
@ -1,8 +1,8 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i bash -p coreutils sops openssh nix

-# shellcheck shell=bash
 # shellcheck disable=SC1008,SC1128
+set -euox pipefail

 if [[ -z "${HOST:-}" ]]; then
  echo "HOST is not set"
--- a/terraform/web01/nixosify.sh
+++ b/terraform/web01/nixosify.sh
@ -0,0 +1,78 @@
+#!/bin/sh
+
+# shellcheck disable=SC1091
+
+set -eu
+
+installNix() {
+  if ! command -v nix >/dev/null; then
+    echo "Installing Nix..."
+    trap 'rm -f /tmp/nix-install' EXIT
+    if command -v curl; then
+      curl -L https://nixos.org/nix/install >/tmp/nix-install
+    elif command -v wget; then
+      wget -O /tmp/nix-install https://nixos.org/nix/install
+    else
+      echo "Please install curl or wget"
+      exit 1
+    fi
+    sh /tmp/nix-install --daemon --yes
+  fi
+  set +u
+  . /etc/profile
+  set -u
+}
+
+patchOsRelease() {
+  cat >/etc/os-release <<EOF
+ID=nixos
+VARIANT_ID=installer
+EOF
+}
+
+installTools() {
+  env=$(
+    cat <<EOF
+with import <nixpkgs> {}; 
+buildEnv { 
+  name = "install-tools"; 
+  paths = [ 
+    nix 
+    nixos-install-tools 
+    parted 
+    mdadm 
+    xfsprogs 
+    dosfstools 
+    btrfs-progs 
+    e2fsprogs 
+    jq 
+    util-linux 
+  ];
+}
+EOF
+  )
+  tools=$(nix-build --no-out-link -E "$env")
+
+  # check if /usr/local/bin is in PATH
+  if ! echo "$PATH" | grep -q /usr/local/bin; then
+    echo "WARNING: /usr/local/bin is not in PATH" >&2
+  fi
+
+  mkdir -p /usr/local/bin
+  for i in "$tools/bin/"*; do
+    ln -sf "$i" /usr/local/bin
+  done
+}
+
+applyHetznerZfsQuirk() {
+  if test -f /etc/hetzner-build; then
+    # Hetzner has dummy binaries here for zfs,
+    # however those won't work and even crashed the system.
+    rm -f /usr/local/sbin/zfs /usr/local/sbin/zpool /usr/local/sbin/zdb
+  fi
+}
+
+installNix
+patchOsRelease
+installTools
+applyHetznerZfsQuirk
--- a/treefmt-config.patch
+++ b/treefmt-config.patch
@ -1,23 +0,0 @@
-From 43b15f8757a7f8de0340cc977ff9619741a5d43f Mon Sep 17 00:00:00 2001
-From: Brian McGee <brian@bmcgee.ie>
-Date: Mon, 1 Jul 2024 14:20:22 +0100
-Subject: [PATCH] fix: configure toml key for global excludes
-
-Signed-off-by: Brian McGee <brian@bmcgee.ie>
---
- config/config.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/config.go b/config/config.go
-index d9e281f..be5c991 100644
--- a/config/config.go
-+++ b/config/config.go
-@@ -10,7 +10,7 @@ import (
- type Config struct {
- 	Global struct {
- 		// Excludes is an optional list of glob patterns used to exclude certain files from all formatters.
-		Excludes []string
-+		Excludes []string `toml:"excludes"`
- 	}
- 	Formatters map[string]*Formatter `toml:"formatter"`
- }