forked from Fediversity/Fediversity
put config
stuff in an attrset
This commit is contained in:
parent
26adce03fe
commit
742cafc426
1 changed files with 23 additions and 19 deletions
|
@ -45,8 +45,10 @@ in
|
||||||
description = "Any options from NixOS";
|
description = "Any options from NixOS";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
config.resource-type = types.raw; # TODO: what's the type of a NixOS configuration?
|
config = {
|
||||||
config.apply = requests: lib.mkMerge (requests ++ [ config.extra-config ]);
|
resource-type = types.raw; # TODO: what's the type of a NixOS configuration?
|
||||||
|
apply = requests: lib.mkMerge (requests ++ [ config.extra-config ]);
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
resources.login-shell = {
|
resources.login-shell = {
|
||||||
|
@ -82,8 +84,9 @@ in
|
||||||
default = false;
|
default = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
config.resource-type = types.raw; # TODO: splice out the user type from NixOS
|
config = {
|
||||||
config.apply =
|
resource-type = types.raw; # TODO: splice out the user type from NixOS
|
||||||
|
apply =
|
||||||
requests:
|
requests:
|
||||||
let
|
let
|
||||||
# Filter out requests that need wheel if policy doesn't allow it
|
# Filter out requests that need wheel if policy doesn't allow it
|
||||||
|
@ -102,6 +105,7 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
};
|
||||||
applications.hello =
|
applications.hello =
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue