Move mergeNncpSettings setting

hosts/nncp/default.nix

@@ -15,7 +15,7 @@
       autoNetSetup = false;
     };
     hq.statistics.enable = true;
-    mergeNncpSettings = false;
+    nncp.mergeSettings = false;
   };
 
   system.stateVersion = "22.05";

modules/c3d2.nix

@@ -38,11 +38,6 @@ let
 in
 {
   options.c3d2 = {
-    mergeNncpSettings = lib.mkEnableOption ''
-      Whether to merge <literal>c3d2.nncp.<…>.nncp</literal>
-      into <literal>programs.nncp.settings</literal>.
-    '';
-
     k-ot.enable = lib.mkEnableOption ''
       Add k-ot user to this machine. Anyone with an SSH key listed in
       <literal>c3d2.users</literal> 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 <literal>c3d2.users</literal>.
+    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;
+        default = { };
+        description = ''
+          Attrset of NNCP neighbours for relaying packets.
+          User endpoints go in <literal>c3d2.users</literal>.
+        '';
+      };
     };
 
     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