From f1acdc67a1da459bec691e187782379560f0e9e7 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 5 Aug 2024 18:03:45 +0300 Subject: feat(lsp): Moved nvim-treesitter to lsp file (formerly lsp-config) --- lua/plugins/default.lua | 14 -------------- lua/plugins/lsp-config.lua | 27 --------------------------- lua/plugins/lsp.lua | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 lua/plugins/lsp-config.lua create mode 100644 lua/plugins/lsp.lua (limited to 'lua/plugins') diff --git a/lua/plugins/default.lua b/lua/plugins/default.lua index 36ee316..8ea602f 100644 --- a/lua/plugins/default.lua +++ b/lua/plugins/default.lua @@ -14,20 +14,6 @@ return { }, --[=[ Quality of life ]=]-- - { - "nvim-treesitter/nvim-treesitter", -- Advanced syntax parsing - build = ":TSUpdate", - opts = { - ensure_installed = "all", - ignore_install = { "liquidsoap", "norg", "tlaplus", "yaml" }, -- Can't compile - highlight = { enable = true }, - incremental_selection = { enable = true }, - textobjects = { enable = true }, - }, - config = function(_, opts) - require("nvim-treesitter.configs").setup(opts) - end, - }, { "preservim/nerdtree", -- Browse directories dependencies = { diff --git a/lua/plugins/lsp-config.lua b/lua/plugins/lsp-config.lua deleted file mode 100644 index a4caa85..0000000 --- a/lua/plugins/lsp-config.lua +++ /dev/null @@ -1,27 +0,0 @@ --- Thanks https://stackoverflow.com/a/70760302/12036073 -vim.o.updatetime = 300 -vim.diagnostic.config({ - virtual_text = false, - float = { focus = false }, -}) -vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, { callback = function(ev) - vim.diagnostic.open_float(nil) -end}) - -return { - { - "neovim/nvim-lspconfig", - enabled = false, -- Figure out config property - event = "LazyFile", - -- dependencies = { - -- "mason.nvim", - -- { "williamboman/mason-lspconfig.nvim", config = function() end }, - -- }, - opts = { - servers = { - awk_ls = { settings = {}, }, - }, - }, - setup = {}, - }, -} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua new file mode 100644 index 0000000..8144527 --- /dev/null +++ b/lua/plugins/lsp.lua @@ -0,0 +1,41 @@ +-- Thanks https://stackoverflow.com/a/70760302/12036073 +vim.o.updatetime = 300 +vim.diagnostic.config({ + virtual_text = false, + float = { focus = false }, +}) +vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, { callback = function(ev) + vim.diagnostic.open_float(nil) +end}) + +return { + { + "nvim-treesitter/nvim-treesitter", -- Advanced syntax parsing + build = ":TSUpdate", + opts = { + ensure_installed = "all", + ignore_install = { "liquidsoap", "tlaplus", "yaml" }, -- Can't compile + highlight = { enable = true }, + incremental_selection = { enable = true }, + textobjects = { enable = true }, + }, + config = function(_, opts) + require("nvim-treesitter.configs").setup(opts) + end, + }, + { + "neovim/nvim-lspconfig", + enabled = false, -- Figure out config property + event = "LazyFile", + -- dependencies = { + -- "mason.nvim", + -- { "williamboman/mason-lspconfig.nvim", config = function() end }, + -- }, + opts = { + servers = { + awk_ls = { settings = {}, }, + }, + }, + setup = {}, + }, +} -- cgit v1.3.1-23-gd82d