chore: refactor lsp config

Former-commit-id: 8439001
silveiralexf · Mar 16, 2024 · 893016e · 893016e
1 parent d8589e6
commit 893016e
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 54 deletions.
diff --git a/nvim/lua/lsp/config.lua b/nvim/lua/lsp/config.lua
@@ -0,0 +1,44 @@
+return {
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = function(_, opts)
+      vim.list_extend(opts.ensure_installed, {
+        "bash",
+        "dockerfile",
+        "go",
+        "gomod",
+        "gosum",
+        "gowork",
+        "hcl",
+        "helm",
+        "html",
+        "java",
+        "javascript",
+        "json",
+        "json5",
+        "jsonc",
+        "lua",
+        "markdown",
+        "markdown_inline",
+        "python",
+        "query",
+        "regex",
+        "terraform",
+        "tsx",
+        "typescript",
+        "vim",
+        "vue",
+        "yaml",
+      })
+    end,
+    vim.filetype.add({
+      extension = { rasi = "rasi" },
+      pattern = {
+        [".*/waybar/config"] = "jsonc",
+        [".*/mako/config"] = "dosini",
+        [".*/kitty/*.conf"] = "bash",
+        [".*/hypr/.*%.conf"] = "hyprlang",
+      },
+    }),
+  },
+}
diff --git a/nvim/lua/lsp/servers/json.lua b/nvim/lua/lsp/servers/json.lua
@@ -0,0 +1,27 @@
+return {
+  {
+    "neovim/nvim-lspconfig",
+    opts = {
+      codelens = {
+        enabled = true,
+      },
+      servers = {
+        jsonls = {
+          -- lazy-load schemastore when needed
+          on_new_config = function(new_config)
+            new_config.settings.json.schemas = new_config.settings.json.schemas or {}
+            vim.list_extend(new_config.settings.json.schemas, require("schemastore").json.schemas())
+          end,
+          settings = {
+            json = {
+              format = {
+                enable = true,
+              },
+              validate = { enable = true },
+            },
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/nvim/lua/lsp/servers/python.lua b/nvim/lua/lsp/servers/python.lua
@@ -23,6 +23,17 @@ return {
           },
         },
       },
+      {
+        "neovim/nvim-lspconfig",
+        opts = {
+          codelens = {
+            enabled = true,
+          },
+          servers = {
+            ruff_lsp = {},
+          },
+        },
+      },
     },
   },
 }
diff --git a/nvim/lua/lsp/init.lua → nvim/lua/lsp/servers/yaml.lua b/nvim/lua/lsp/init.lua → nvim/lua/lsp/servers/yaml.lua
@@ -1,61 +1,11 @@
 return {
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
-      vim.list_extend(opts.ensure_installed, {
-        "bash",
-        "dockerfile",
-        "go",
-        "gomod",
-        "gosum",
-        "gowork",
-        "hcl",
-        "helm",
-        "html",
-        "java",
-        "javascript",
-        "json",
-        "json5",
-        "jsonc",
-        "lua",
-        "markdown",
-        "markdown_inline",
-        "python",
-        "query",
-        "regex",
-        "terraform",
-        "tsx",
-        "typescript",
-        "vim",
-        "yaml",
-      })
-    end,
-  },
   {
     "neovim/nvim-lspconfig",
     opts = {
       codelens = {
         enabled = true,
       },
       servers = {
-        ---
-        --- JSON/YAML
-        ---
-        jsonls = {
-          -- lazy-load schemastore when needed
-          on_new_config = function(new_config)
-            new_config.settings.json.schemas = new_config.settings.json.schemas or {}
-            vim.list_extend(new_config.settings.json.schemas, require("schemastore").json.schemas())
-          end,
-          settings = {
-            json = {
-              format = {
-                enable = true,
-              },
-              validate = { enable = true },
-            },
-          },
-        },
         yamlls = {
           -- Have to add this for yamlls to understand that we support line folding
           capabilities = {
@@ -89,10 +39,6 @@ return {
             },
           },
         },
-        ---
-        --- Rust
-        ---
-        ruff_lsp = {},
       },
     },
   },