Merge branch 'main' into services

roles/minecraftserver.nix

@@ -27,10 +27,18 @@ in
       mcrcon
     ];
 
-    systemd.services.borgmatic = {
-      path = with pkgsUnstable; [
-        mcrcon
-      ];
+    systemd.services = {
+      alloy = {
+        serviceConfig.SupplementaryGroups = [
+          "docker"
+          "minecraft"
+        ];
+      };
+      borgmatic = {
+        path = with pkgsUnstable; [
+          mcrcon
+        ];
+      };
     };
 
     environment.etc."alloy/minecraft-server.alloy".text = ''
@@ -44,7 +52,7 @@ in
       	forward_to      = [prometheus.remote_write.default.receiver]
       	scrape_interval = "10s"
       }
-      
+
       local.file_match "minecraft_server_logs" {
         path_targets = [
           {
@@ -55,7 +63,7 @@ in
         ]
         sync_period = "10s"
       }
-      
+
       loki.source.file "minecraft_server_logs" {
         targets    = local.file_match.minecraft_server_logs.targets
         forward_to = [loki.write.default.receiver]