mjallen/snowfall-lib
1
0
Fork 0
mirror of https://github.com/mjallen18/snowfall-lib.git synced 2026-04-18 09:05:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename snowfallorg.user to snowfallorg.users in system configs

Browse Source
This commit is contained in:
Jake Hamilton
2024-03-04 09:42:48 -08:00
parent 1fd6a70a82
commit 8d6612527a
3 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/darwin/user/default.nix
View File

@@ -6,14 +6,22 @@
inputs,
...
}: let
inherit (lib) types mkOption mkDefault foldl optionalAttrs;
inherit
(lib)
types
mkOption
mkDefault
mkRenamedOptionModule
foldl
optionalAttrs
;
cfg = config.snowfallorg;
user-names = builtins.attrNames cfg.user;
user-names = builtins.attrNames cfg.users;
create-system-users = system-users: name: let
user = cfg.user.${name};
user = cfg.users.${name};
in
system-users
// (optionalAttrs user.create {
@@ -23,8 +31,12 @@
};
});
in {
imports = [
(mkRenamedOptionModule ["snowfallorg" "user"] ["snowfallorg" "users"])
];
options.snowfallorg = {
user = mkOption {
users = mkOption {
description = "User configuration.";
default = {};
type = types.attrsOf (types.submodule ({name, ...}: {

21
modules/nixos/user/default.nix
View File

@@ -5,16 +5,25 @@ args @ {
config,
...
}: let
inherit (lib) types mkOption mkDefault foldl optionalAttrs optional;
inherit
(lib)
types
mkOption
mkDefault
mkRenamedOptionModule
foldl
optionalAttrs
optional
;
cfg = config.snowfallorg;
inputs = args.inputs or {};
user-names = builtins.attrNames cfg.user;
user-names = builtins.attrNames cfg.users;
create-system-users = system-users: name: let
user = cfg.user.${name};
user = cfg.users.${name};
in
system-users
// (optionalAttrs user.create {
@@ -30,8 +39,12 @@ args @ {
};
});
in {
imports = [
(mkRenamedOptionModule ["snowfallorg" "user"] ["snowfallorg" "users"])
];
options.snowfallorg = {
user = mkOption {
users = mkOption {
description = "User configuration.";
default = {};
type = types.attrsOf (types.submodule ({name, ...}: {