Skip to content

Fix freeform usages in some modules #440462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Lassulus merged 4 commits into from
Sep 15, 2025
Merged

Fix freeform usages in some modules #440462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a593032
nixos/modules: fw-fanctrl use correct type in freeformType
hsjobeki Sep 5, 2025
3e38f2b
nixos/modules: agnos use correct type in freeformType
hsjobeki Sep 5, 2025
69aa673
nixos/modules: openvpn3 use correct type in freeformType
hsjobeki Sep 5, 2025
30b6477
nixos/modules: meshcentral use correct type in freeformType
hsjobeki Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/modules/hardware/fw-fanctrl.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ in
Additional config entries for the fw-fanctrl service (documentation: <https://github.com/TamtamHero/fw-fanctrl/blob/main/doc/configuration.md>)
'';
type = lib.types.submodule {
freeformType = configFormat.type;
freeformType = lib.types.attrsOf configFormat.type;
options = {
defaultStrategy = lib.mkOption {
type = lib.types.str;
Expand Down
11 changes: 8 additions & 3 deletions nixos/modules/programs/openvpn3.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@ let
options
lists
;
inherit (lib.types) bool submodule ints;
inherit (lib.types)
bool
submodule
ints
attrsOf
;
in
{
options.programs.openvpn3 = {
Expand All @@ -33,7 +38,7 @@ in
description = "Options stored in {file}`/etc/openvpn3/netcfg.json` configuration file";
default = { };
type = submodule {
freeformType = json.type;
freeformType = attrsOf json.type;
options = {
systemd_resolved = mkOption {
type = bool;
Expand All @@ -57,7 +62,7 @@ in
description = "Options stored in {file}`/etc/openvpn3/log-service.json` configuration file";
default = { };
type = submodule {
freeformType = json.type;
freeformType = attrsOf json.type;
options = {
journald = mkOption {
description = "Use systemd-journald";
Expand Down
6 changes: 3 additions & 3 deletions nixos/modules/security/agnos.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let
inherit (lib) types mkOption;
in
types.submodule {
freeformType = format.type;
freeformType = types.attrsOf format.type;

options = {
email = mkOption {
Expand Down Expand Up @@ -53,7 +53,7 @@ let
inherit (lib) types literalExpression mkOption;
in
types.submodule {
freeformType = format.type;
freeformType = types.attrsOf format.type;

options = {
domains = mkOption {
Expand Down Expand Up @@ -91,7 +91,7 @@ in
settings = mkOption {
description = "Settings";
type = types.submodule {
freeformType = format.type;
freeformType = types.attrsOf format.type;

options = {
dns_listen_addr = mkOption {
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/services/admin/meshcentral.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ with lib;
- [Old homepage with documentation link](https://www.meshcommander.com/meshcentral2)
'';
type = types.submodule {
freeformType = configFormat.type;
freeformType = attrsOf configFormat.type;
};
example = {
settings = {
Expand Down
Loading