diff --git a/modules/nixvim/default.nix b/modules/nixvim/default.nix index 8e1aeda..314e781 100644 --- a/modules/nixvim/default.nix +++ b/modules/nixvim/default.nix @@ -23,6 +23,5 @@ ./statusline.nix ./keybindings.nix ./ai.nix - ./typescript.nix ]; } diff --git a/modules/nixvim/lsp.nix b/modules/nixvim/lsp.nix index e21403c..5efa53f 100644 --- a/modules/nixvim/lsp.nix +++ b/modules/nixvim/lsp.nix @@ -17,11 +17,26 @@ package = pkgs.nil; packageFallback = true; }; + ts_ls = { + enable = true; + package = pkgs.typescript-language-server; + packageFallback = true; + }; jsonls = { enable = true; package = pkgs.vscode-langservers-extracted; packageFallback = true; }; + cssls = { + enable = true; + package = pkgs.vscode-langservers-extracted; + packageFallback = true; + }; + html = { + enable = true; + package = pkgs.vscode-langservers-extracted; + packageFallback = true; + }; astro = { enable = true; package = pkgs.astro-language-server; diff --git a/modules/nixvim/typescript.nix b/modules/nixvim/typescript.nix deleted file mode 100644 index 4da4611..0000000 --- a/modules/nixvim/typescript.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ pkgs, lib, ... }: - -{ - extraPackages = with pkgs; [ - nodejs - typescript - ]; - - plugins.typescript-tools = { - enable = true; - settings = { - jsx_close_tag.enable = true; - tsserver_file_preferences = { - __raw = '' - function(ft) - return { - includeInlayParameterNameHints = "all", - includeCompletionsForModuleExports = true, - quotePreference = "auto", - } - end - ''; - }; - tsserver_format_options = { - __raw = '' - function(ft) - return { - allowIncompleteCompletions = false, - allowRenameOfImportPath = false, - } - end - ''; - }; - tsserver_plugins = [ - "@styled/typescript-styled-plugin" - ]; - }; - }; -}