From 630d55758631ad081e282328bc3a5f3845b8cecb Mon Sep 17 00:00:00 2001 From: Baipyrus Date: Sat, 2 Nov 2024 14:07:06 +0100 Subject: [PATCH] clean up: remove default settings from plugin configs --- lua/plugins/catppuccin.lua | 2 -- lua/plugins/mason.lua | 28 ------------------- lua/plugins/treesitter.lua | 57 -------------------------------------- 3 files changed, 87 deletions(-) diff --git a/lua/plugins/catppuccin.lua b/lua/plugins/catppuccin.lua index ff10e09..31a0b82 100644 --- a/lua/plugins/catppuccin.lua +++ b/lua/plugins/catppuccin.lua @@ -2,8 +2,6 @@ return { -- add catppuccin { "catppuccin/nvim", - lazy = true, - name = "catppuccin", opts = { integrations = { cmp = true, diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua index ebd5b68..b2deafc 100644 --- a/lua/plugins/mason.lua +++ b/lua/plugins/mason.lua @@ -1,11 +1,6 @@ return { { - "williamboman/mason.nvim", - cmd = "Mason", - keys = { { "cm", "Mason", desc = "Mason" } }, - build = ":MasonUpdate", - opts_extend = { "ensure_installed" }, opts = { ensure_installed = { "eslint_d", @@ -15,28 +10,5 @@ return { "powershell-editor-services", }, }, - ---@param opts MasonSettings | {ensure_installed: string[]} - config = function(_, opts) - require("mason").setup(opts) - local mr = require("mason-registry") - mr:on("package:install:success", function() - vim.defer_fn(function() - -- trigger FileType event to possibly load this newly installed LSP server - require("lazy.core.handler.event").trigger({ - event = "FileType", - buf = vim.api.nvim_get_current_buf(), - }) - end, 100) - end) - - mr.refresh(function() - for _, tool in ipairs(opts.ensure_installed) do - local p = mr.get_package(tool) - if not p:is_installed() then - p:install() - end - end - end) - end, }, } diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index afa9ab0..bbfd296 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -1,20 +1,6 @@ return { { "nvim-treesitter/nvim-treesitter", - version = false, -- last release is way too old and doesn't work on Windows - build = ":TSUpdate", - event = { "LazyFile", "VeryLazy" }, - lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline - init = function(plugin) - -- PERF: add nvim-treesitter queries to the rtp and it's custom query predicates early - -- This is needed because a bunch of plugins no longer `require("nvim-treesitter")`, which - -- no longer trigger the **nvim-treesitter** module to be loaded in time. - -- Luckily, the only things that those plugins need are the custom queries, which we make available - -- during startup. - require("lazy.core.loader").add_to_rtp(plugin) - require("nvim-treesitter.query_predicates") - end, - cmd = { "TSUpdateSync", "TSUpdate", "TSInstall" }, keys = { { "", desc = "Increment Selection" }, { "", desc = "Decrement Selection", mode = "x" }, @@ -24,34 +10,7 @@ return { ---@diagnostic disable-next-line: missing-fields opts = { auto_install = true, - highlight = { enable = true }, - indent = { enable = true }, ensure_installed = { - "bash", - "c", - "diff", - "html", - "javascript", - "jsdoc", - "json", - "jsonc", - "lua", - "luadoc", - "luap", - "markdown", - "markdown_inline", - "printf", - "python", - "query", - "regex", - "toml", - "tsx", - "typescript", - "vim", - "vimdoc", - "xml", - "yaml", - -- other "svelte", "php", "rust", @@ -61,15 +20,6 @@ return { "gitcommit", "gitignore", }, - incremental_selection = { - enable = true, - keymaps = { - init_selection = "", - node_incremental = "", - scope_incremental = false, - node_decremental = "", - }, - }, textobjects = { select = { enable = true, @@ -115,12 +65,5 @@ return { }, }, }, - ---@param opts TSConfig - config = function(_, opts) - if type(opts.ensure_installed) == "table" then - opts.ensure_installed = LazyVim.dedup(opts.ensure_installed) - end - require("nvim-treesitter.configs").setup(opts) - end, }, }