fix lspconfig

Author: gvolpe

lib/buildPlugin.nix

@@ -14,14 +14,6 @@ let
     };
   };
 
-  smithy-lsp = pkgs.callPackage ./smithy-lspconfig.nix { };
-
-  smithyLspHook = ''
-    cat >> $out/lua/lspconfig/configs/smithy_ls.lua <<EOL
-    ${smithy-lsp.lua}
-    EOL
-  '';
-
   # sync queries of tree-sitter-scala and nvim-treesitter
   queriesHook = ''
     cp ${inputs.tree-sitter-scala}/queries/* $out/queries/scala/
@@ -63,7 +55,6 @@ let
       dontBuild = name == "nvim-metals";
 
       preFixup = ''
-        ${writeIf (name == "nvim-lspconfig") smithyLspHook}
         ${writeIf (name == "nvim-treesitter") tsPreFixupHook}
         ${writeIf (name == "telescope-media-files") telescopeFixupHook}
       '';

lib/plugins/overrides.nix

@@ -73,7 +73,6 @@ in
     (withDeps (p == "nvim-autopairs") [ "nvim-autopairs.completion.cmp" "nvim-autopairs.completion.compe" ]) ++
     (withDeps (p == "nvim-bufferline") [ "bufferline.commands" ]) ++
     (withDeps (p == "nvim-cmp") cmpSkip) ++
-    (withDeps (p == "nvim-lspconfig") [ "lspconfig.configs.smithy_ls" ]) ++
     (withDeps (p == "nvim-neoclip") [ "neoclip.fzf" "neoclip.telescope" ]) ++
     (withDeps (p == "nvim-notify") [ "notify.integrations.fzf" ]) ++
     (withDeps (p == "nvim-treesitter-context") [ "install_parsers" ]) ++

lib/smithy-lspconfig.nix

@@ -476,7 +476,7 @@ in
         -- Smithy config
         vim.cmd([[au BufRead,BufNewFile *.smithy setfiletype smithy]])
 
-        lspconfig.smithy.setup {
+        lspconfig.smithy_ls.setup {
           capabilities = capabilities;
           on_attach = function(client, bufnr)
             attach_keymaps(client, bufnr)
@@ -494,7 +494,7 @@ in
 
       ${writeIf cfg.ts ''
         -- TS config
-        lspconfig.tsserver.setup {
+        lspconfig.ts_ls.setup {
           capabilities = capabilities;
           on_attach = function(client, bufnr)
             attach_keymaps(client, bufnr)