From 8da2e21c1d1c94188972715c4a19ac2a8b4df2a5 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Sat, 22 Mar 2025 18:34:50 -0400
Subject: [PATCH] move some more caddy stuff to minecraft.nix

---
 services/caddy.nix     | 5 -----
 services/minecraft.nix | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/services/caddy.nix b/services/caddy.nix
index 0863eeb..f3024c3 100644
--- a/services/caddy.nix
+++ b/services/caddy.nix
@@ -44,11 +44,6 @@
     8448
   ];
 
-  users.users.${config.services.caddy.user}.extraGroups = [
-    # for `map.gardling.com`
-    "minecraft"
-  ];
-
   users.users.${username}.extraGroups = [
     config.services.caddy.group
   ];
diff --git a/services/minecraft.nix b/services/minecraft.nix
index 702cbba..be362b4 100644
--- a/services/minecraft.nix
+++ b/services/minecraft.nix
@@ -3,6 +3,7 @@
   service_configs,
   lib,
   username,
+  config,
   ...
 }:
 let
@@ -107,6 +108,11 @@ in
     file_server browse
   '';
 
+  users.users.${config.services.caddy.user}.extraGroups = [
+    # for `map.gardling.com`
+    "minecraft"
+  ];
+
   systemd.tmpfiles.rules = [
     "d ${service_configs.minecraft.parent_dir}/${service_configs.minecraft.server_name} 0770 minecraft minecraft"
   ];