From eba3271e2713beeeb8d6b27b6f2ae2020ced52b1 Mon Sep 17 00:00:00 2001
From: Daniel Heras Quesada <dani.heras@hotmail.com>
Date: Fri, 30 May 2025 15:32:10 +0200
Subject: [PATCH] fix: lsp setup improved

---
 README.md           |  2 +-
 init.lua            | 20 +-------------------
 lazy-lock.json      |  1 +
 lsp/astro.lua       |  5 ++++-
 lsp/luals.lua       |  2 +-
 lua/config/init.lua |  1 +
 lua/config/lsp.lua  | 18 ++++++++++++++++++
 7 files changed, 27 insertions(+), 22 deletions(-)
 create mode 100644 lua/config/lsp.lua

diff --git a/README.md b/README.md
index 3773968..64e2cac 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 This list is arbitrary and will depend on the current state of the lsp folder:
 
 - `# pacman -S lua-language-server bash-language-server typescript-language-server vscode-html-language-server vscode-css-language-server pyright-langserver gopls astro-ls jdtls rust-analyzer solargraph vue-language-server vscode-json-languageserver`
-- `# npm i -g emmet-language-server emmet-ls`
+- `# npm i -g emmet-language-server emmet-ls @astrojs/language-server`
 
 ## Relevant docs
 
diff --git a/init.lua b/init.lua
index fa913ce..f36e80e 100644
--- a/init.lua
+++ b/init.lua
@@ -20,6 +20,7 @@ vim.cmd("set shiftwidth=4")
 vim.cmd("set expandtab")
 vim.cmd("set wrap")
 vim.lsp.inlay_hint.enable(false)
+vim.o.sessionoptions="blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
 
 -- ╭─────────────╮
 -- │ Colorscheme │
@@ -45,22 +46,3 @@ vim.opt.listchars = {
     trail = " ",
     nbsp = "+",
 }
-
--- ╭─────╮
--- │ LSP │
--- ╰─────╯
-vim.lsp.enable('astro')
-vim.lsp.enable('bashls')
-vim.lsp.enable('clangd')
-vim.lsp.enable('cssls')
-vim.lsp.enable('emmet')
-vim.lsp.enable('gopls')
-vim.lsp.enable('html')
-vim.lsp.enable('jdtls')
-vim.lsp.enable('luals')
-vim.lsp.enable('pyright')
-vim.lsp.enable('rust_analyzer')
-vim.lsp.enable('solargraph')
-vim.lsp.enable('tsserver')
-vim.lsp.enable('volar')
-vim.lsp.enable('json')
diff --git a/lazy-lock.json b/lazy-lock.json
index 8e7b19b..ccaf2cd 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -26,6 +26,7 @@
   "nui.nvim": { "branch": "main", "commit": "7cd18e73cfbd70e1546931b7268b3eebaeff9391" },
   "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
+  "nvim-lspconfig": { "branch": "master", "commit": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" },
   "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
diff --git a/lsp/astro.lua b/lsp/astro.lua
index 4778ab7..c56be66 100644
--- a/lsp/astro.lua
+++ b/lsp/astro.lua
@@ -1,5 +1,8 @@
 return {
     cmd = { 'astro-ls', '--stdio' },
     filetypes = { 'astro' },
-    root_markers = { '.git', 'astro.config.mjs', 'astro.config.js', 'astro.config.ts' },
+    root_markers = { 'astro.config.mjs', 'astro.config.js', 'astro.config.ts' },
+    init_options = {
+         typescript = { tsdk = "./node_modules/typescript/lib" }
+    }
 }
diff --git a/lsp/luals.lua b/lsp/luals.lua
index c76d70e..417399e 100644
--- a/lsp/luals.lua
+++ b/lsp/luals.lua
@@ -1,5 +1,5 @@
 return {
     cmd = { 'lua-language-server' },
     filetypes = { 'lua' },
-    root_markers = { '.luarc.json', '.luarc.jsonc', 'init.lua' },
+    root_markers = { '.luarc.json', '.luarc.jsonc', '.git' },
 }
diff --git a/lua/config/init.lua b/lua/config/init.lua
index 04bc99c..edc7423 100644
--- a/lua/config/init.lua
+++ b/lua/config/init.lua
@@ -1,3 +1,4 @@
 require("config.autocmds")
 require("config.remap")
 require("config.lazy")
+require("config.lsp")
diff --git a/lua/config/lsp.lua b/lua/config/lsp.lua
new file mode 100644
index 0000000..030398f
--- /dev/null
+++ b/lua/config/lsp.lua
@@ -0,0 +1,18 @@
+-- ╭─────╮
+-- │ LSP │
+-- ╰─────╯
+vim.lsp.enable('astro')
+vim.lsp.enable('bashls')
+vim.lsp.enable('clangd')
+vim.lsp.enable('cssls')
+vim.lsp.enable('emmet')
+vim.lsp.enable('gopls')
+vim.lsp.enable('html')
+vim.lsp.enable('jdtls')
+vim.lsp.enable('luals')
+vim.lsp.enable('pyright')
+vim.lsp.enable('rust_analyzer')
+vim.lsp.enable('solargraph')
+vim.lsp.enable('tsserver')
+vim.lsp.enable('volar')
+vim.lsp.enable('jsonls')