From efbaa65a624a68197dcc241f55e2c03c504c7d07 Mon Sep 17 00:00:00 2001 From: Jules Sang Date: Mon, 2 Dec 2024 11:32:54 +0100 Subject: [PATCH] Fix prettier adding weird stuff to files --- lazyvim.json | 2 +- lua/plugins/colorscheme.lua | 22 +++++++++------- lua/plugins/none-ls.lua | 52 +++++++++++++++++++------------------ lua/plugins/notify.lua | 14 +++++----- lua/plugins/nvim-cmp.lua | 30 +++++++++++---------- lua/plugins/prettier.lua | 20 -------------- 6 files changed, 64 insertions(+), 76 deletions(-) delete mode 100644 lua/plugins/prettier.lua diff --git a/lazyvim.json b/lazyvim.json index 2931c81..03c62f9 100644 --- a/lazyvim.json +++ b/lazyvim.json @@ -1,6 +1,6 @@ { "extras": [ - "lazyvim.plugins.extras.coding.codeium" + ], "extras.bak": [ "lazyvim.plugins.extras.editor.leap" diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 328606c..22bcf12 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -1,10 +1,12 @@ -return { - { "Mofiqul/vscode.nvim", config = {} }, - { "catppuccin/nvim", name = "catppuccin" }, - { - "jul-o/LazyVim", - opts = { - colorscheme = "catppuccin-mocha", - }, - }, -} +return {} + +-- return { +-- { "Mofiqul/vscode.nvim", config = {} }, +-- { "catppuccin/nvim", name = "catppuccin" }, +-- { +-- "jul-o/LazyVim", +-- opts = { +-- colorscheme = "catppuccin-mocha", +-- }, +-- }, +-- } diff --git a/lua/plugins/none-ls.lua b/lua/plugins/none-ls.lua index 67eeedd..ca38a94 100644 --- a/lua/plugins/none-ls.lua +++ b/lua/plugins/none-ls.lua @@ -1,26 +1,28 @@ -local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) +return {} -return { - "nvimtools/none-ls.nvim", - opts = function(_, opts) - local nls = require("none-ls") - opts.sources = vim.list_extend(opts.sources or {}, { - nls.builtins.diagnostics.markdownlint, - }) - -- table.insert(opts.sources, nls.builtins.formatting.prettierd) - end, - config = { - on_attach = function(client, bufnr) - if client.supports_method("textDocument/formatting") then - vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) - vim.api.nvim_create_autocmd("BufWritePre", { - group = augroup, - buffer = bufnr, - callback = function() - vim.lsp.buf.format() - end, - }) - end - end, - }, -} +-- local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) +-- +-- return { +-- "nvimtools/none-ls.nvim", +-- opts = function(_, opts) +-- local nls = require("none-ls") +-- opts.sources = vim.list_extend(opts.sources or {}, { +-- nls.builtins.diagnostics.markdownlint, +-- }) +-- -- table.insert(opts.sources, nls.builtins.formatting.prettierd) +-- end, +-- config = { +-- on_attach = function(client, bufnr) +-- if client.supports_method("textDocument/formatting") then +-- vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) +-- vim.api.nvim_create_autocmd("BufWritePre", { +-- group = augroup, +-- buffer = bufnr, +-- callback = function() +-- vim.lsp.buf.format() +-- end, +-- }) +-- end +-- end, +-- }, +-- } diff --git a/lua/plugins/notify.lua b/lua/plugins/notify.lua index 264fcd2..a7e50d9 100644 --- a/lua/plugins/notify.lua +++ b/lua/plugins/notify.lua @@ -1,6 +1,8 @@ -return { - "rcarriga/nvim-notify", - keys = { - { "", require("notify").dismiss }, - }, -} +return {} + +-- return { +-- "rcarriga/nvim-notify", +-- keys = { +-- { "", require("notify").dismiss }, +-- }, +-- } diff --git a/lua/plugins/nvim-cmp.lua b/lua/plugins/nvim-cmp.lua index 65bc924..2574e93 100644 --- a/lua/plugins/nvim-cmp.lua +++ b/lua/plugins/nvim-cmp.lua @@ -1,14 +1,16 @@ -return { - "hrsh7th/nvim-cmp", - dependencies = { - { "roobert/tailwindcss-colorizer-cmp.nvim", config = true }, - }, - opts = function(_, opts) - -- original LazyVim kind icon formatter - local format_kinds = opts.formatting.format - opts.formatting.format = function(entry, item) - format_kinds(entry, item) -- add icons - return require("tailwindcss-colorizer-cmp").formatter(entry, item) - end - end, -} +return {} + +-- return { +-- "hrsh7th/nvim-cmp", +-- dependencies = { +-- { "roobert/tailwindcss-colorizer-cmp.nvim", config = true }, +-- }, +-- opts = function(_, opts) +-- -- original LazyVim kind icon formatter +-- local format_kinds = opts.formatting.format +-- opts.formatting.format = function(entry, item) +-- format_kinds(entry, item) -- add icons +-- return require("tailwindcss-colorizer-cmp").formatter(entry, item) +-- end +-- end, +-- } diff --git a/lua/plugins/prettier.lua b/lua/plugins/prettier.lua deleted file mode 100644 index 0fb82fe..0000000 --- a/lua/plugins/prettier.lua +++ /dev/null @@ -1,20 +0,0 @@ -return { - "MunifTanjim/prettier.nvim", - config = { - bin = "prettier", -- or `'prettierd'` (v0.23.3+) - filetypes = { - "css", - "graphql", - "html", - "javascript", - "javascriptreact", - "json", - "less", - "markdown", - "scss", - "typescript", - "typescriptreact", - "yaml", - }, - }, -}