diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2023-07-05 13:13:47 +0200 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2023-07-05 14:54:26 +0200 |
| commit | 19e33831c698da6b2e8a5d9a49b3f63b896fe219 (patch) | |
| tree | 5f00e6750e94a96f053fcf62bb64cef2a11f1eb3 | |
| parent | d73da5b868387eea41203a3daba7d9f6ab880b1b (diff) | |
| download | nixpkgs-19e33831c698da6b2e8a5d9a49b3f63b896fe219.tar nixpkgs-19e33831c698da6b2e8a5d9a49b3f63b896fe219.tar.gz nixpkgs-19e33831c698da6b2e8a5d9a49b3f63b896fe219.tar.bz2 nixpkgs-19e33831c698da6b2e8a5d9a49b3f63b896fe219.tar.lz nixpkgs-19e33831c698da6b2e8a5d9a49b3f63b896fe219.tar.xz nixpkgs-19e33831c698da6b2e8a5d9a49b3f63b896fe219.tar.zst nixpkgs-19e33831c698da6b2e8a5d9a49b3f63b896fe219.zip | |
nixos/config/nix: Move nix.check*
| -rw-r--r-- | nixos/modules/config/nix.nix | 16 | ||||
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/nixos/modules/config/nix.nix b/nixos/modules/config/nix.nix index af2d8678b6c..3161f130921 100644 --- a/nixos/modules/config/nix.nix +++ b/nixos/modules/config/nix.nix @@ -134,6 +134,22 @@ in options = { nix = { + checkConfig = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + If enabled, checks that Nix can parse the generated nix.conf. + ''; + }; + + checkAllErrors = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + If enabled, checks the nix.conf parsing for any kind of error. When disabled, checks only for unknown settings. + ''; + }; + settings = mkOption { type = types.submodule { freeformType = semanticConfType; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index c6adfec04fd..87b8d068912 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -300,22 +300,6 @@ in ''; }; - checkConfig = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - If enabled, checks that Nix can parse the generated nix.conf. - ''; - }; - - checkAllErrors = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - If enabled, checks the nix.conf parsing for any kind of error. When disabled, checks only for unknown settings. - ''; - }; - registry = mkOption { type = types.attrsOf (types.submodule ( let |