mirror of
https://github.com/nix-community/nixvim.git
synced 2025-06-21 00:25:42 +02:00
treewide (cleaning): helpers.toLuaObject -> lib.nixvim.toLuaObject
This commit is contained in:
parent
78e295fa41
commit
ec24d496d5
65 changed files with 104 additions and 104 deletions
|
@ -58,7 +58,7 @@
|
|||
(lib.optionalString (autoGroups != { }) ''
|
||||
-- Set up autogroups {{
|
||||
do
|
||||
local __nixvim_autogroups = ${helpers.toLuaObject autoGroups}
|
||||
local __nixvim_autogroups = ${lib.nixvim.toLuaObject autoGroups}
|
||||
|
||||
for group_name, options in pairs(__nixvim_autogroups) do
|
||||
vim.api.nvim_create_augroup(group_name, options)
|
||||
|
@ -69,7 +69,7 @@
|
|||
+ (lib.optionalString (autoCmd != [ ]) ''
|
||||
-- Set up autocommands {{
|
||||
do
|
||||
local __nixvim_autocommands = ${helpers.toLuaObject autoCmd}
|
||||
local __nixvim_autocommands = ${lib.nixvim.toLuaObject autoCmd}
|
||||
|
||||
for _, autocmd in ipairs(__nixvim_autocommands) do
|
||||
vim.api.nvim_create_autocmd(
|
||||
|
|
|
@ -73,7 +73,7 @@ in
|
|||
in
|
||||
lib.mkIf (config.userCommands != { }) {
|
||||
extraConfigLua = helpers.wrapDo ''
|
||||
local cmds = ${helpers.toLuaObject (lib.mapAttrs cleanupCommand config.userCommands)};
|
||||
local cmds = ${lib.nixvim.toLuaObject (lib.mapAttrs cleanupCommand config.userCommands)};
|
||||
for name,cmd in pairs(cmds) do
|
||||
vim.api.nvim_create_user_command(name, cmd.command, cmd.options or {})
|
||||
end
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
config = {
|
||||
extraConfigLuaPre = lib.mkIf (config.diagnostics != { }) ''
|
||||
vim.diagnostic.config(${helpers.toLuaObject config.diagnostics})
|
||||
vim.diagnostic.config(${lib.nixvim.toLuaObject config.diagnostics})
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
@ -58,6 +58,6 @@ in
|
|||
config.extraConfigLua =
|
||||
lib.mkIf (cfg != null && (builtins.any (v: v != null) (builtins.attrValues cfg)))
|
||||
''
|
||||
vim.filetype.add(${helpers.toLuaObject cfg})
|
||||
vim.filetype.add(${lib.nixvim.toLuaObject cfg})
|
||||
'';
|
||||
}
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
''
|
||||
-- Highlight groups {{
|
||||
do
|
||||
local highlights = ${helpers.toLuaObject config.highlight}
|
||||
local highlights = ${lib.nixvim.toLuaObject config.highlight}
|
||||
|
||||
for k,v in pairs(highlights) do
|
||||
vim.api.nvim_set_hl(0, k, v)
|
||||
|
@ -56,7 +56,7 @@
|
|||
''
|
||||
-- Highlight groups {{
|
||||
do
|
||||
local highlights = ${helpers.toLuaObject config.highlightOverride}
|
||||
local highlights = ${lib.nixvim.toLuaObject config.highlightOverride}
|
||||
|
||||
for k,v in pairs(highlights) do
|
||||
vim.api.nvim_set_hl(0, k, v)
|
||||
|
@ -72,7 +72,7 @@
|
|||
''
|
||||
-- Match groups {{
|
||||
do
|
||||
local match = ${helpers.toLuaObject config.match}
|
||||
local match = ${lib.nixvim.toLuaObject config.match}
|
||||
|
||||
for k,v in pairs(match) do
|
||||
vim.fn.matchadd(k, v)
|
||||
|
|
|
@ -81,7 +81,7 @@
|
|||
extraConfigLua = lib.mkIf (config.keymaps != [ ]) ''
|
||||
-- Set up keybinds {{{
|
||||
do
|
||||
local __nixvim_binds = ${helpers.toLuaObject (map helpers.keymaps.removeDeprecatedMapAttrs config.keymaps)}
|
||||
local __nixvim_binds = ${lib.nixvim.toLuaObject (map helpers.keymaps.removeDeprecatedMapAttrs config.keymaps)}
|
||||
for i, map in ipairs(__nixvim_binds) do
|
||||
vim.keymap.set(map.mode, map.key, map.action, map.options)
|
||||
end
|
||||
|
@ -99,7 +99,7 @@
|
|||
callback = helpers.mkRaw ''
|
||||
function()
|
||||
do
|
||||
local __nixvim_binds = ${helpers.toLuaObject (map helpers.keymaps.removeDeprecatedMapAttrs mappings)}
|
||||
local __nixvim_binds = ${lib.nixvim.toLuaObject (map helpers.keymaps.removeDeprecatedMapAttrs mappings)}
|
||||
for i, map in ipairs(__nixvim_binds) do
|
||||
vim.keymap.set(map.mode, map.key, map.action, map.options)
|
||||
end
|
||||
|
|
|
@ -67,7 +67,7 @@ in
|
|||
}:
|
||||
let
|
||||
varName = "nixvim_${luaVariableName}";
|
||||
optionDefinitions = helpers.toLuaObject config.${optionName};
|
||||
optionDefinitions = lib.nixvim.toLuaObject config.${optionName};
|
||||
in
|
||||
lib.optionalString (optionDefinitions != "{ }") ''
|
||||
-- Set up ${prettyName} {{{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue