diff --git a/modules/lua-loader.nix b/modules/lua-loader.nix index d1667d31..b9923b96 100644 --- a/modules/lua-loader.nix +++ b/modules/lua-loader.nix @@ -1,14 +1,14 @@ { lib, config, - helpers, ... }: let cfg = config.luaLoader; + inherit (lib.nixvim) mkNullOrOption mkIfNonNull' toLuaObject; in { - options.luaLoader.enable = helpers.mkNullOrOption lib.types.bool '' + options.luaLoader.enable = mkNullOrOption lib.types.bool '' Whether to enable/disable the experimental lua loader: If `true`: Enables the experimental Lua module loader: @@ -24,7 +24,7 @@ in If `null`: Nothing is configured. ''; - config = helpers.mkIfNonNull' cfg.enable { - extraConfigLuaPre = if cfg.enable then "vim.loader.enable()" else "vim.loader.disable()"; + config = mkIfNonNull' cfg.enable { + extraConfigLuaPre = "vim.loader.enable(${toLuaObject cfg.enable})"; }; } diff --git a/tests/test-sources/modules/lua-loader.nix b/tests/test-sources/modules/lua-loader.nix index 367e9ed0..18ccc803 100644 --- a/tests/test-sources/modules/lua-loader.nix +++ b/tests/test-sources/modules/lua-loader.nix @@ -27,7 +27,7 @@ assertions = [ { - assertion = lib.hasInfix "vim.loader.enable()" config.content; + assertion = lib.hasInfix "vim.loader.enable(true)" config.content; message = "luaLoader is expected to be explicitly enabled."; } { @@ -47,7 +47,7 @@ assertions = [ { - assertion = lib.hasInfix "vim.loader.disable()" config.content; + assertion = lib.hasInfix "vim.loader.enable(false)" config.content; message = "luaLoader is expected to be explicitly disabled."; } {