diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix index 4c38cba1..8d170236 100644 --- a/modules/plugins/languages/ts.nix +++ b/modules/plugins/languages/ts.nix @@ -174,7 +174,6 @@ in { vim.lsp = { presets = genAttrs cfg.lsp.servers (_: {enable = true;}); servers = genAttrs cfg.lsp.servers (_: { - root_markers = ["tsconfig.json"]; filetypes = [ "typescript" # TODO: move to a React module diff --git a/modules/plugins/lsp/presets/typescript-go.nix b/modules/plugins/lsp/presets/typescript-go.nix index 121fad29..97fb4246 100644 --- a/modules/plugins/lsp/presets/typescript-go.nix +++ b/modules/plugins/lsp/presets/typescript-go.nix @@ -18,7 +18,7 @@ in { vim.lsp.servers.typescript-go = { enable = true; cmd = [(getExe pkgs.typescript-go) "--lsp" "--stdio"]; - root_markers = [".git" "package.json"]; + root_markers = [".git" "tsconfig.json" "package.json"]; }; }; } diff --git a/modules/plugins/lsp/presets/typescript-language-server.nix b/modules/plugins/lsp/presets/typescript-language-server.nix index efd95cc0..57d18c9e 100644 --- a/modules/plugins/lsp/presets/typescript-language-server.nix +++ b/modules/plugins/lsp/presets/typescript-language-server.nix @@ -19,7 +19,7 @@ in { vim.lsp.servers.typescript-language-server = { enable = true; cmd = [(getExe pkgs.typescript-language-server) "--stdio"]; - root_markers = [".git" "package.json"]; + root_markers = [".git" "tsconfig.json" "package.json"]; init_options = {hostInfo = "neovim";}; handlers = { # handle rename request for certain code actions like extracting functions / types