diff --git a/lib/configuration-type.nix b/lib/configuration-type.nix index 2fa9667..e2f708d 100644 --- a/lib/configuration-type.nix +++ b/lib/configuration-type.nix @@ -2,10 +2,10 @@ folderType = lib.types.submodule ({name, ...}: { options = { id = lib.mkOption { - type = lib.types.string; + type = lib.types.str; }; label = lib.mkOption { - type = lib.types.string; + type = lib.types.str; default = name; }; }; @@ -19,11 +19,11 @@ in { type = lib.types.attrsOf (lib.types.submodule ({name, ...}: { options = { name = lib.mkOption { - type = lib.types.string; + type = lib.types.str; default = name; }; id = lib.mkOption { - type = lib.types.string; + type = lib.types.str; }; folders = lib.mkOption { type = lib.types.attrsOf (lib.types.submodule ( @@ -33,7 +33,7 @@ in { type = folderType; }; path = lib.mkOption { - type = lib.types.string; + type = lib.types.str; }; type = lib.mkOption { type = lib.types.enum ["sendreceive" "sendonly" "receiveonly" "receiveencrypted"]; @@ -43,25 +43,25 @@ in { simple = { enable = lib.mkEnableOption "should this folder use simple versioning"; keep = lib.mkOption { - type = lib.types.string; + type = lib.types.str; default = "10"; }; }; trashcan = { enable = lib.mkEnableOption "should this folder use trashcan versioning"; cleanoutDays = lib.mkOption { - type = lib.types.string; + type = lib.types.str; default = "1000"; }; }; staggered = { enable = lib.mkEnableOption "should this folder use staggard versioning"; cleanInterval = lib.mkOption { - type = lib.types.string; + type = lib.types.str; default = "3600"; }; maxAge = lib.mkOption { - type = lib.types.string; + type = lib.types.str; default = "31536000"; }; }; diff --git a/lib/nixos-module.nix b/lib/nixos-module.nix index 68c413a..4db4fd6 100644 --- a/lib/nixos-module.nix +++ b/lib/nixos-module.nix @@ -7,7 +7,7 @@ services.syncthing = { configuration = (import ./configuration-type.nix) input; deviceName = lib.mkOption { - type = lib.types.string; + type = lib.types.str; }; }; };