Merge remote-tracking branch 'origin/master'

.vim/nvim.lua

@@ -55,7 +55,7 @@ local runtime_path = vim.split(package.path, ';')
 table.insert(runtime_path, "lua/?.lua")
 table.insert(runtime_path, "lua/?/init.lua")
 
-require 'lspconfig'.sumneko_lua.setup {
+require 'lspconfig'.lua_ls.setup {
   settings = {
     Lua = {
       runtime = {
@@ -103,7 +103,7 @@ end
 nvim_lsp.efm.setup {
   init_options = { documentFormatting = true },
   settings = {
-    rootMarkers = { ".git/" },
+    rootMarkers = { ".git/", "package.json" },
     languages = {
       lua = {
         { formatCommand = "lua-format -i", formatStdin = true }
@@ -113,6 +113,9 @@ nvim_lsp.efm.setup {
       },
       rust = {
         { formatCommand = 'rustfmt', formatStdin = true }
+      },
+      typescript = {
+        { formatCommand = 'pnpm exec eslint --fix' }
       }
     }
   }