From e522e9ea2d0c4499f8f48a93f93e4e36587fec1e Mon Sep 17 00:00:00 2001
From: Roel de Cort <63876068+dc-tec@users.noreply.github.com>
Date: Wed, 23 Oct 2024 22:55:03 +0200
Subject: [PATCH] renamed changed lsp names and use web-devicons as a full
 plugin (#49)

fix #48

- Renamed LSP servers as they were changed upstream.
- Enable web-devicons as a nixvim plugin instead of installing them as a
extra package.
---
 config/default.nix                     |  1 +
 config/plugins/lsp/lsp.nix             | 10 +++++-----
 config/plugins/utils/extra_plugins.nix |  1 -
 config/plugins/utils/web-devicons.nix  |  5 +++++
 4 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 config/plugins/utils/web-devicons.nix

diff --git a/config/default.nix b/config/default.nix
index 125722d..5656a7c 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -51,5 +51,6 @@ _: {
     ./plugins/utils/markdown-preview.nix
     ./plugins/utils/obsidian.nix
     ./plugins/utils/toggleterm.nix
+    ./plugins/utils/web-devicons.nix
   ];
 }
diff --git a/config/plugins/lsp/lsp.nix b/config/plugins/lsp/lsp.nix
index 1bee3cd..4c249f8 100644
--- a/config/plugins/lsp/lsp.nix
+++ b/config/plugins/lsp/lsp.nix
@@ -8,20 +8,20 @@
       inlayHints = true;
       servers = {
         html = {enable = true;};
-        lua-ls = {enable = true;};
-        nil-ls = {enable = true;};
+        lua_ls = {enable = true;};
+        nil_ls = {enable = true;};
+        ts_ls = {enable = true;};
         marksman = {enable = true;};
         pyright = {enable = true;};
         gopls = {enable = true;};
         terraformls = {enable = true;};
-        tsserver = {enable = true;};
         ansiblels = {enable = true;};
         jsonls = {enable = true;};
-        helm-ls = {
+        helm_ls = {
           enable = true;
           extraOptions = {
             settings = {
-              "helm-ls" = {
+              "helm_ls" = {
                 yamlls = {
                   path = "${pkgs.yaml-language-server}/bin/yaml-language-server";
                 };
diff --git a/config/plugins/utils/extra_plugins.nix b/config/plugins/utils/extra_plugins.nix
index 0304bc7..98d8867 100644
--- a/config/plugins/utils/extra_plugins.nix
+++ b/config/plugins/utils/extra_plugins.nix
@@ -1,5 +1,4 @@
 {pkgs, ...}: {
   extraPlugins = with pkgs.vimPlugins; [
-    nvim-web-devicons
   ];
 }
diff --git a/config/plugins/utils/web-devicons.nix b/config/plugins/utils/web-devicons.nix
new file mode 100644
index 0000000..cb0f6ab
--- /dev/null
+++ b/config/plugins/utils/web-devicons.nix
@@ -0,0 +1,5 @@
+{
+  plugins.web-devicons = {
+    enable = true;
+  };
+}