diff --git a/.config/nvim/lua/config/languages.lua b/.config/nvim/lua/config/languages.lua deleted file mode 100644 index 95debeaa..00000000 --- a/.config/nvim/lua/config/languages.lua +++ /dev/null @@ -1,13 +0,0 @@ -local M = {} - -M.ensure = { - treesitter = { - "bash", - "c", - "dockerfile", - "git_config", - "git_ignore", - } -} - -return M diff --git a/.config/nvim/lua/plugins/misc/telescope.lua b/.config/nvim/lua/plugins/misc/telescope.lua index f6daa886..d74ed810 100644 --- a/.config/nvim/lua/plugins/misc/telescope.lua +++ b/.config/nvim/lua/plugins/misc/telescope.lua @@ -23,10 +23,9 @@ M.opts = function() } end -M.config = function(plug, opts) - local name = require("lazy.core.loader").get_main(plug) - local m = require(name) - local actions = require(name .. ".actions") +M.config = function(_, opts) + local m = require("telescope") + local actions = require("telescope.actions") opts.mappings = require("config.keymaps").telescope(actions) m.setup(opts) m.load_extension("aerial") diff --git a/.config/nvim/lua/plugins/misc/treesitter.lua b/.config/nvim/lua/plugins/misc/treesitter.lua index fcb40a34..9e6ead3d 100644 --- a/.config/nvim/lua/plugins/misc/treesitter.lua +++ b/.config/nvim/lua/plugins/misc/treesitter.lua @@ -1,38 +1,39 @@ local M = { "nvim-treesitter/nvim-treesitter" } -M.event = { "BufReadPost", "BufNewFile", "BufNew" } - M.build = ":TSUpdate" -M.cmd = { - "TSBufDisable", - "TSBufEnable", - "TSBufToggle", - "TSDisable", - "TSEnable", - "TSToggle", - "TSInstall", - "TSInstallInfo", - "TSInstallSync", - "TSModuleInfo", - "TSUninstall", - "TSUpdate", - "TSUpdateSync", -} +M.event = { "BufReadPost", "BufNewFile", "BufNew" } + +-- M.cmd = { +-- "TSBufDisable", +-- "TSBufEnable", +-- "TSBufToggle", +-- "TSDisable", +-- "TSEnable", +-- "TSToggle", +-- "TSInstall", +-- "TSInstallInfo", +-- "TSInstallSync", +-- "TSModuleInfo", +-- "TSUninstall", +-- "TSUpdate", +-- "TSUpdateSync", +-- } M.init = function(plugin) require("lazy.core.loader").add_to_rtp(plugin) require("nvim-treesitter.query_predicates") + require("nvim-treesitter.install").setup_auto_install() end local maps = require("config.keymaps").treesitter M.opts = { - ensure_installed = { "lua", "yaml", "json", "bash" }, autotag = { enable = true }, highlight = { enable = true, }, - auto_install = true, + -- HACK: this doesn't work for some reason, so I manually call it in M.init + -- auto_install = true, autopairs = { enable = false, },