[neovim] Update confs from upstream

.config/nvim/lua/user/autopairs.lua

@@ -6,7 +6,21 @@ end
 
 npairs.setup({
 	check_ts = true, -- treesitter integration
-	disable_filetype = { "TelescopePrompt" },
+	disable_filetype = { "TelescopePrompt", "neo-tree" },
+	ts_config = {
+		lua = { "string", "source" },
+	},
+	fast_wrap = {
+		map = "<M-e>",
+		chars = { "{", "[", "(", '"', "'" },
+		pattern = string.gsub([[ [%'%"%)%>%]%)%}%,] ]], "%s+", ""),
+		offset = 0, -- Offset from pattern match
+		end_key = "$",
+		keys = "qwertyuiopzxcvbnmasdfghjkl",
+		check_comma = true,
+		highlight = "PmenuSel",
+		highlight_grey = "LineNr",
+	},
 })
 
 local cmp_autopairs = require("nvim-autopairs.completion.cmp")

.config/nvim/lua/user/autosave.lua

@@ -1,4 +1,4 @@
-local status_ok, autosave = pcall(require, "autosave")
+local status_ok, autosave = pcall(require, "auto-save")
 if not status_ok then
 	return
 end

.config/nvim/lua/user/comment.lua

@@ -3,20 +3,4 @@ if not status_ok then
 	return
 end
 
-comment.setup({
+comment.setup({})
-	pre_hook = function(ctx)
-		local U = require("Comment.utils")
-
-		local location = nil
-		if ctx.ctype == U.ctype.block then
-			location = require("ts_context_commentstring.utils").get_cursor_location()
-		elseif ctx.cmotion == U.cmotion.v or ctx.cmotion == U.cmotion.V then
-			location = require("ts_context_commentstring.utils").get_visual_start_location()
-		end
-
-		return require("ts_context_commentstring.internal").calculate_commentstring({
-			key = ctx.ctype == U.ctype.line and "__default" or "__multiline",
-			location = location,
-		})
-	end,
-})

.config/nvim/lua/user/gitsigns.lua

@@ -11,6 +11,23 @@ gitsigns.setup({
 		topdelete = { hl = "GitSignsDelete", text = "契", numhl = "GitSignsDeleteNr", linehl = "GitSignsDeleteLn" },
 		changedelete = { hl = "GitSignsChange", text = "▎", numhl = "GitSignsChangeNr", linehl = "GitSignsChangeLn" },
 	},
+	signcolumn = true,
+	watch_gitdir = {
+		interval = 1000,
+		follow_files = true,
+	},
+	attach_to_untracked = true,
+	sign_priority = 6,
+	update_debounce = 100,
+	status_formatter = nil,
+	preview_config = {
+		border = "single",
+		style = "minimal",
+		relative = "cursor",
+		row = 0,
+		col = 1,
+	},
+
 	on_attach = function(bufnr)
 		local gs = package.loaded.gitsigns
 

.config/nvim/lua/user/illuminate.lua

@@ -1,4 +1,8 @@
-vim.g.Illuminate_ftblacklist = { "neo-tree" }
+local status_ok, illuminate = pcall(require, "illuminate")
+if not status_ok then
+	return
+end
+
 vim.api.nvim_set_keymap("n", "<a-n>", '<cmd>lua require"illuminate".next_reference{wrap=true}<cr>', { noremap = true })
 vim.api.nvim_set_keymap(
 	"n",
@@ -6,3 +10,23 @@ vim.api.nvim_set_keymap(
 	'<cmd>lua require"illuminate".next_reference{reverse=true,wrap=true}<cr>',
 	{ noremap = true }
 )
+illuminate.configure({
+	providers = {
+		"lsp",
+		"treesitter",
+		"regex",
+	},
+	delay = 200,
+	filetypes_denylist = {
+		"neo-tree",
+		"packer",
+		"Trouble",
+		"TelescopePrompt",
+	},
+	filetypes_allowlist = {},
+	modes_denylist = {},
+	modes_allowlist = {},
+	providers_regex_syntax_denylist = {},
+	providers_regex_syntax_allowlist = {},
+	under_cursor = true,
+})

.config/nvim/lua/user/lsp/init.lua

@@ -3,6 +3,6 @@ if not status_ok then
 	return
 end
 
-require("user.lsp.lsp-installer")
+require("user.lsp.mason")
 require("user.lsp.handlers").setup()
 require("user.lsp.null-ls")

.config/nvim/lua/user/lsp/lsp-installer.lua

@@ -1,46 +0,0 @@
-local status_ok, lsp_installer = pcall(require, "nvim-lsp-installer")
-if not status_ok then
-	return
-end
-
-local servers = {
-	"sumneko_lua",
-	-- "cssls",
-	-- "html",
-	-- "tsserver",
-	"gopls",
-	-- "grammarly",
-	"golangci_lint_ls",
-	"pyright",
-	"bashls",
-	"jsonls",
-	"yamlls",
-}
-
-lsp_installer.setup()
-
-local lspconfig_status_ok, lspconfig = pcall(require, "lspconfig")
-if not lspconfig_status_ok then
-	return
-end
-
-local opts = {}
-
-for _, server in pairs(servers) do
-	opts = {
-		on_attach = require("user.lsp.handlers").on_attach,
-		capabilities = require("user.lsp.handlers").capabilities,
-	}
-
-	if server == "sumneko_lua" then
-		local sumneko_opts = require("user.lsp.settings.sumneko_lua")
-		opts = vim.tbl_deep_extend("force", sumneko_opts, opts)
-	end
-
-	if server == "pyright" then
-		local pyright_opts = require("user.lsp.settings.pyright")
-		opts = vim.tbl_deep_extend("force", pyright_opts, opts)
-	end
-
-	lspconfig[server].setup(opts)
-end

.config/nvim/lua/user/lsp/mason.lua

@@ -0,0 +1,53 @@
+local servers = {
+	"sumneko_lua",
+	"cssls",
+	"html",
+	"gopls",
+	"tsserver",
+	"pyright",
+	"bashls",
+	"jsonls",
+	"yamlls",
+}
+
+local settings = {
+	ui = {
+		border = "none",
+		icons = {
+			package_installed = "◍",
+			package_pending = "◍",
+			package_uninstalled = "◍",
+		},
+	},
+	log_level = vim.log.levels.INFO,
+	max_concurrent_installers = 4,
+}
+
+require("mason").setup(settings)
+require("mason-lspconfig").setup({
+	ensure_installed = servers,
+	automatic_installation = true,
+})
+
+local lspconfig_status_ok, lspconfig = pcall(require, "lspconfig")
+if not lspconfig_status_ok then
+	return
+end
+
+local opts = {}
+
+for _, server in pairs(servers) do
+	opts = {
+		on_attach = require("user.lsp.handlers").on_attach,
+		capabilities = require("user.lsp.handlers").capabilities,
+	}
+
+	server = vim.split(server, "@")[1]
+
+	local require_ok, conf_opts = pcall(require, "user.lsp.settings." .. server)
+	if require_ok then
+		opts = vim.tbl_deep_extend("force", conf_opts, opts)
+	end
+
+	lspconfig[server].setup(opts)
+end

.config/nvim/lua/user/plugins.lua

@@ -81,7 +81,8 @@ return packer.startup(function(use)
 
 	-- LSP
 	use({ "neovim/nvim-lspconfig", commit = "9d4b8d393aad0e6e9227e2d67629aa99e56b994a" })
-	use({ "williamboman/nvim-lsp-installer", commit = "23820a878a5c2415bfd3b971d1fe3c79e4dd6763" })
+	use({ "williamboman/mason.nvim", commit = "c2002d7a6b5a72ba02388548cfaf420b864fbc12" })
+	use({ "williamboman/mason-lspconfig.nvim", commit = "0051870dd728f4988110a1b2d47f4a4510213e31" })
 	use({ "jose-elias-alvarez/null-ls.nvim", commit = "6a98411e70fad6928f7311eeade4b1753cb83524" })
 	use({ "RRethy/vim-illuminate", commit = "0603e75fc4ecde1ee5a1b2fc8106ed6704f34d14" })
 	use({ "folke/trouble.nvim", commit = "929315ea5f146f1ce0e784c76c943ece6f36d786" })

.config/nvim/lua/user/treesitter.lua

@@ -4,14 +4,20 @@ if not status_ok then
 end
 
 configs.setup({
-	ensure_installed = "all", -- one of "all" or a list of languages
+	ensure_installed = { "lua", "markdown", "markdown_inline", "bash", "python", "go", "gomod", "gowork" },
-	ignore_install = { "" }, -- List of parsers to ignore installing
+	ignore_install = { "" },
+	sync_install = false,
 	highlight = {
-		enable = true, -- false will disable the whole extension
+		enable = true,
-		disable = { "css" }, -- list of language that will be disabled
+		disable = { "css" },
 	},
 	autopairs = {
 		enable = true,
 	},
 	indent = { enable = true, disable = { "python", "css" } },
+
+	context_commentstring = {
+		enable = true,
+		enable_autocmd = false,
+	},
 })