feat: small improvements

4 files changed, 20 insertions, 25 deletions

diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua
index 7de2e6e..d6ace51 100644
--- a/after/plugin/lsp.lua
+++ b/after/plugin/lsp.lua
@@ -1,4 +1,6 @@
 local telescope_mapper = require("alpha.telescope.mappings")
+local lspconfig = require("lspconfig")
+local configs = require("lspconfig.configs")
 
 local lsp_formatting = function(bufnr, allowed_clientes)
 	vim.lsp.buf.format({
@@ -92,7 +94,7 @@ local lsp_flags = {
 
 -- Server configurations
 
-require("lspconfig")["rust_analyzer"].setup({
+lspconfig["rust_analyzer"].setup({
 	on_attach = on_attach,
 	flags = lsp_flags,
 	-- Server-specific settings...
@@ -101,31 +103,31 @@ require("lspconfig")["rust_analyzer"].setup({
 	},
 })
 
-require("lspconfig").dockerls.setup({
+lspconfig.dockerls.setup({
 	on_attach = on_attach,
 	flags = lsp_flags,
 })
 
--- require("lspconfig")["intelephense"].setup({
+-- lspconfig["intelephense"].setup({
 -- 	on_attach = on_attach,
 -- 	flags = lsp_flags,
 -- })
 
-require("lspconfig")["phpactor"].setup({
+lspconfig["phpactor"].setup({
 	on_attach = on_attach,
 	flags = lsp_flags,
 	filetypes = { "php", "cucumber" },
 })
 
-require("lspconfig").jsonls.setup({
+lspconfig.jsonls.setup({
 	on_attach = on_attach,
 	flags = lsp_flags,
 })
-require("lspconfig").html.setup({
+lspconfig.html.setup({
 	on_attach = on_attach,
 	flags = lsp_flags,
 })
-require("lspconfig").html.setup({
+lspconfig.html.setup({
 	on_attach = on_attach,
 	flags = lsp_flags,
 })
@@ -133,34 +135,34 @@ require("lspconfig").html.setup({
 local capabilities = vim.lsp.protocol.make_client_capabilities()
 capabilities.textDocument.completion.completionItem.snippetSupport = true
 
-require("lspconfig").emmet_ls.setup({
+lspconfig.emmet_ls.setup({
 	on_attach = on_attach,
 	flags = lsp_flags,
 	capabilities = capabilities,
 	filetypes = { "html", "typescriptreact", "javascriptreact", "css", "sass", "scss", "less", "blade", "vue" },
 })
 
-require("lspconfig").gopls.setup({
+lspconfig.gopls.setup({
 	on_attach = on_attach,
 	flags = lsp_flags,
 })
 
-require("lspconfig").gdscript.setup({
+lspconfig.gdscript.setup({
 	on_attach = on_attach,
 	flags = lsp_flags,
 })
 
-require("lspconfig").tsserver.setup({
+lspconfig.tsserver.setup({
 	on_attach = on_attach,
 	flags = lsp_flags,
 })
 
-require("lspconfig").volar.setup({
+lspconfig.volar.setup({
     on_attach = on_attach,
     flags = lsp_flags,
 })
 
-require("lspconfig")["sumneko_lua"].setup({
+lspconfig["sumneko_lua"].setup({
 	on_attach = on_attach,
 	flags = lsp_flags,
 	settings = {
@@ -181,9 +183,6 @@ require("lspconfig")["sumneko_lua"].setup({
 	},
 })
 
-local lspconfig = require("lspconfig")
-local configs = require("lspconfig.configs")
-
 configs.blade = {
 	default_config = {
 		cmd = { "laravel-dev-tools", "lsp" },
diff --git a/after/plugin/lualine.lua b/after/plugin/lualine.lua
index 81accf3..12f276c 100644
--- a/after/plugin/lualine.lua
+++ b/after/plugin/lualine.lua
@@ -3,10 +3,6 @@ if not ok then
 	return
 end
 
-local function sail_status()
-    return [[testing]]
-end
-
 lualine.setup({
 	options = {
 		theme = "tokyonight",
@@ -18,7 +14,7 @@ lualine.setup({
 		lualine_a = { { "mode", upper = true } },
 		lualine_b = { { "branch", icon = "" }, { "db_ui#statusline" }, "diff" },
 		lualine_c = { { "filename", file_status = true, path = 1 } },
-		lualine_x = { "diagnostics", sail_status },
+		lualine_x = { "diagnostics" },
 		lualine_y = { "encoding", "fileformat" },
 		lualine_z = { "filetype" },
 	},
diff --git a/after/plugin/mason.lua b/after/plugin/mason.lua
index 0596306..66de4d8 100644
--- a/after/plugin/mason.lua
+++ b/after/plugin/mason.lua
@@ -16,7 +16,7 @@ mason.setup({
 })
 
 mason_lspconfig.setup({
-	automatic_installation = true,
+	automatic_installation = false,
 })
 
 require('mason-tool-installer').setup {
diff --git a/after/plugin/tokio.lua b/after/plugin/tokio.lua
index 464a68e..04c566e 100644
--- a/after/plugin/tokio.lua
+++ b/after/plugin/tokio.lua
@@ -1,10 +1,10 @@
-local ok, tokionight = pcall(require, "tokyonight")
+local ok, tokyonight = pcall(require, "tokyonight")
 if not ok then
     return
 end
 
-tokionight.setup({
+tokyonight.setup({
     style="night"
 })
 
-vim.cmd[[colorscheme tokyonight]]
+vim.cmd.colorscheme("tokyonight")