yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

clan.deployment: unify deprecated option

Browse Source
This commit is contained in:
Johannes Kirschbauer
2025-07-02 18:17:03 +02:00
parent dfb53deeca
commit b1f71fe4fb
5 changed files with 17 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
nixosModules/clanCore/networking.nix
View File

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

8
nixosModules/clanCore/outputs.nix
View File

@@ -47,10 +47,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;
@@ -80,8 +80,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;
};
system.clan.deployment.file = pkgs.writeText "deployment.json" (
builtins.toJSON config.system.clan.deployment.data