...

2 files changed, 6 insertions, 2 deletions

diff --git a/custom/tinc/def.nix b/custom/tinc/def.nix
index 97653f72..89020633 100644
--- a/custom/tinc/def.nix
+++ b/custom/tinc/def.nix
@@ -195,10 +195,12 @@ in
     users.extraUsers = flip mapAttrs' cfg.networks (network: _:
       nameValuePair ("tinc.${network}") ({
         description = "Tinc daemon user for ${network}";
+        group = "tinc.${network}";
         isSystemUser = true;
       })
     );
-
+    users.extraGroups = flip mapAttrs' cfg.networks (network: _:
+      nameValuePair ("tinc.${network}") ({})
+    );
   };
-
 }
diff --git a/custom/uucp.nix b/custom/uucp.nix
index 54f5aac4..e812c4cf 100644
--- a/custom/uucp.nix
+++ b/custom/uucp.nix
@@ -244,6 +244,7 @@ in {
 
     users.users."uucp" = {
       name = "uucp";
+      group = "uucp";
       isSystemUser = true;
       isNormalUser = false;
       createHome = true;
@@ -252,6 +253,7 @@ in {
       useDefaultShell = true;
       openssh.authorizedKeys.keys = map restrictKey (concatLists (mapAttrsToList (name: node: node.publicKeys) cfg.remoteNodes));
     } // cfg.sshUser;
+    users.groups."uucp" = {};
 
     system.activationScripts."uucp-sshconfig" = ''
       mkdir -p ${config.users.users."uucp".home}/.ssh