From 9fc36b1b16bceb871fc0c115176ee61335ae5e34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 27 Dec 2022 00:06:49 +0100
Subject: [PATCH] Misc cleanups

---
 .sops.yaml |  6 ++++++
 flake.lock | 16 ++++++++--------
 flake.nix  |  4 ++++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.sops.yaml b/.sops.yaml
index 9b274175..74821297 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -184,6 +184,12 @@ creation_rules:
       age:
       - *hydra
       - *polygon-snowflake
+  - path_regex: hosts/jabber/[^/]+\.yaml$
+    key_groups:
+    - pgp: *admins
+      age:
+      - *jabber
+      - *polygon-snowflake
   - path_regex: hosts/kibana/[^/]+\.yaml$
     key_groups:
     - pgp: *admins
diff --git a/flake.lock b/flake.lock
index bc2c8193..3348ddc4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -565,11 +565,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1659890996,
-        "narHash": "sha256-xURgGoznCPmpX35dn5AXcyNYicVn5ruvUKxfIMMiu8o=",
+        "lastModified": 1672093526,
+        "narHash": "sha256-Kfk76cgPLsLqEDxhj6tSjXsE+LX/ak7zD6uhvTK0jUU=",
         "ref": "refs/heads/master",
-        "rev": "5ca106f648bef15d9954d956bda336eea28e8d75",
-        "revCount": 149,
+        "rev": "289f14e0f3a115950fff4c3ac87ba373f5950295",
+        "revCount": 151,
         "type": "git",
         "url": "ssh://gitea@gitea.c3d2.de/c3d2-admins/secrets.git"
       },
@@ -773,11 +773,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1671823052,
-        "narHash": "sha256-uyutoJLPEHbn3vL0Oo5FWPyy0jAFvE9B1kRka8UFJ/I=",
+        "lastModified": 1672094890,
+        "narHash": "sha256-8tkgoE9sdkWFBUv1DSb2JqHLGruEvRVuyIlTA1WawCA=",
         "ref": "refs/heads/master",
-        "rev": "b4a363e05db4783f70621cfd6bdabefc2cf03bdf",
-        "revCount": 1712,
+        "rev": "14bdeccb453b7faafe53f656cdf8d439308d34b8",
+        "revCount": 1713,
         "type": "git",
         "url": "https://gitea.c3d2.de/zentralwerk/network.git"
       },
diff --git a/flake.nix b/flake.nix
index 990717d3..d61a36b2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -224,6 +224,7 @@
             ) result (builtins.attrNames hosts6."${ctx}")
           ) {} (builtins.attrNames hosts6)
         );
+
       hostRegistry =
         builtins.foldl' (result: net:
           lib.recursiveUpdate result (extractZwHosts zentralwerk.lib.config.site.net."${net}")
@@ -273,6 +274,8 @@
           self.overlays
         ]) nixos.legacyPackages;
 
+      lib = { inherit hostRegistry; };
+
       packages = import ./packages.nix { inherit hostRegistry inputs lib microvm secrets self; };
 
       nixosConfigurations = {
@@ -298,6 +301,7 @@
             ./hosts/blogs
           ];
         };
+
         broker = nixosSystem' {
           modules = [
             self.nixosModules.microvm