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

lib: remove helpers from internal usage

Browse source
This commit is contained in:
Matt Sturgeon 2024-09-29 14:41:41 +01:00
parent 2c4e4681db
commit cd76b4feb8
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
7 changed files with 38 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/options.nix
View file

@ -1,4 +1,4 @@
{ lib, helpers }:
{ lib }:
let
inherit (lib) types;
@ -96,7 +96,7 @@ rec {
args
// {
type = types.strLua;
apply = helpers.mkRaw;
apply = lib.nixvim.mkRaw;
}
);
mkNullOrLua = description: mkNullOrLua' { inherit description; };
@ -107,7 +107,7 @@ rec {
args
// {
type = types.strLuaFn;
apply = helpers.mkRaw;
apply = lib.nixvim.mkRaw;
}
);
mkNullOrLuaFn = description: mkNullOrLua' { inherit description; };
@ -118,7 +118,7 @@ rec {
args
// {
type = with types; either strLua type;
apply = v: if lib.isString v then helpers.mkRaw v else v;
apply = v: if lib.isString v then lib.nixvim.mkRaw v else v;
}
);
mkNullOrStrLuaOr = type: description: mkNullOrStrLuaOr' { inherit type description; };
@ -129,7 +129,7 @@ rec {
args
// {
type = with types; either strLuaFn type;
apply = v: if lib.isString v then helpers.mkRaw v else v;
apply = v: if lib.isString v then lib.nixvim.mkRaw v else v;
}
);
mkNullOrStrLuaFnOr = type: description: mkNullOrStrLuaFnOr' { inherit type description; };
@ -149,7 +149,7 @@ rec {
in
rec {
# TODO: removed 2024-06-14; remove stub 2024-09-01
mkDesc = abort "mkDesc has been removed. Use the `pluginDefault` argument or `helpers.pluginDefaultText`.";
mkDesc = abort "mkDesc has been removed. Use the `pluginDefault` argument or `lib.nixvim.pluginDefaultText`.";
mkNullable' = args: mkNullOrOption' (processDefaultNullArgs args);
mkNullable =
@ -277,7 +277,7 @@ rec {
if lib.isInt value then
value
else
helpers.mkRaw "vim.diagnostic.severity.${lib.strings.toUpper value}"
lib.nixvim.mkRaw "vim.diagnostic.severity.${lib.strings.toUpper value}"
);
}
);
@ -291,7 +291,7 @@ rec {
type = with types; either ints.unsigned logLevel;
apply = lib.mapNullable (
value:
if lib.isInt value then value else helpers.mkRaw "vim.log.levels.${lib.strings.toUpper value}"
if lib.isInt value then value else lib.nixvim.mkRaw "vim.log.levels.${lib.strings.toUpper value}"
);
}
);