Move mergeNncpSettings setting
This commit is contained in:
parent
50cc0db69c
commit
ec567ffbfa
|
@ -15,7 +15,7 @@
|
||||||
autoNetSetup = false;
|
autoNetSetup = false;
|
||||||
};
|
};
|
||||||
hq.statistics.enable = true;
|
hq.statistics.enable = true;
|
||||||
mergeNncpSettings = false;
|
nncp.mergeSettings = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
system.stateVersion = "22.05";
|
system.stateVersion = "22.05";
|
||||||
|
|
|
@ -38,11 +38,6 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.c3d2 = {
|
options.c3d2 = {
|
||||||
mergeNncpSettings = lib.mkEnableOption ''
|
|
||||||
Whether to merge <literal>c3d2.nncp.<…>.nncp</literal>
|
|
||||||
into <literal>programs.nncp.settings</literal>.
|
|
||||||
'';
|
|
||||||
|
|
||||||
k-ot.enable = lib.mkEnableOption ''
|
k-ot.enable = lib.mkEnableOption ''
|
||||||
Add k-ot user to this machine. Anyone with an SSH key listed in
|
Add k-ot user to this machine. Anyone with an SSH key listed in
|
||||||
<literal>c3d2.users</literal> can log in as this user.
|
<literal>c3d2.users</literal> can log in as this user.
|
||||||
|
@ -65,7 +60,12 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
nncp.neigh = lib.mkOption {
|
nncp = {
|
||||||
|
mergeSettings = lib.mkEnableOption ''
|
||||||
|
Whether to merge <literal>c3d2.nncp.<…>.nncp</literal>
|
||||||
|
into <literal>programs.nncp.settings</literal>.
|
||||||
|
'';
|
||||||
|
neigh = lib.mkOption {
|
||||||
type = with lib.types; attrsOf neighMod;
|
type = with lib.types; attrsOf neighMod;
|
||||||
default = { };
|
default = { };
|
||||||
description = ''
|
description = ''
|
||||||
|
@ -73,6 +73,7 @@ in
|
||||||
User endpoints go in <literal>c3d2.users</literal>.
|
User endpoints go in <literal>c3d2.users</literal>.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
|
||||||
sshKeys = lib.mkOption {
|
sshKeys = lib.mkOption {
|
||||||
type = with lib.types; attrsOf (listOf str);
|
type = with lib.types; attrsOf (listOf str);
|
||||||
|
@ -81,7 +82,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
programs.nncp.settings = lib.optionalAttrs cfg.mergeNncpSettings cfg.nncp;
|
programs.nncp.settings = lib.optionalAttrs cfg.nncp.mergeSettings cfg.nncp;
|
||||||
|
|
||||||
users =
|
users =
|
||||||
let
|
let
|
||||||
|
|
Loading…
Reference in New Issue
Block a user