reverting 4c2bb0791d

docs/site/guides/getting-started/deploy.md

@@ -304,14 +304,14 @@ clan {
 ### Excluding from Automatic Updates
 
 To exclude machines from being updated when running `clan machines update` without any machines specified,
-one can set the `clan.core.deployment.requireExplicitUpdate` option to true:
+one can set the `clan.deployment.requireExplicitUpdate` option to true:
 
 ```{.nix hl_lines="5" .no-copy}
 clan {
     # ...
     machines = {
         "jon" = {
-            clan.core.deployment.requireExplicitUpdate = true;
+            clan.deployment.requireExplicitUpdate = true;
         };
     };
 };

nixosModules/clanCore/networking.nix

@@ -84,16 +84,31 @@
       use = lib.trace "Obsolete option `${lib.showOption from}' is used. It was renamed to `${lib.showOption to}'.";
       withPriority = false;
     })
-    (lib.mkRemovedOptionModule [
-      "clan"
-      "deployment"
-    ] "Use clan.core.deployment instead")
-    (lib.mkRemovedOptionModule [
-      "clan"
-      "core"
-      "networking"
-      "deploymentAddress"
-    ] "Use clan.core.network.targetHost instead")
+    (lib.mkRenamedOptionModule
+      [
+        "clan"
+        "deployment"
+      ]
+      [
+        "clan"
+        "core"
+        "deployment"
+      ]
+    )
+    (lib.mkRenamedOptionModule
+      [
+        "clan"
+        "core"
+        "networking"
+        "deploymentAddress"
+      ]
+      [
+        "clan"
+        "core"
+        "networking"
+        "targetHost"
+      ]
+    )
   ];
   config = lib.optionalAttrs (_class == "nixos") (
     lib.mkIf config.clan.core.enableRecommendedDefaults {

nixosModules/clanCore/outputs.nix

@@ -54,10 +54,10 @@
         deployment.nixosMobileWorkaround = lib.mkOption {
           type = lib.types.bool;
           description = ''
-            if true, the deployment will first do a nixos-rebuild switch
+            if true, the deployment will first do a nixos-rebuild switch 
             to register the boot profile the command will fail applying it to the running system
-            which is why afterwards we execute a nixos-rebuild test to apply
-            the new config without having to reboot.
+            which is why afterwards we execute a nixos-rebuild test to apply 
+            the new config without having to reboot. 
             This is a nixos-mobile deployment bug and will be removed in the future
           '';
           default = false;
@@ -87,8 +87,8 @@
       };
       sops.defaultGroups = config.clan.core.sops.defaultGroups;
       inherit (config.clan.core.networking) targetHost buildHost;
-      inherit (config.clan.core.deployment) requireExplicitUpdate;
       inherit (config.system.clan.deployment) nixosMobileWorkaround;
+      inherit (config.clan.deployment) requireExplicitUpdate;
     };
   };
 }

pkgs/clan-cli/clan_cli/machines/cli.py

@@ -34,7 +34,7 @@ Examples:
   $ clan machines update [MACHINES]
   Will update the specified machines [MACHINES], if [MACHINES] is omitted, the command
   will attempt to update every configured machine.
-  To exclude machines being updated `clan.core.deployment.requireExplicitUpdate = true;`
+  To exclude machines being updated `clan.deployment.requireExplicitUpdate = true;`
   can be set in the machine config.
 
   $ clan machines update --tags [TAGS..]