diff --git a/hosts/nncp/default.nix b/hosts/nncp/default.nix
index f455fda5..c6a594e3 100644
--- a/hosts/nncp/default.nix
+++ b/hosts/nncp/default.nix
@@ -15,7 +15,7 @@
autoNetSetup = false;
};
hq.statistics.enable = true;
- mergeNncpSettings = false;
+ nncp.mergeSettings = false;
};
system.stateVersion = "22.05";
diff --git a/modules/c3d2.nix b/modules/c3d2.nix
index 72b1d1ef..641c1dee 100644
--- a/modules/c3d2.nix
+++ b/modules/c3d2.nix
@@ -38,11 +38,6 @@ let
in
{
options.c3d2 = {
- mergeNncpSettings = lib.mkEnableOption ''
- Whether to merge c3d2.nncp.<…>.nncp
- into programs.nncp.settings.
- '';
-
k-ot.enable = lib.mkEnableOption ''
Add k-ot user to this machine. Anyone with an SSH key listed in
c3d2.users can log in as this user.
@@ -65,13 +60,19 @@ in
};
};
- nncp.neigh = lib.mkOption {
- type = with lib.types; attrsOf neighMod;
- default = { };
- description = ''
- Attrset of NNCP neighbours for relaying packets.
- User endpoints go in c3d2.users.
+ nncp = {
+ mergeSettings = lib.mkEnableOption ''
+ Whether to merge c3d2.nncp.<…>.nncp
+ into programs.nncp.settings.
'';
+ neigh = lib.mkOption {
+ type = with lib.types; attrsOf neighMod;
+ default = { };
+ description = ''
+ Attrset of NNCP neighbours for relaying packets.
+ User endpoints go in c3d2.users.
+ '';
+ };
};
sshKeys = lib.mkOption {
@@ -81,7 +82,7 @@ in
};
config = {
- programs.nncp.settings = lib.optionalAttrs cfg.mergeNncpSettings cfg.nncp;
+ programs.nncp.settings = lib.optionalAttrs cfg.nncp.mergeSettings cfg.nncp;
users =
let