Update 04.02.2023

lua/user/mason/mason-installer.lua

@@ -34,7 +34,8 @@ local servers = {
 	"emmet_ls",
 	"html",
 	"jsonls",
-	"pyright",
+	-- "pyright",
+	"jedi_language_server",
 	"rust_analyzer",
 	"sumneko_lua",
 	"taplo",
@@ -55,11 +56,12 @@ mason_tool.setup({
 		"json-lsp",
 		"lua-language-server",
 		"marksman",
-		"pyright",
+		-- "pyright",
+		"jedi-language-server",
 		"rust-analyzer",
 		"taplo",
 		"texlab",
-		-- "typescript-language-server",
+		"typescript-language-server",
 		"vim-language-server",
 		"yaml-language-server",
 	},
@@ -81,10 +83,10 @@ for _, server in pairs(servers) do
 		opts = vim.tbl_deep_extend("force", sumneko_opts, opts)
 	end
 
-	if server == "pyright" then
-		local pyright_opts = require("user.mason.settings.pyright")
-		opts = vim.tbl_deep_extend("force", pyright_opts, opts)
-	end
+	-- if server == "jedi_language_server" then
+	-- 	local pyright_opts = require("user.mason.settings.jedi")
+	-- 	opts = vim.tbl_deep_extend("force", pyright_opts, opts)
+	-- end
 
 	-- if server == "clangd" then
 	-- 	local clangd_opts = require("user.mason.settings.clangd")

lua/user/mason/null-ls.lua

@@ -17,20 +17,33 @@ local diagnostics = null_ls.builtins.diagnostics
 null_ls.setup({
 	debug = false,
 	sources = {
-		formatting.prettier.with({
-			extra_filetypes = { "toml" },
-			extra_args = { "--no-semi", "--single-quote", "--jsx-single-quote", "--no-bracket-spacing" },
-		}),
 		formatting.autopep8,
-		formatting.stylua,
 		formatting.beautysh,
 		formatting.djlint,
-		formatting.tidy,
+		formatting.prettier.with({
+			extra_filetypes = { "toml" },
+			extra_args = {
+				"--no-semi",
+				"--double-quote",
+				"--no-bracket-spacing",
+				"--tab-width",
+				"4",
+				"--bracket-same-line",
+				"--html-whitespace-sensitivity",
+				"strict",
+			},
+		}),
+		formatting.shfmt,
+		formatting.stylua,
+		formatting.isort,
+		formatting.yamlfmt,
 		diagnostics.cpplint,
 		diagnostics.luacheck,
-		diagnostics.pylint,
+		diagnostics.flake8,
 		diagnostics.mypy,
 		diagnostics.zsh,
+		diagnostics.misspell,
+		diagnostics.codespell,
 	},
 })
 
@@ -38,17 +51,17 @@ mason_null_ls.setup({
 	ensure_installed = {
 		"autopep8",
 		"beautysh",
-		"djlint",
-		"shfmt",
-		"yamlfmt",
 		"codespell",
 		"cpplint",
+		"djlint",
+		"flake8",
+		"gitlint",
+		"html_lint",
 		"luacheck",
 		"misspell",
-		"pylint",
 		"mypy",
-		"html_lint",
-		"gitlint",
+		"shfmt",
+		"yamlfmt",
 	},
 	automatic_installation = true,
 	automatic_setup = true,

lua/user/mason/settings/pyright.lua

@@ -1,9 +0,0 @@
-return {
-	settings = {
-		python = {
-			analysis = {
-				typeCheckingMode = "true",
-			},
-		},
-	},
-}