From ba90f7398b34736f1ace01b0af90dff795fca8fb Mon Sep 17 00:00:00 2001 From: Hsieh Chin Fan Date: Tue, 25 Jun 2024 19:07:43 +0800 Subject: Update --- vim/lua/configs/conform.lua | 3 ++- vim/lua/plugins/init.lua | 23 +++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) (limited to 'vim') diff --git a/vim/lua/configs/conform.lua b/vim/lua/configs/conform.lua index 3553caf..1b6683b 100644 --- a/vim/lua/configs/conform.lua +++ b/vim/lua/configs/conform.lua @@ -3,7 +3,8 @@ local options = { lua = { "stylua" }, css = { "prettier" }, html = { "prettier" }, - markdown = { "prettier" } + markdown = { "prettier" }, + sh = {"shfmt"}, }, -- format_on_save = { diff --git a/vim/lua/plugins/init.lua b/vim/lua/plugins/init.lua index 2342d18..12f74f8 100644 --- a/vim/lua/plugins/init.lua +++ b/vim/lua/plugins/init.lua @@ -194,22 +194,25 @@ return { -- } -- }, - -- 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, - -- }, + { + "neovim/nvim-lspconfig", + lazy = false, + config = function() + require("nvchad.configs.lspconfig").defaults() + require "configs.lspconfig" + end, + }, -- { "williamboman/mason.nvim", opts = { automatically_installation = true, ensure_installed = { - "lua-language-server", "stylua", - "html-lsp", "css-lsp", "prettier" + "css-lsp", + "html-lsp", + "lua-language-server", + "prettier", + "stylua", }, }, }, -- cgit v1.2.3-70-g09d2