From 81dacb770c43e1d00f980254d1582f65d7f96c34 Mon Sep 17 00:00:00 2001
From: Lillian-Violet <git@gladtherescake.eu>
Date: Sat, 25 Nov 2023 00:48:47 +0100
Subject: [PATCH] Should probably define all users here

---
 nixos/queen/configuration.nix | 9 +++++++++
 nixos/queen/mail-server.nix   | 9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix
index a8f2bb2..ff67ad2 100644
--- a/nixos/queen/configuration.nix
+++ b/nixos/queen/configuration.nix
@@ -154,6 +154,8 @@
 
   users.groups.mssql = {};
 
+  users.groups.virtualMail = {};
+
   users.users = {
     lillian = {
       openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"];
@@ -161,11 +163,18 @@
       extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"];
       shell = pkgs.zsh;
     };
+
     nextcloud.extraGroups = [config.users.groups.keys.name "aria2" "onlyoffice"];
     mssql = {
       isSystemUser = true;
       group = "mssql";
     };
+
+    virtualMail = {
+      isSystemUser = true;
+      isNormalUser = false;
+      group = "virtualMail";
+    };
   };
 
   virtualisation.oci-containers.containers = {
diff --git a/nixos/queen/mail-server.nix b/nixos/queen/mail-server.nix
index 413f5ae..f177896 100644
--- a/nixos/queen/mail-server.nix
+++ b/nixos/queen/mail-server.nix
@@ -16,15 +16,6 @@
     })
   ];
 
-  users.groups.virtualMail = {};
-
-  users.users = {
-    virtualMail = {
-      isSystemUser = true;
-      isNormalUser = false;
-      group = "virtualMail";
-    };
-  };
   mailserver = {
     enable = true;
     fqdn = "mail.gladtherescake.eu";