diff --git a/init.lua b/init.lua index e43392c..61738c2 100644 --- a/init.lua +++ b/init.lua @@ -1,15 +1,11 @@ require("rocks-setup") -vim.g.rocks_nvim={ - experimental_features = { - "ext_module_dependency_stubs", - }, +vim.g.rocks_nvim.experimental_features = { + "ext_module_dependency_stubs", } if vim.fn.has('mac') == 1 then - vim.g.rocks_nvim = vim.tbl_deep_extend("force", vim.g.rocks_nvim, { - luarocks_config = { - arch = "macosx-aarch64" - } - }) + vim.g.rocks_nvim.luarocks_config = { + arch = "macosx-aarch64", + } end require("core.keymaps") require("core.abbrevs") diff --git a/lua/rocks-setup.lua b/lua/rocks-setup.lua index eafb602..86c1033 100644 --- a/lua/rocks-setup.lua +++ b/lua/rocks-setup.lua @@ -5,6 +5,9 @@ do -- Set up configuration options related to rocks.nvim (recommended to leave as default) local rocks_config = { rocks_path = vim.fs.normalize(install_location), + -- NOTE: don't know why but rocks.nvim in macos can't set the correct value to + -- `luarocks_binary` so set it manually. + luarocks_binary = "luarocks", } if vim.fn.has('mac') == 1 then rocks_config.luarocks_config = {