From f89e199cfd8fa603ec8ea408a6b0115f0878b5b1 Mon Sep 17 00:00:00 2001 From: Baipyrus Date: Sat, 2 Nov 2024 03:02:45 +0100 Subject: [PATCH] configure preinstalled plugins as seen in kickstart-based config --- lua/plugins/lazygit.lua | 27 ++++++++ lua/plugins/mason.lua | 42 +++++++++++++ lua/plugins/telescope.lua | 39 ++++++++++++ lua/plugins/treesitter.lua | 126 +++++++++++++++++++++++++++++++++++++ 4 files changed, 234 insertions(+) create mode 100644 lua/plugins/lazygit.lua create mode 100644 lua/plugins/mason.lua create mode 100644 lua/plugins/telescope.lua create mode 100644 lua/plugins/treesitter.lua diff --git a/lua/plugins/lazygit.lua b/lua/plugins/lazygit.lua new file mode 100644 index 0000000..802f879 --- /dev/null +++ b/lua/plugins/lazygit.lua @@ -0,0 +1,27 @@ +return { + { + "jesseduffield/lazygit", + keys = { + { + "gf", + false, + }, + { + "gg", + false, + }, + { + "gG", + false, + }, + { + "gl", + false, + }, + { + "gL", + false, + }, + }, + }, +} diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua new file mode 100644 index 0000000..ebd5b68 --- /dev/null +++ b/lua/plugins/mason.lua @@ -0,0 +1,42 @@ +return { + { + + "williamboman/mason.nvim", + cmd = "Mason", + keys = { { "cm", "Mason", desc = "Mason" } }, + build = ":MasonUpdate", + opts_extend = { "ensure_installed" }, + opts = { + ensure_installed = { + "eslint_d", + "prettierd", + "markdownlint", + "isort", + "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/telescope.lua b/lua/plugins/telescope.lua new file mode 100644 index 0000000..97319bd --- /dev/null +++ b/lua/plugins/telescope.lua @@ -0,0 +1,39 @@ +return { + { + "nvim-telescope/telescope.nvim", + opts = { + defaults = { + mappings = { + i = { [""] = "to_fuzzy_refine" }, + }, + }, + extensions = { + ["ui-select"] = { + require("telescope.themes").get_dropdown(), + }, + }, + }, + keys = { + { + "gs", + false, + }, + { + "sf", + LazyVim.pick("files"), + }, + { + "", + false, + }, + { + "", + function() + require("telescope.builtin").buffers({ + sort_mru = true, + }) + end, + }, + }, + }, +} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua new file mode 100644 index 0000000..afa9ab0 --- /dev/null +++ b/lua/plugins/treesitter.lua @@ -0,0 +1,126 @@ +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" }, + }, + opts_extend = { "ensure_installed" }, + ---@type TSConfig + ---@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", + "c_sharp", + "go", + "powershell", + "gitcommit", + "gitignore", + }, + incremental_selection = { + enable = true, + keymaps = { + init_selection = "", + node_incremental = "", + scope_incremental = false, + node_decremental = "", + }, + }, + textobjects = { + select = { + enable = true, + lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim + keymaps = { + -- You can use the capture groups defined in textobjects.scm + ["aa"] = "@parameter.outer", + ["ia"] = "@parameter.inner", + ["af"] = "@function.outer", + ["if"] = "@function.inner", + ["ac"] = "@class.outer", + ["ic"] = "@class.inner", + }, + }, + move = { + enable = true, + set_jumps = true, -- whether to set jumps in the jumplist + goto_next_start = { + ["]m"] = "@function.outer", + ["]]"] = "@class.outer", + }, + goto_next_end = { + ["]M"] = "@function.outer", + ["]["] = "@class.outer", + }, + goto_previous_start = { + ["[m"] = "@function.outer", + ["[["] = "@class.outer", + }, + goto_previous_end = { + ["[M"] = "@function.outer", + ["[]"] = "@class.outer", + }, + }, + swap = { + enable = true, + swap_next = { + ["a"] = "@parameter.inner", + }, + swap_previous = { + ["A"] = "@parameter.inner", + }, + }, + }, + }, + ---@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, + }, +}