From 070e821be46816bec0639e4f37983ca5ead713bd Mon Sep 17 00:00:00 2001
From: Taliyah Webb <taliyahmail@proton.me>
Date: Fri, 5 Dec 2025 09:24:21 +0100
Subject: [PATCH] nixos/radicale: allow changing the run user

---
 .../modules/services/networking/radicale.nix  | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix
index fd0a63212d49..98d5368a2be7 100644
--- a/nixos/modules/services/networking/radicale.nix
+++ b/nixos/modules/services/networking/radicale.nix
@@ -108,6 +108,18 @@ in
       default = [ ];
       description = "Extra arguments passed to the Radicale daemon.";
     };
+
+    user = mkOption {
+      type = types.str;
+      default = "radicale";
+      description = "User account under which Radicale runs.";
+    };
+
+    group = mkOption {
+      type = types.str;
+      default = "radicale";
+      description = "Group under which Radicale runs.";
+    };
   };
 
   config = mkIf cfg.enable {
@@ -155,12 +167,16 @@ in
 
     environment.systemPackages = [ pkg ];
 
-    users.users.radicale = {
-      isSystemUser = true;
-      group = "radicale";
+    users.users = mkIf (cfg.user == "radicale") {
+      radicale = {
+        group = cfg.group;
+        isSystemUser = true;
+      };
     };
 
-    users.groups.radicale = { };
+    users.groups = mkIf (cfg.group == "radicale") {
+      radicale = { };
+    };
 
     systemd.services.radicale = {
       description = "A Simple Calendar and Contact Server";
@@ -176,8 +192,8 @@ in
           ]
           ++ (map escapeShellArg cfg.extraArgs)
         );
-        User = "radicale";
-        Group = "radicale";
+        User = cfg.user;
+        Group = cfg.group;
         StateDirectory = "radicale/collections";
         StateDirectoryMode = "0750";
         # Hardening