From 5e68077ac26da0e3cda7d1b90764695a7ca7208c Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Sat, 8 Jul 2023 02:56:44 +0300 Subject: [PATCH] chore(nvim): Tweaks to the packages and configs --- config/astronvim/lua/user/.luacheckrc | 18 +++++++++ config/astronvim/lua/user/.neoconf.json | 20 ++++++++++ config/astronvim/lua/user/mappings.lua | 1 + config/astronvim/lua/user/options.lua | 2 + .../astronvim/lua/user/plugins/community.lua | 11 ++++- config/astronvim/lua/user/plugins/mason.lua | 40 ++++++++++++------- config/astronvim/lua/user/plugins/null-ls.lua | 7 ---- .../astronvim/lua/user/plugins/treesitter.lua | 8 ++-- 8 files changed, 80 insertions(+), 27 deletions(-) create mode 100644 config/astronvim/lua/user/.luacheckrc create mode 100644 config/astronvim/lua/user/.neoconf.json diff --git a/config/astronvim/lua/user/.luacheckrc b/config/astronvim/lua/user/.luacheckrc new file mode 100644 index 0000000..d1113eb --- /dev/null +++ b/config/astronvim/lua/user/.luacheckrc @@ -0,0 +1,18 @@ +-- Global objects +globals = { + "astronvim", + "astronvim_installation", + "vim", + "bit", +} + +-- Rerun tests only if their modification time changed +cache = true + +-- Don't report unused self arguments of methods +self = false + +ignore = { + "631", -- max_line_length + "212/_.*", -- unused argument, for vars with "_" prefix +} diff --git a/config/astronvim/lua/user/.neoconf.json b/config/astronvim/lua/user/.neoconf.json new file mode 100644 index 0000000..2d7a81f --- /dev/null +++ b/config/astronvim/lua/user/.neoconf.json @@ -0,0 +1,20 @@ +{ + "neodev": { + "library": { + "enabled": true, + "plugins": true + } + }, + "neoconf": { + "plugins": { + "lua_ls": { + "enabled": true + } + } + }, + "lspconfig": { + "lua_ls": { + "Lua.format.enable": false + } + } +} diff --git a/config/astronvim/lua/user/mappings.lua b/config/astronvim/lua/user/mappings.lua index 34801a0..bc71d11 100644 --- a/config/astronvim/lua/user/mappings.lua +++ b/config/astronvim/lua/user/mappings.lua @@ -22,6 +22,7 @@ return { ["b"] = { name = "Buffers" }, -- quick save -- [""] = { ":w!", desc = "Save File" }, -- change description but the same command + ["P"] = { ":Telescope projects", desc = "Update Projects listing" }, }, t = { -- setting a mapping to false will disable it diff --git a/config/astronvim/lua/user/options.lua b/config/astronvim/lua/user/options.lua index 5881c80..e67b2c3 100644 --- a/config/astronvim/lua/user/options.lua +++ b/config/astronvim/lua/user/options.lua @@ -25,6 +25,8 @@ return { icons_enabled = true, -- disable notifications when toggling UI elements ui_notifications_enabled = true, + -- enable experimental resession.nvim session management (will be default in AstroNvim v4) + resession_enabled = false, }, } -- If you need more control, you can use the function()...end notation diff --git a/config/astronvim/lua/user/plugins/community.lua b/config/astronvim/lua/user/plugins/community.lua index 8c07668..c641349 100644 --- a/config/astronvim/lua/user/plugins/community.lua +++ b/config/astronvim/lua/user/plugins/community.lua @@ -30,7 +30,7 @@ return { "folke/trouble.nvim", opts = { auto_open = true, - position = "right" + position = "bottom" } }, { import = "astrocommunity.editing-support.refactoring-nvim" }, @@ -40,8 +40,15 @@ return { { import = "astrocommunity.indent.mini-indentscope" }, { import = "astrocommunity.markdown-and-latex.glow-nvim" }, { import = "astrocommunity.motion.harpoon" }, + { import = "astrocommunity.pack.ansible" }, + { import = "astrocommunity.pack.bash" }, + { import = "astrocommunity.pack.docker" }, + { import = "astrocommunity.pack.go" }, + { import = "astrocommunity.pack.html-css" }, + { import = "astrocommunity.pack.markdown" }, { import = "astrocommunity.pack.php" }, - { import = "astrocommunity.project.neoconf-nvim" }, + { import = "astrocommunity.pack.typescript" }, + { import = "astrocommunity.pack.vue" }, { import = "astrocommunity.project.nvim-spectre" }, { import = "astrocommunity.project.project-nvim" }, { import = "astrocommunity.test.neotest" }, diff --git a/config/astronvim/lua/user/plugins/mason.lua b/config/astronvim/lua/user/plugins/mason.lua index a789321..14661e5 100644 --- a/config/astronvim/lua/user/plugins/mason.lua +++ b/config/astronvim/lua/user/plugins/mason.lua @@ -4,29 +4,41 @@ return { { "williamboman/mason-lspconfig.nvim", -- overrides `require("mason-lspconfig").setup(...)` - opts = { - ensure_installed = { - "diagnosticls", - }, - }, + opts = function(_, opts) + -- add more things to the ensure_installed table protecting against community packs modifying it + opts.ensure_installed = require("astronvim.utils").list_insert_unique(opts.ensure_installed, { + -- "lua_ls", + }) + end, }, -- use mason-null-ls to configure Formatters/Linter -- installation for null-ls sources { "jay-babu/mason-null-ls.nvim", -- overrides `require("mason-null-ls").setup(...)` - opts = { - automatic_setup = true, - automatic_installation = true, - }, + opts = function(_, opts) + -- add more things to the ensure_installed table protecting against community packs modifying it + opts.ensure_installed = require("astronvim.utils").list_insert_unique(opts.ensure_installed, { + -- "prettier", + -- "stylua", + }) + opts.automatic_setup = true + opts.automatic_installation = true + end, }, { "jay-babu/mason-nvim-dap.nvim", -- overrides `require("mason-nvim-dap").setup(...)` - opts = { - automatic_installation = true, - automatic_setup = true, - ensure_installed = { "python", "php", "js", "bash" }, - }, + opts = function(_, opts) + -- add more things to the ensure_installed table protecting against community packs modifying it + opts.ensure_installed = require("astronvim.utils").list_insert_unique(opts.ensure_installed, { + "python", + "php", + "js", + "bash" + }) + opts.automatic_installation = true + opts.automatic_setup = true + end, }, } diff --git a/config/astronvim/lua/user/plugins/null-ls.lua b/config/astronvim/lua/user/plugins/null-ls.lua index 26770f2..8dd8316 100644 --- a/config/astronvim/lua/user/plugins/null-ls.lua +++ b/config/astronvim/lua/user/plugins/null-ls.lua @@ -30,14 +30,8 @@ return { null_ls.builtins.diagnostics.tfsec, null_ls.builtins.diagnostics.trail_space, null_ls.builtins.diagnostics.tsc, - null_ls.builtins.diagnostics.vacuum, - null_ls.builtins.diagnostics.vint, - null_ls.builtins.diagnostics.vulture, - null_ls.builtins.diagnostics.yamllint, null_ls.builtins.diagnostics.zsh, - null_ls.builtins.formatting.blade_formatter, null_ls.builtins.formatting.clang_format, - null_ls.builtins.formatting.eslint, null_ls.builtins.formatting.fixjson, null_ls.builtins.formatting.isort, null_ls.builtins.formatting.jq, @@ -45,7 +39,6 @@ return { null_ls.builtins.formatting.shfmt.with { args = { "-i", "1", "-bn", "-ci", "-sr", "-kb", "-fn" }, }, - null_ls.builtins.formatting.stylelint, } return config -- return final config table end, diff --git a/config/astronvim/lua/user/plugins/treesitter.lua b/config/astronvim/lua/user/plugins/treesitter.lua index a7b3917..4049561 100644 --- a/config/astronvim/lua/user/plugins/treesitter.lua +++ b/config/astronvim/lua/user/plugins/treesitter.lua @@ -1,7 +1,7 @@ return { "nvim-treesitter/nvim-treesitter", - opts = { - ensure_installed = { + opts = function(_, opts) + opts.ensure_installed = require("astronvim.utils").list_insert_unique(opts.ensure_installed, { "bash", "c", "cmake", @@ -28,6 +28,6 @@ return { "vim", "vue", "yaml", - }, - }, + }) + end, }