From 41bf02fbea10bc21c7a3460b4f3f596046fa966c Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Tue, 3 Sep 2024 20:32:01 +0200
Subject: [PATCH] Improve assignments of groups

---
 lib/modules/users.nix       |  4 +---
 profiles/Generic/config.nix | 10 +++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/modules/users.nix b/lib/modules/users.nix
index 9db829589..1cea1341d 100644
--- a/lib/modules/users.nix
+++ b/lib/modules/users.nix
@@ -77,9 +77,7 @@
                     type = options.users.type;
                     default = (lib.attrsets.concatMapAttrs (
                       name: options: {
-                          ${capitalize name} = options // {
-                            groups = [];
-                          };
+                          ${capitalize name} = options;
                         }) config.users);
                   };
                 };
diff --git a/profiles/Generic/config.nix b/profiles/Generic/config.nix
index 51988f4f2..fcf2730cd 100644
--- a/profiles/Generic/config.nix
+++ b/profiles/Generic/config.nix
@@ -40,17 +40,17 @@
           manuel = {
             displayName = "Manuel Thalmann";
             mailAddress = "m@nuth.ch";
-
-            groups = [
-              "wheel"
-              "nix-users"
-            ];
           };
         };
 
         linux.users.manuel = {
             defaultShell = "fish";
 
+            groups = [
+              "wheel"
+              "nix-users"
+            ];
+
             rclone = {
               configurations = {
                 nextcloud = {