From 3b45035e57a21c9fcd87c976030f9123d5476580 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Thu, 8 Aug 2024 17:16:51 +0200
Subject: [PATCH] Fix incorrect user conversion
---
lib/modules/users.nix | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/lib/modules/users.nix b/lib/modules/users.nix
index ec506781..aa4f24b3 100644
--- a/lib/modules/users.nix
+++ b/lib/modules/users.nix
@@ -96,10 +96,17 @@
if builtins.elem name (builtins.attrNames linuxOptions)
then {}
else {
- ${capitalize name} = options;
- }) cfg.users) // {
- groups = [];
- };
+ ${capitalize name} = (lib.attrsets.concatMapAttrs (
+ name: value:
+ if builtins.elem name (builtins.attrNames linuxOptions)
+ then {}
+ else {
+ ${name} = value;
+ }
+ ) options) // {
+ groups = [];
+ };
+ }) cfg.users);
};
};
};