Skip to content

Commit

Permalink
rm mason.ensure_installed & clean some conf
Browse files Browse the repository at this point in the history
  • Loading branch information
siduck committed Jul 29, 2024
1 parent 41c5b46 commit 8f4b09e
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 35 deletions.
2 changes: 1 addition & 1 deletion lua/chadrc.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
---@type ChadrcConfig
local M = {}

M.ui = {
M.base46 = {
theme = "onedark",

-- hl_override = {
Expand Down
2 changes: 1 addition & 1 deletion lua/configs/conform.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ local options = {
-- },
}

require("conform").setup(options)
return options
27 changes: 14 additions & 13 deletions lua/configs/lspconfig.lua
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
-- EXAMPLE
local on_attach = require("nvchad.configs.lspconfig").on_attach
local on_init = require("nvchad.configs.lspconfig").on_init
local capabilities = require("nvchad.configs.lspconfig").capabilities
-- load defaults i.e lua_lsp
require("nvchad.configs.lspconfig").defaults()

local lspconfig = require "lspconfig"

-- EXAMPLE
local servers = { "html", "cssls" }
local nvlsp = require "nvchad.configs.lspconfig"

-- lsps with default config
for _, lsp in ipairs(servers) do
lspconfig[lsp].setup {
on_attach = on_attach,
on_init = on_init,
capabilities = capabilities,
on_attach = nvlsp.on_attach,
on_init = nvlsp.on_init,
capabilities = nvlsp.capabilities,
}
end

-- typescript
lspconfig.tsserver.setup {
on_attach = on_attach,
on_init = on_init,
capabilities = capabilities,
}
-- configuring single server, example: typescript
-- lspconfig.tsserver.setup {
-- on_attach = on_attach,

This comment has been minimized.

Copy link
@mikemcgowan

mikemcgowan Jul 30, 2024

Wouldn't this now also need to be changed to nvlsp.on_attach?

This comment has been minimized.

Copy link
@siduck

siduck Jul 30, 2024

Author Member

@mikemcgowan absolutely! updated it.

-- on_init = on_init,
-- capabilities = capabilities,
-- }
27 changes: 7 additions & 20 deletions lua/plugins/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,17 @@ return {
{
"stevearc/conform.nvim",
-- event = 'BufWritePre', -- uncomment for format on save
opts = require "configs.conform",
},

-- These are some examples, uncomment them if you want to see them work!
{
"neovim/nvim-lspconfig",
config = function()
require "configs.conform"
require "configs.lspconfig"
end,
},

-- These are some examples, uncomment them if you want to see them work!
-- {
-- "neovim/nvim-lspconfig",
-- config = function()
-- require("nvchad.configs.lspconfig").defaults()
-- require "configs.lspconfig"
-- end,
-- },
--
-- {
-- "williamboman/mason.nvim",
-- opts = {
-- ensure_installed = {
-- "lua-language-server", "stylua",
-- "html-lsp", "css-lsp" , "prettier"
-- },
-- },
-- },
--
-- {
-- "nvim-treesitter/nvim-treesitter",
-- opts = {
Expand Down

0 comments on commit 8f4b09e

Please sign in to comment.