From 4d1c91f39ca6de3ae117d2af8d5ef7b5c9ce4c59 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 12 Sep 2024 14:20:53 +1000
Subject: [PATCH] modules/nixos: refactor users
---
modules/nixos/common/default.nix | 5 -----
modules/nixos/common/users.nix | 5 +++++
modules/nixos/community-builder/users.nix | 5 +----
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix
index b4218a0..ec83d2d 100644
--- a/modules/nixos/common/default.nix
+++ b/modules/nixos/common/default.nix
@@ -23,11 +23,6 @@
nix.settings.auto-optimise-store = true;
nix.optimise.automatic = false;
- # users in trusted group are trusted by the nix-daemon
- nix.settings.trusted-users = [ "@trusted" ];
-
- users.groups.trusted = { };
-
# Sometimes it fails if a store path is still in use.
# This should fix intermediate issues.
systemd.services.nix-gc.serviceConfig = {
diff --git a/modules/nixos/common/users.nix b/modules/nixos/common/users.nix
index 0add45c..29f321a 100644
--- a/modules/nixos/common/users.nix
+++ b/modules/nixos/common/users.nix
@@ -14,6 +14,11 @@ in
{
imports = userImports;
+ # users in trusted group are trusted by the nix-daemon
+ nix.settings.trusted-users = [ "@trusted" ];
+
+ users.groups.trusted = { };
+
# No mutable users
users.mutableUsers = false;
}
diff --git a/modules/nixos/community-builder/users.nix b/modules/nixos/community-builder/users.nix
index b9f3068..cfde12f 100644
--- a/modules/nixos/community-builder/users.nix
+++ b/modules/nixos/community-builder/users.nix
@@ -195,8 +195,5 @@ let
};
in
{
- users = {
- mutableUsers = false;
- users = lib.mapAttrs descToUser users;
- };
+ users.users = lib.mapAttrs descToUser users;
}