nix fmt
This commit is contained in:
@@ -20,7 +20,8 @@ let
|
|||||||
accounts = usersData.ugaif.users or { };
|
accounts = usersData.ugaif.users or { };
|
||||||
|
|
||||||
# Helper: Resolve external module path from fetchGit/fetchTarball/path
|
# Helper: Resolve external module path from fetchGit/fetchTarball/path
|
||||||
resolveExternalPath = external:
|
resolveExternalPath =
|
||||||
|
external:
|
||||||
if external == null then
|
if external == null then
|
||||||
null
|
null
|
||||||
else if builtins.isAttrs external && external ? outPath then
|
else if builtins.isAttrs external && external ? outPath then
|
||||||
@@ -29,7 +30,8 @@ let
|
|||||||
external;
|
external;
|
||||||
|
|
||||||
# Helper: Check if path exists and is valid
|
# Helper: Check if path exists and is valid
|
||||||
isValidPath = path:
|
isValidPath =
|
||||||
|
path:
|
||||||
path != null
|
path != null
|
||||||
&& (builtins.isPath path || (builtins.isString path && lib.hasPrefix "/" path))
|
&& (builtins.isPath path || (builtins.isString path && lib.hasPrefix "/" path))
|
||||||
&& builtins.pathExists path;
|
&& builtins.pathExists path;
|
||||||
@@ -177,7 +179,6 @@ in
|
|||||||
// (externalUserOptions.${name} or { })
|
// (externalUserOptions.${name} or { })
|
||||||
) accounts;
|
) accounts;
|
||||||
|
|
||||||
|
|
||||||
# Generate NixOS users
|
# Generate NixOS users
|
||||||
users.users =
|
users.users =
|
||||||
let
|
let
|
||||||
@@ -236,7 +237,14 @@ in
|
|||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
evaluated = fullModule { inherit config lib pkgs osConfig; };
|
evaluated = fullModule {
|
||||||
|
inherit
|
||||||
|
config
|
||||||
|
lib
|
||||||
|
pkgs
|
||||||
|
osConfig
|
||||||
|
;
|
||||||
|
};
|
||||||
in
|
in
|
||||||
lib.filterAttrs (name: _: name != "ugaif") evaluated
|
lib.filterAttrs (name: _: name != "ugaif") evaluated
|
||||||
else
|
else
|
||||||
@@ -248,10 +256,7 @@ in
|
|||||||
];
|
];
|
||||||
|
|
||||||
# Build imports list
|
# Build imports list
|
||||||
allImports =
|
allImports = user.extraImports ++ commonImports ++ lib.optional hasExternalUser externalUserModule;
|
||||||
user.extraImports
|
|
||||||
++ commonImports
|
|
||||||
++ lib.optional hasExternalUser externalUserModule;
|
|
||||||
in
|
in
|
||||||
lib.mkMerge [
|
lib.mkMerge [
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user