update flake lock - 2024-06-24T00:00+00:00

Flake lock file updates: • Updated input 'buildbot-nix': 'github:Mic92/buildbot-nix/c3b59dac3ee3b4c1dd9cabb2f850e2d8bcfaf417' (2024-06-16) → 'github:Mic92/buildbot-nix/619ed4e4360b93bfe91c523a957215dca09be63b' (2024-06-23) • Updated input 'clan-core': 'b3123b150f.tar.gz?narHash=sha256-iEpESD8Hywek3lkGgvTjG5C25UTaAAjnqX9R0lIvhSI%3D' (2024-06-20) → 'f4283982b3.tar.gz?narHash=sha256-hc%2BzvNzAq9wL30JN6QQh9kwyUcBINu9TzoZYAgu9FLc%3D' (2024-06-21) • Updated input 'nixos-mailserver': 'gitlab:simple-nixos-mailserver/nixos-mailserver/29916981e7b3b5782dc5085ad18490113f8ff63b' (2024-06-11) → 'gitlab:simple-nixos-mailserver/nixos-mailserver/290a995de5c3d3f08468fa548f0d55ab2efc7b6b' (2024-06-18) • Removed input 'nixos-mailserver/utils' • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/3e6b9369165397184774a4b7c5e8e5e46531b53f' (2024-06-14) → 'github:NixOS/nixpkgs/9693852a2070b398ee123a329e68f0dab5526681' (2024-06-22) • Updated input 'srvos': 'github:numtide/srvos/c607ffef7c234d88f37ed12d75b2c48de3f4b3fe' (2024-06-17) → 'github:numtide/srvos/557ff94aa1b48a723f8fa16eb9e7a2e6de991682' (2024-06-20)
2024-06-24 00:00:23 +00:00
11 changed files with 21 additions and 61 deletions
--- a/flake.lock
+++ b/flake.lock
@ -29,11 +29,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718502800,
-        "narHash": "sha256-Arnuj2v9HCrmV9ZU5fln/MoKhQfICO6o9ia8xQ386CY=",
+        "lastModified": 1719107511,
+        "narHash": "sha256-Qj/d/7N+/KV1Ay76tympOGSHHjn++qpHi2Qwc/8g4Ec=",
        "owner": "Mic92",
        "repo": "buildbot-nix",
-        "rev": "c3b59dac3ee3b4c1dd9cabb2f850e2d8bcfaf417",
+        "rev": "619ed4e4360b93bfe91c523a957215dca09be63b",
        "type": "github"
      },
      "original": {
@ -59,11 +59,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718900431,
-        "narHash": "sha256-iEpESD8Hywek3lkGgvTjG5C25UTaAAjnqX9R0lIvhSI=",
-        "rev": "b3123b150ff7a287d36efd1cce29bd4d1e7e4d86",
+        "lastModified": 1718982345,
+        "narHash": "sha256-hc+zvNzAq9wL30JN6QQh9kwyUcBINu9TzoZYAgu9FLc=",
+        "rev": "f4283982b3e4640c9e96a157c38377c525cbeb91",
        "type": "tarball",
-        "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/b3123b150ff7a287d36efd1cce29bd4d1e7e4d86.tar.gz"
+        "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/f4283982b3e4640c9e96a157c38377c525cbeb91.tar.gz"
      },
      "original": {
        "type": "tarball",
@ -214,17 +214,14 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "nixpkgs-24_05": "nixpkgs-24_05",
-        "utils": [
-          "flake-utils"
-        ]
+        "nixpkgs-24_05": "nixpkgs-24_05"
      },
      "locked": {
-        "lastModified": 1718084203,
-        "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=",
+        "lastModified": 1718697807,
+        "narHash": "sha256-Enla61WFisytTYbWygPynEbu8vozjeGc6Obkj2GRj7o=",
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
-        "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b",
+        "rev": "290a995de5c3d3f08468fa548f0d55ab2efc7b6b",
        "type": "gitlab"
      },
      "original": {
@ -235,11 +232,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1718396522,
-        "narHash": "sha256-C0re6ZtCqC1ndL7ib7vOqmgwvZDhOhJ1W0wQgX1tTIo=",
+        "lastModified": 1719082008,
+        "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "3e6b9369165397184774a4b7c5e8e5e46531b53f",
+        "rev": "9693852a2070b398ee123a329e68f0dab5526681",
        "type": "github"
      },
      "original": {
@ -308,11 +305,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718585173,
-        "narHash": "sha256-G5DB6D3p8ucyGfmWt3JmiWcVW55DeuUoiT230wQ9Am4=",
+        "lastModified": 1718844164,
+        "narHash": "sha256-QUXWv6llKIQ5To2N24d9dRI78Hqfm9iFyhvmvlOICNo=",
        "owner": "numtide",
        "repo": "srvos",
-        "rev": "c607ffef7c234d88f37ed12d75b2c48de3f4b3fe",
+        "rev": "557ff94aa1b48a723f8fa16eb9e7a2e6de991682",
        "type": "github"
      },
      "original": {
--- a/modules/web01/matrix-synapse.nix
+++ b/modules/web01/matrix-synapse.nix
@ -7,5 +7,4 @@
    admin = true;
  };
  clan.matrix-synapse.users.monitoring = { };
-  clan.matrix-synapse.users.clan-bot = { };
 }
--- a/pkgs/action-ensure-tea-login/script.sh
+++ b/pkgs/action-ensure-tea-login/script.sh
@ -8,5 +8,5 @@ fi
 GITEA_TOKEN="${GITEA_TOKEN:-"$(cat "$GITEA_TOKEN_FILE")"}"

 tea login add \
-  --token "$GITEA_TOKEN" \
-  --url "$GITEA_URL"
+  --token $GITEA_TOKEN \
+  --url $GITEA_URL
--- a/pkgs/action-flake-update-pr-clan/script.sh
+++ b/pkgs/action-flake-update-pr-clan/script.sh
@ -5,10 +5,8 @@ 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
-PR_TITLE="Automatic flake update - $(date --iso-8601=minutes)"
-export PR_TITLE 
-REMOTE_BRANCH="flake-update-$(date --iso-8601)"
-export REMOTE_BRANCH
+export PR_TITLE="Automatic flake update - $(date --iso-8601=minutes)"
+export REMOTE_BRANCH="flake-update-$(date --iso-8601)"
 export REPO_DIR=$TMPDIR/repo
 export GIT_AUTHOR_NAME="Clan Merge Bot"
 export GIT_AUTHOR_EMAIL="clan-bot@git.clan.lol"
--- a/sops/secrets/web01-matrix-password-clan-bot/machines/web01
+++ b/sops/secrets/web01-matrix-password-clan-bot/machines/web01
@ -1 +0,0 @@
-../../../machines/web01
--- a/sops/secrets/web01-matrix-password-clan-bot/secret
+++ b/sops/secrets/web01-matrix-password-clan-bot/secret
@ -1,24 +0,0 @@
-{
-	"data": "ENC[AES256_GCM,data:S8Y5p8O9KmheK4fRzoSF5/LqanJ0CxkuMEIqPFfhkFbCaXbjRw==,iv:xVlBzGfAqLDk01UI7oXnR7ukjnKMIn9/avxI/KkLWtg=,tag:sn4N8dXipo63YLT9I40s3g==,type:str]",
-	"sops": {
-		"kms": null,
-		"gcp_kms": null,
-		"azure_kv": null,
-		"hc_vault": null,
-		"age": [
-			{
-				"recipient": "age17xuvz0fqtynzdmf8rfh4g3e46tx8w3mc6zgytrmuj5v9dhnldgxs7ue7ct",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHRmxjY0FWTFBpc3BLK1JB\nMGhrVFJzTHVsNGlzR1FyS0JsSzQxMnpSRWtRCkU3bEhidFd0RTVZTzVXemJCTjhV\nSk4ydHJscUd6cExyK3ZmNnowMkR2OVkKLS0tIFBKZnFvaGx1cStNWU9leUk4Ymd3\nM0FFN1ZRYmZJUU8wQ1lKVlI5bzN1TVUKSTK4MflBBEq4a8RnBMEtKGzrKxjZi9wv\nguglBCGX6tvWVkzGmZWWIT9oSimb4pEPlJKH553WBf4aiF5n+kYwsA==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1zwte859d9nvg6wy5dugjkf38dqe8w8qkt2as7xcc5pw3285833xs797uan",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLMEpEL1dkM214NmRzdVpw\naUhxSms1ZlZOS0dhdTlVbmkvdFN3MCtFZ3lvCkRYeTFJUHErSFFyK2YvTHdwR3h6\nRVZqNVdkWUh0R09VRDNIVnRNa2FhdFkKLS0tIGxzb3BaQy9vMTZhdjVlVUQ0SEhP\nMHRTWHgxNE1HSVhXM091RVVJUjVmRHMKZD7U1cUvHzvB/rdXRPUAjakxwqrpthUB\nZkLNaY7ws5KNF8dwU72vElPPdz2CWDdIz563u3XV1ZioTkuepgdZyA==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2024-06-26T12:20:42Z",
-		"mac": "ENC[AES256_GCM,data:SdZInMlmS/fDQDpxuZUTjWwhjJqzPSJ7UN+fY5vsTdXJ+BRLKxZUpMlahXt85PZukfxE2XxjsnDV+tft80qxSv66HzwSnxsecfrxR9OMwGlG4SEdO0NJe2HFWwcSsXJUlGdkefVhUS5HL97Jr/NN69QTX1Ay/NoOoEdW6R6hb+w=,iv:uc9nlVAbScdxOtvERSiQ0SNfSJ6WK95B37MuL30FY2A=,tag:Swkkc/dQflO7MuTZXvm99w==,type:str]",
-		"pgp": null,
-		"unencrypted_suffix": "_unencrypted",
-		"version": "3.8.1"
-	}
-}
--- a/sops/secrets/web01-matrix-password-clan-bot/users/qubasa
+++ b/sops/secrets/web01-matrix-password-clan-bot/users/qubasa
@ -1 +0,0 @@
-../../../users/qubasa
--- a/targets/web01/decrypt.sh
+++ b/targets/web01/decrypt.sh
@ -1,8 +1,6 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i bash -p coreutils sops openssh

-# shellcheck disable=SC1008,SC1128
-
 set -euox pipefail

 HOST="clan.lol"
--- a/targets/web01/deploy.sh
+++ b/targets/web01/deploy.sh
@ -1,8 +1,6 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i bash -p nix jq bash rsync

-# shellcheck disable=SC1008,SC1128
-
 set -euo pipefail

 clan machines update web01
--- a/terraform/web01/install.sh
+++ b/terraform/web01/install.sh
@ -1,7 +1,5 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i bash -p coreutils sops openssh nix
-
-# shellcheck disable=SC1008,SC1128
 set -euox pipefail

 if [[ -z "${HOST:-}" ]]; then
--- a/terraform/web01/nixosify.sh
+++ b/terraform/web01/nixosify.sh
@ -1,7 +1,5 @@
 #!/bin/sh

-# shellcheck disable=SC1091
-
 set -eu

 installNix() {