diff --git a/init.lua b/init.lua index 5a0b604..8067ce4 100644 --- a/init.lua +++ b/init.lua @@ -38,7 +38,6 @@ vim.filetype.add({ extension = { service = "systemd", templ = "templ" } }) vim.opt.packpath:prepend(vim.fn.stdpath("data") .. "/site") vim.pack.add({ - github("neovim/nvim-lspconfig"), { src = github("mrcjkb/rustaceanvim"), version = vim.version.range("^9") }, github("nvim-lua/plenary.nvim"), github("Saecki/crates.nvim"), @@ -72,10 +71,13 @@ local ts_parsers = { "yaml", "just", } -nts.setup({ - install_dir = vim.fn.stdpath("data") .. "/site", -}) -nts.install(ts_parsers) +local installed_parsers = nts.get_installed("parsers") +local missing_parsers = vim.tbl_filter(function(parser) + return not vim.list_contains(installed_parsers, parser) +end, ts_parsers) +if #missing_parsers > 0 then + nts.install(missing_parsers) +end vim.api.nvim_create_autocmd("PackChanged", { callback = function(event) if @@ -119,13 +121,19 @@ require("snacks").setup({ require("mini.icons").setup() require("trouble").setup() -require("crates").setup({ - lsp = { - enabled = true, - actions = true, - completion = true, - hover = true, - }, +vim.api.nvim_create_autocmd({ "BufReadPost", "BufNewFile" }, { + pattern = "Cargo.toml", + once = true, + callback = function() + require("crates").setup({ + lsp = { + enabled = true, + actions = true, + completion = true, + hover = true, + }, + }) + end, }) require("nvim-lastplace").setup() require("which-key").setup() @@ -188,8 +196,6 @@ vim.api.nvim_create_autocmd("LspAttach", { end, }) -require("treesitter-context").setup() - vim.api.nvim_create_autocmd({ "FileType" }, { group = vim.api.nvim_create_augroup("edit_text", { clear = true }), pattern = { "gitcommit", "markdown", "txt" }, diff --git a/nvim-pack-lock.json b/nvim-pack-lock.json index 6ac7fde..32ab10c 100644 --- a/nvim-pack-lock.json +++ b/nvim-pack-lock.json @@ -28,10 +28,6 @@ "rev": "0bb6103c506315044872e0f84b1f736c4172bb20", "src": "https://github.com/ethanholz/nvim-lastplace" }, - "nvim-lspconfig": { - "rev": "b7b920947f21339ee41fbb38c79d6445e12900aa", - "src": "https://github.com/neovim/nvim-lspconfig" - }, "nvim-treesitter": { "rev": "61df84986b4b4ec469ee745a182e433d49f8c27e", "src": "https://github.com/nvim-treesitter/nvim-treesitter"