diff --git a/lua/cosmic/config/examples/config.lua b/lua/cosmic/config/examples/config.lua index a267b50..752df61 100644 --- a/lua/cosmic/config/examples/config.lua +++ b/lua/cosmic/config/examples/config.lua @@ -19,8 +19,8 @@ local config = { 'rust_analyzer', }, - -- See Cosmic defaults lsp/providers/null_ls.lua and https://github.com/jose-elias-alvarez/null-ls.nvim/ - -- If adding additional sources, be sure to also copy the defaults that you would like to preserve from lsp/providers/null_ls.lua + -- See Cosmic defaults cosmic/plugins/null-ls/init.lua and https://github.com/jose-elias-alvarez/null-ls.nvim/ + -- If adding additional sources, be sure to also copy the defaults that you would like to preserve from cosmic/plugins/null-ls/init.lua null_ls = { -- Disable default list of sources provided by CosmicNvim default_cosmic_sources = false, diff --git a/lua/cosmic/lsp/providers/defaults.lua b/lua/cosmic/lsp/servers/defaults.lua similarity index 100% rename from lua/cosmic/lsp/providers/defaults.lua rename to lua/cosmic/lsp/servers/defaults.lua diff --git a/lua/cosmic/lsp/providers/eslint.lua b/lua/cosmic/lsp/servers/eslint.lua similarity index 86% rename from lua/cosmic/lsp/providers/eslint.lua rename to lua/cosmic/lsp/servers/eslint.lua index 199044b..cb0eb91 100644 --- a/lua/cosmic/lsp/providers/eslint.lua +++ b/lua/cosmic/lsp/servers/eslint.lua @@ -1,4 +1,4 @@ -local defaults = require('cosmic.lsp.providers.defaults') +local defaults = require('cosmic.lsp.servers.defaults') local can_format_on_save = require('cosmic.utils.lsp').can_format_on_save return { on_attach = function(client, bufnr) diff --git a/lua/cosmic/lsp/providers/jsonls.lua b/lua/cosmic/lsp/servers/jsonls.lua similarity index 100% rename from lua/cosmic/lsp/providers/jsonls.lua rename to lua/cosmic/lsp/servers/jsonls.lua diff --git a/lua/cosmic/lsp/providers/lua_ls.lua b/lua/cosmic/lsp/servers/lua_ls.lua similarity index 100% rename from lua/cosmic/lsp/providers/lua_ls.lua rename to lua/cosmic/lsp/servers/lua_ls.lua diff --git a/lua/cosmic/lsp/providers/pyright.lua b/lua/cosmic/lsp/servers/pyright.lua similarity index 100% rename from lua/cosmic/lsp/providers/pyright.lua rename to lua/cosmic/lsp/servers/pyright.lua diff --git a/lua/cosmic/lsp/providers/tsserver.lua b/lua/cosmic/lsp/servers/tsserver.lua similarity index 100% rename from lua/cosmic/lsp/providers/tsserver.lua rename to lua/cosmic/lsp/servers/tsserver.lua diff --git a/lua/cosmic/plugins/mason-lspconfig/init.lua b/lua/cosmic/plugins/mason-lspconfig/init.lua index 14e41ae..ab292e6 100644 --- a/lua/cosmic/plugins/mason-lspconfig/init.lua +++ b/lua/cosmic/plugins/mason-lspconfig/init.lua @@ -13,14 +13,14 @@ return { -- set up lsp servers local u = require('cosmic.utils') - local default_config = require('cosmic.lsp.providers.defaults') + local default_config = require('cosmic.lsp.servers.defaults') local lspconfig = require('lspconfig') local start_server = function(server) local server_config = default_config -- set up default cosmic options - local ok, cosmic_server_config = pcall('cosmic.lsp.providers.' .. server) + local ok, cosmic_server_config = pcall('cosmic.lsp.servers.' .. server) if ok then server_config = u.merge(server_config, cosmic_server_config) end diff --git a/lua/cosmic/plugins/null-ls/init.lua b/lua/cosmic/plugins/null-ls/init.lua index 24366b7..8260039 100644 --- a/lua/cosmic/plugins/null-ls/init.lua +++ b/lua/cosmic/plugins/null-ls/init.lua @@ -8,7 +8,7 @@ return { 'gbprod/none-ls-shellcheck.nvim', }, config = function() - local defaults = require('cosmic.lsp.providers.defaults') + local defaults = require('cosmic.lsp.servers.defaults') local null_ls = require('null-ls') local config_opts = u.merge({ default_cosmic_sources = true,