Sk7Str1p3/nixos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(users): change merge strategy to lib.recursiveUpdate

Browse source
This commit is contained in:
Sk7Str1p3 2026-05-24 16:47:58 +03:00
parent d3b48b8ef1
commit f57b5c4660
No known key found for this signature in database
GPG key ID: 4DD995933D06D43B
1 changed files with 85 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

52
users/default.nix
View file

@ -35,25 +35,26 @@
inputs, inputs,
... ...
}: }:
lib.foldl' (acc: obj: lib.recursiveUpdate acc obj) { } (
lib.lists.flatten [
# Import required modules
{ {
imports = [ imports = [
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
]; ];
}
# Configure users' passwords as sops secret. # Configure users' passwords as sops secret.
sops.secrets = lib.mkMerge ( (map (user: {
map (user: { sops.secrets."${user}/userPassword" = {
"${user}/userPassword" = {
sopsFile = ./${user}/password.yaml; sopsFile = ./${user}/password.yaml;
neededForUsers = true; neededForUsers = true;
}; };
}) cfg.usersList }) cfg.usersList)
);
# Configure users # Configure users
users.users = lib.mkMerge ( (map (user: {
map (user: { users.users.${user} =
${user} =
let let
cfg = builtins.fromJSON (builtins.readFile ./${user}/about.json); cfg = builtins.fromJSON (builtins.readFile ./${user}/about.json);
in in
@ -64,16 +65,16 @@
shell = pkgs."${cfg.shell}"; shell = pkgs."${cfg.shell}";
extraGroups = cfg.extraGroups or [ ]; extraGroups = cfg.extraGroups or [ ];
}; };
}) cfg.usersList }) cfg.usersList)
);
# Configurure home-manager # Configurure home-manager
{
home-manager = { home-manager = {
backupFileExtension = "backup-${toString inputs.self.lastModified}"; backupFileExtension = "backup-${toString inputs.self.lastModified}";
};
users = lib.mkMerge ( }
map (user: { (map (user: {
${user} = { home-manager.users.${user} = {
imports = [ imports = [
./${user}/modules ./${user}/modules
@ -89,14 +90,14 @@
}; };
home.stateVersion = config.system.stateVersion; home.stateVersion = config.system.stateVersion;
}; };
}) cfg.usersList }) cfg.usersList)
);
};
# Configure DM and users' default sessions # Configure DM and users' default sessions
{
services.displayManager.gdm.enable = true; services.displayManager.gdm.enable = true;
systemd.tmpfiles.settings."20-gdm-default-session" = lib.mkMerge ( }
map (user: { (map (user: {
systemd.tmpfiles.settings."20-gdm-default-session" = {
"/run/tmpfiles/var/lib/AccountsService/users/${user}".f = { "/run/tmpfiles/var/lib/AccountsService/users/${user}".f = {
argument = "${lib.generators.toINI { } { argument = "${lib.generators.toINI { } {
User = { User = {
@ -118,11 +119,9 @@
"/var/lib/AccountsService/users/${user}"."L+" = { "/var/lib/AccountsService/users/${user}"."L+" = {
argument = "/run/tmpfiles/var/lib/AccountsService/users/${user}"; argument = "/run/tmpfiles/var/lib/AccountsService/users/${user}";
}; };
}) cfg.usersList };
); }) cfg.usersList)
} (map (
// (lib.foldl (acc: elem: acc // elem) { } (
map (
user: user:
let let
__session = lib.splitString ":" (builtins.fromJSON (builtins.readFile ./${user}/about.json)) __session = lib.splitString ":" (builtins.fromJSON (builtins.readFile ./${user}/about.json))
@ -139,5 +138,6 @@
{ services.desktopManager.${session}.enable = true; } { services.desktopManager.${session}.enable = true; }
else else
{ } { }
) cfg.usersList ) cfg.usersList)
)) ]
)