From 2efad106103eb3616efb0093540a3f39a707852f Mon Sep 17 00:00:00 2001
From: Jan Eitzinger <jan@moebiusband.org>
Date: Mon, 16 Sep 2024 15:37:36 +0200
Subject: [PATCH] Fix nvim startup warnings

---
 dot_config/nvim/lua/plugins/editor.lua | 46 ++++++++++++--------------
 dot_config/nvim/lua/plugins/lsp.lua    |  2 +-
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/dot_config/nvim/lua/plugins/editor.lua b/dot_config/nvim/lua/plugins/editor.lua
index fd15de0..27a5c20 100644
--- a/dot_config/nvim/lua/plugins/editor.lua
+++ b/dot_config/nvim/lua/plugins/editor.lua
@@ -87,33 +87,31 @@ return {
   {
     "folke/which-key.nvim",
     event = "VeryLazy",
+    opts_extend = { "spec" },
     opts = {
-      plugins = { spelling = true },
-      defaults = {
-        mode = { "n", "v" },
-        { "<leader><tab>", group = "tabs" },
-        { "<leader>b", group = "buffer" },
-        { "<leader>c", group = "code" },
-        { "<leader>f", group = "file/find" },
-        { "<leader>g", group = "git" },
-        { "<leader>gh", group = "hunks" },
-        { "<leader>q", group = "quit/session" },
-        { "<leader>s", group = "search" },
-        { "<leader>sn", group = "noice" },
-        { "<leader>u", group = "ui" },
-        { "<leader>w", group = "windows" },
-        { "<leader>x", group = "diagnostics/quickfix" },
-        { "[", group = "prev" },
-        { "]", group = "next" },
-        { "g", group = "goto" },
-        { "gs", group = "surround" },
+      defaults = {},
+      spec = {
+        {
+          mode = { "n", "v" },
+          { "<leader><tab>", group = "tabs" },
+          { "<leader>b",     group = "buffer" },
+          { "<leader>c",     group = "code" },
+          { "<leader>f",     group = "file/find" },
+          { "<leader>g",     group = "git" },
+          { "<leader>gh",    group = "hunks" },
+          { "<leader>q",     group = "quit/session" },
+          { "<leader>s",     group = "search" },
+          { "<leader>sn",    group = "noice" },
+          { "<leader>u",     group = "ui" },
+          { "<leader>w",     group = "windows" },
+          { "<leader>x",     group = "diagnostics/quickfix" },
+          { "[",             group = "prev" },
+          { "]",             group = "next" },
+          { "g",             group = "goto" },
+          { "gs",            group = "surround" },
+        },
       },
     },
-    config = function(_, opts)
-      local wk = require("which-key")
-      wk.setup(opts)
-      wk.register(opts.defaults)
-    end,
   },
 
   -- git signs highlights text that has changed since the list
diff --git a/dot_config/nvim/lua/plugins/lsp.lua b/dot_config/nvim/lua/plugins/lsp.lua
index 6a3be8c..9ecc620 100644
--- a/dot_config/nvim/lua/plugins/lsp.lua
+++ b/dot_config/nvim/lua/plugins/lsp.lua
@@ -178,7 +178,7 @@ return {
       }
       lsp.svelte.setup { on_attach = on_attach }
       lsp.perlls.setup { on_attach = on_attach }
-      lsp.tsserver.setup { on_attach = on_attach }
+      lsp.ts_ls.setup { on_attach = on_attach }
       lsp.lua_ls.setup {
         settings = {
           Lua = {