From 30511c1c8986ba78fdd0a785d7099a24dd30cc33 Mon Sep 17 00:00:00 2001 From: rajvatsal Date: Fri, 5 Jan 2024 18:02:10 +0530 Subject: [PATCH] feat(none-ls): Add prettier In defaults.lua change 'opt' to 'go' Fix catppuccin colorscheme --- after/plugin/defaults.lua | 8 ++++---- lua/custom/plugins/colorschemes.lua | 5 ++--- lua/custom/plugins/none-ls.lua | 3 +++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/after/plugin/defaults.lua b/after/plugin/defaults.lua index da4c8cc6..58322690 100644 --- a/after/plugin/defaults.lua +++ b/after/plugin/defaults.lua @@ -1,8 +1,8 @@ -vim.opt.tabstop = 2 -vim.opt.shiftwidth = 2 -vim.opt.expandtab = true +vim.go.tabstop = 2 +vim.go.shiftwidth = 2 +vim.go.expandtab = true vim.bo.softtabstop = 2 -vim.opt.relativenumber = true +vim.go.relativenumber = true vim.keymap.set('t', '', [[]], { noremap = true }) vim.cmd.colorscheme 'gruvbox' -- Set custom colorscheme [[ NOTE: Never set it to "onedark" cuz it breaks the editor ]] diff --git a/lua/custom/plugins/colorschemes.lua b/lua/custom/plugins/colorschemes.lua index 81ece87f..91a25378 100644 --- a/lua/custom/plugins/colorschemes.lua +++ b/lua/custom/plugins/colorschemes.lua @@ -3,8 +3,7 @@ return { { "ellisonleao/gruvbox.nvim", priority = 1000, config = true, opts = ... }, --tokyonight colorscheme - { - "folke/tokyonight.nvim", priority = 1000 }, + { "folke/tokyonight.nvim", priority = 1000 }, -- lunar-vim colorschemes { "lunarvim/colorschemes", priority = 1000 }, @@ -13,7 +12,7 @@ return { { "rebelot/kanagawa.nvim", priority = 1000 }, -- latte, frappe, macchiato, mocha - { "catppuccin/catppuccin", priority = 1000, }, + { "catppuccin/catppuccin", priority = 1000, }, -- Theme inspired by Atom { 'navarasu/onedark.nvim', priority = 1000, }, diff --git a/lua/custom/plugins/none-ls.lua b/lua/custom/plugins/none-ls.lua index c2d8c017..dcc27f37 100644 --- a/lua/custom/plugins/none-ls.lua +++ b/lua/custom/plugins/none-ls.lua @@ -6,6 +6,9 @@ return { null_ls.setup({ sources = { null_ls.builtins.formatting.stylua, + null_ls.builtins.formatting.prettier.with({ + disabled_filetypes = { 'javascript', 'typescript', 'json' } -- Use biome + }), null_ls.builtins.formatting.biome, null_ls.builtins.diagnostics.biome, }