diff --git a/init.lua b/init.lua index b98ffc61..61df1a3b 100644 --- a/init.lua +++ b/init.lua @@ -681,9 +681,11 @@ require('lazy').setup({ -- https://github.com/pmizio/typescript-tools.nvim -- -- But for many setups, the LSP (`ts_ls`) will work just fine - -- ts_ls = {}, + vtsls = {}, -- + prettier = {}, + prettierd = {}, lua_ls = { -- cmd = { ... }, -- filetypes = { ... }, @@ -761,18 +763,20 @@ require('lazy').setup({ return nil else return { - timeout_ms = 500, + timeout_ms = 2000, lsp_format = 'fallback', } end end, formatters_by_ft = { lua = { 'stylua' }, + xml = { 'prettier' }, + html = { 'prettier' }, -- Conform can also run multiple formatters sequentially -- python = { "isort", "black" }, -- -- You can use 'stop_after_first' to run the first available formatter from the list - -- javascript = { "prettierd", "prettier", stop_after_first = true }, + javascript = { 'prettierd', 'prettier', stop_after_first = true }, }, }, }, @@ -881,20 +885,19 @@ require('lazy').setup({ -- change the command in the config to whatever the name of that colorscheme is. -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'folke/tokyonight.nvim', + 'catppuccin/nvim', + name = 'catppuccin', priority = 1000, -- Make sure to load this before all the other start plugins. config = function() ---@diagnostic disable-next-line: missing-fields - require('tokyonight').setup { - styles = { - comments = { italic = false }, -- Disable italics in comments - }, + require('catppuccin').setup { + transparent_background = true, } -- Load the colorscheme here. -- Like many other themes, this one has different styles, and you could load -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'tokyonight-night' + vim.cmd.colorscheme 'catppuccin-latte' end, },