From f34e64b66edda858504d89d6b319c001b25cd699 Mon Sep 17 00:00:00 2001 From: omri Date: Sat, 20 Apr 2024 11:14:24 +0300 Subject: [PATCH] nvim: add a shit ton of packages to mason --- .config/nvim/lazy-lock.json | 10 ++++----- .config/nvim/lua/plugins/formatter.lua | 2 +- .config/nvim/lua/plugins/lint.lua | 7 +++++- .config/nvim/lua/plugins/lsp.lua | 6 ----- .config/nvim/lua/plugins/mason.lua | 15 ++++++++++++- .config/nvim/lua/plugins/treesitter.lua | 30 +++++++++++++++++++++++++ 6 files changed, 56 insertions(+), 14 deletions(-) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index cee8401..3e0f5f3 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, - "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, + "bufferline.nvim": { "branch": "main", "commit": "f6f00d9ac1a51483ac78418f9e63126119a70709" }, "bufresize.nvim": { "branch": "master", "commit": "3b19527ab936d6910484dcc20fb59bdb12322d8b" }, "calendar-vim": { "branch": "master", "commit": "a7e73e02c92566bf427b2a1d6a61a8f23542cc21" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -34,15 +34,15 @@ "nvim-lspconfig": { "branch": "master", "commit": "ed8b8a15acc441aec669f97d75f2c1f2ac8c8aa5" }, "nvim-surround": { "branch": "main", "commit": "a4e30d33add8a9743b4f518b3a788b3c8e5def71" }, "nvim-tree.lua": { "branch": "master", "commit": "ddd1d6eb21c45433bdc65cc8015f2457998f2bf2" }, - "nvim-treesitter": { "branch": "master", "commit": "fea5808a58dc00b7131163886fe2648bbcae9dff" }, + "nvim-treesitter": { "branch": "master", "commit": "d8bf42b2621f5af274ccd4ac3f742caea04723b4" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" }, - "nvim-web-devicons": { "branch": "master", "commit": "b3468391470034353f0e5110c70babb5c62967d3" }, + "nvim-web-devicons": { "branch": "master", "commit": "31ba3c489e56a7f20881cee013cea1269b6b2f2d" }, "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, "refactoring.nvim": { "branch": "master", "commit": "d2786877c91aa409c824f27b4ce8a9f560dda60a" }, "telekasten.nvim": { "branch": "main", "commit": "24fd8c1e7eb989dba9efa5d174e42870f08da8fb" }, - "telescope.nvim": { "branch": "master", "commit": "d00d9df48c00d8682c14c2b5da78bda7ef06b939" }, + "telescope.nvim": { "branch": "master", "commit": "a4432dfb9b0b960c4cbc8765a42dc4fe2e029e8f" }, "term-edit.nvim": { "branch": "master", "commit": "e04f69d5828c6e6a4d81c34f75f18762fad50372" }, - "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" }, + "toggleterm.nvim": { "branch": "main", "commit": "dca1c80fb8ec41c97e7c3ef308719d8143fbbb05" }, "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" }, "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" }, "wal-colors.nvim": { "branch": "main", "commit": "f0f052ae2dd5054200b98ff308c864579c2983ea" }, diff --git a/.config/nvim/lua/plugins/formatter.lua b/.config/nvim/lua/plugins/formatter.lua index 80e3a94..43ae4a9 100644 --- a/.config/nvim/lua/plugins/formatter.lua +++ b/.config/nvim/lua/plugins/formatter.lua @@ -11,7 +11,7 @@ return { }, go = { require("formatter.filetypes.go").gofumpt, - require("formatter.filetypes.go").goimports, + require("formatter.filetypes.go").goimports_reviser, }, json = { require("formatter.filetypes.json").jq, diff --git a/.config/nvim/lua/plugins/lint.lua b/.config/nvim/lua/plugins/lint.lua index 15efa76..d5f505b 100644 --- a/.config/nvim/lua/plugins/lint.lua +++ b/.config/nvim/lua/plugins/lint.lua @@ -4,8 +4,13 @@ return { require("lint").linters_by_ft = { python = { "mypy" }, rust = { "ruff" }, + go = { "golangcilint" }, } - vim.cmd("au BufWrite lua require('lint').try_lint()") + vim.api.nvim_create_autocmd({ "BufWritePost" }, { + callback = function() + require("lint").try_lint() + end, + }) end, } diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index 11b8055..cef7868 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -4,13 +4,7 @@ return { config = function() local lsp = require("lspconfig") lsp.pyright.setup({}) - -- lsp.pylyzer.setup({}) lsp.gopls.setup({}) - -- lsp.volar.setup({}) - -- lsp.tsserver.setup({}) - lsp.volar.setup({ - filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue", "json" }, - }) lsp.rust_analyzer.setup({}) lsp.clangd.setup({}) lsp.lua_ls.setup({ diff --git a/.config/nvim/lua/plugins/mason.lua b/.config/nvim/lua/plugins/mason.lua index d7ace87..9af76dc 100644 --- a/.config/nvim/lua/plugins/mason.lua +++ b/.config/nvim/lua/plugins/mason.lua @@ -2,6 +2,19 @@ return { "williamboman/mason.nvim", build = ":MasonUpdate", config = function() - require("mason").setup() + require("mason").setup({ + opts = { + ensure_installed = { + -- go + "gopls", + "goimports_reviser", + "golangci-lint", + -- python + "black", + "mypy", + "pyright", + } + } + }) end, } diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua index 5721b75..37aa7a9 100644 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -11,6 +11,36 @@ return { used_by = { "gohtmltmpl", "gotexttmpl", "gotmpl", "yaml" }, } require("nvim-treesitter.configs").setup({ + ensure_installed = { + "bash", + "c", + "cpp", + "css", + "dockerfile", + "fish", + "go", + "gotmpl", + "html", + "javascript", + "json", + "lua", + "luadoc", + "luap", + "markdown", + "markdown_inline", + "python", + "query", + "regex", + "rust", + "svelte", + "terraform", + "toml", + "tsx", + "typescript", + "vim", + "vimdoc", + "yaml", + }, highlight = { enable = true, },