mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 08:35:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

lib/options: remove redundant mkRaw apply functions

Browse source 
`strLua` now does this coercion internally.
This commit is contained in:
Matt Sturgeon 2024-09-29 15:13:49 +01:00
parent a9c08fb6a5
commit bd6aa476b8
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
1 changed files with 4 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

38
lib/options.nix
View file

@ -90,48 +90,18 @@ rec {
mkNullOrStr' = args: mkNullOrOption' (args // { type = with types; maybeRaw str; });
mkNullOrStr = description: mkNullOrStr' { inherit description; };
mkNullOrLua' =
args:
mkNullOrOption' (
args
// {
type = types.strLua;
apply = lib.nixvim.mkRaw;
}
);
mkNullOrLua' = args: mkNullOrOption' (args // { type = types.strLua; });
mkNullOrLua = description: mkNullOrLua' { inherit description; };
mkNullOrLuaFn' =
args:
mkNullOrOption' (
args
// {
type = types.strLuaFn;
apply = lib.nixvim.mkRaw;
}
);
mkNullOrLuaFn' = args: mkNullOrOption' (args // { type = types.strLuaFn; });
mkNullOrLuaFn = description: mkNullOrLua' { inherit description; };
mkNullOrStrLuaOr' =
{ type, ... }@args:
mkNullOrOption' (
args
// {
type = with types; either strLua type;
apply = v: if lib.isString v then lib.nixvim.mkRaw v else v;
}
);
{ type, ... }@args: mkNullOrOption' (args // { type = with types; either strLua type; });
mkNullOrStrLuaOr = type: description: mkNullOrStrLuaOr' { inherit type description; };
mkNullOrStrLuaFnOr' =
{ type, ... }@args:
mkNullOrOption' (
args
// {
type = with types; either strLuaFn type;
apply = v: if lib.isString v then lib.nixvim.mkRaw v else v;
}
);
{ type, ... }@args: mkNullOrOption' (args // { type = with types; either strLuaFn type; });
mkNullOrStrLuaFnOr = type: description: mkNullOrStrLuaFnOr' { inherit type description; };
defaultNullOpts =