removed treesitter rainbow

This commit is contained in:
2023-08-01 01:57:27 -05:00
parent 4ce78578a2
commit 35f1a56b60
3 changed files with 123 additions and 95 deletions
+1
View File
@@ -0,0 +1 @@
require("helpers").set_tab(4)
+36 -17
View File
@@ -184,16 +184,15 @@ end
function M.nvim_treesitter() function M.nvim_treesitter()
local highlight_disable = { local highlight_disable = {
--tsx = true,
cpp = true, cpp = true,
--javascript = true,
} }
local rainbow_disable = vim.tbl_extend("force", highlight_disable, { --local rainbow_disable = vim.tbl_extend("force", highlight_disable, {
html = true, -- html = true,
javascript = true, -- typescript = true,
typescript = true, -- tsx = true,
--svelte = true, -- svelte = true,
query = true, --})
})
local too_many_lines = function(bufnr) local too_many_lines = function(bufnr)
return vim.api.nvim_buf_line_count(bufnr) > 5000 return vim.api.nvim_buf_line_count(bufnr) > 5000
@@ -210,7 +209,8 @@ function M.nvim_treesitter()
"svelte", "svelte",
"vim", "vim",
"css", "css",
"scheme", "html",
"query",
}, },
highlight = { highlight = {
enable = true, enable = true,
@@ -219,14 +219,14 @@ function M.nvim_treesitter()
end, end,
--additional_vim_regex_highlighting = { "htmldjango", "html" }, --additional_vim_regex_highlighting = { "htmldjango", "html" },
}, },
rainbow = { --rainbow = {
enable = true, -- enable = true,
disable = function(lang, bufnr) -- disable = function(lang, bufnr)
return rainbow_disable[lang] or too_many_lines(bufnr) -- return rainbow_disable[lang] or too_many_lines(bufnr)
end, -- end,
extended_mode = false, -- extended_mode = false,
max_file_lines = nil, -- max_file_lines = nil,
}, --},
indent = { indent = {
enable = true, enable = true,
}, },
@@ -324,6 +324,10 @@ function M.null_ls()
-- null_ls.builtins.formatting.sqlfluff.with(sqlfluff_args), -- null_ls.builtins.formatting.sqlfluff.with(sqlfluff_args),
-- null_ls.builtins.formatting.sqlfmt, -- null_ls.builtins.formatting.sqlfmt,
null_ls.builtins.formatting.sql_formatter, null_ls.builtins.formatting.sql_formatter,
-- elixir
null_ls.builtins.diagnostics.credo,
null_ls.builtins.formatting.mix,
} }
null_ls.setup({ null_ls.setup({
sources = sources, sources = sources,
@@ -410,6 +414,21 @@ function M.lsp_zero()
local lsp = require("lsp-zero") local lsp = require("lsp-zero")
lsp.preset("recommended") lsp.preset("recommended")
lsp.ensure_installed({
"pyright",
"lua_ls",
"bashls",
"gopls",
-- js web shit
"html",
"cssls",
"tsserver",
"svelte",
"angularls",
"tailwindcss",
})
lsp.configure("pyright", { lsp.configure("pyright", {
root_dir = lsp_config_defaults().root_dir, root_dir = lsp_config_defaults().root_dir,
}) })
+86 -78
View File
@@ -1,95 +1,103 @@
require("packer").startup(function(use) require("packer").startup(function(use)
use("wbthomason/packer.nvim") use("wbthomason/packer.nvim")
-- NAVIGATION -- NAVIGATION
use("phaazon/hop.nvim") use("phaazon/hop.nvim")
-- VIM THEMING -- VIM THEMING
--use("navarasu/onedark.nvim") --use("navarasu/onedark.nvim")
use("folke/tokyonight.nvim") use("folke/tokyonight.nvim")
-- FILE MANAGEMENT -- FILE MANAGEMENT
use("junegunn/fzf") use("junegunn/fzf")
use("junegunn/fzf.vim") use("junegunn/fzf.vim")
use("kevinhwang91/rnvimr") use("kevinhwang91/rnvimr")
use("vijaymarupudi/nvim-fzf") use("vijaymarupudi/nvim-fzf")
use("vijaymarupudi/nvim-fzf-commands") use("vijaymarupudi/nvim-fzf-commands")
-- SESSION -- SESSION
use("ThePrimeagen/harpoon") use("ThePrimeagen/harpoon")
use("nvim-lua/plenary.nvim") use("nvim-lua/plenary.nvim")
use("rmagatti/auto-session") use({
use("mbbill/undotree") "rmagatti/auto-session",
config = function()
require("auto-session").setup({
log_level = "error",
auto_session_suppress_dirs = { "~/", "~/Projects", "~/Downloads", "/" },
})
end,
})
use("mbbill/undotree")
-- GIT -- GIT
use("tpope/vim-fugitive") use("tpope/vim-fugitive")
use("stsewd/fzf-checkout.vim") use("stsewd/fzf-checkout.vim")
use("lewis6991/gitsigns.nvim") use("lewis6991/gitsigns.nvim")
-- EDITOR -- EDITOR
use("lukas-reineke/indent-blankline.nvim") use("lukas-reineke/indent-blankline.nvim")
use({ use({
"nvim-lualine/lualine.nvim", "nvim-lualine/lualine.nvim",
requires = { "kyazdani42/nvim-web-devicons", opt = true }, requires = { "kyazdani42/nvim-web-devicons", opt = true },
}) })
-- SNIPPETS -- SNIPPETS
--use("SirVer/ultisnips") --use("SirVer/ultisnips")
--use("honza/vim-snippets") --use("honza/vim-snippets")
--use("L3MON4D3/LuaSnip") -- Snippets plugin --use("L3MON4D3/LuaSnip") -- Snippets plugin
-- LSP -- LSP
use("p00f/nvim-ts-rainbow") --use("p00f/nvim-ts-rainbow")
use({ use({
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
run = ":TSUpdate", run = ":TSUpdate",
}) })
use("nvim-treesitter/nvim-treesitter-context") use("nvim-treesitter/nvim-treesitter-context")
use("nvim-treesitter/playground") use("nvim-treesitter/playground")
use("jose-elias-alvarez/null-ls.nvim") use("jose-elias-alvarez/null-ls.nvim")
use("windwp/nvim-autopairs") use("windwp/nvim-autopairs")
--use("neovim/nvim-lspconfig") --use("neovim/nvim-lspconfig")
--use("williamboman/nvim-lsp-installer") --use("williamboman/nvim-lsp-installer")
--use("jose-elias-alvarez/nvim-lsp-ts-utils") --use("jose-elias-alvarez/nvim-lsp-ts-utils")
--use({ --use({
-- "hrsh7th/cmp-nvim-lsp", -- "hrsh7th/cmp-nvim-lsp",
-- requires = "quangnguyen30192/cmp-nvim-ultisnips", -- requires = "quangnguyen30192/cmp-nvim-ultisnips",
--}) --})
--use("hrsh7th/nvim-cmp") --use("hrsh7th/nvim-cmp")
use({ use({
"VonHeikemen/lsp-zero.nvim", "VonHeikemen/lsp-zero.nvim",
branch = "v1.x", branch = "v1.x",
requires = { requires = {
-- LSP Support -- LSP Support
{ "neovim/nvim-lspconfig" }, -- Required { "neovim/nvim-lspconfig" }, -- Required
{ "williamboman/mason.nvim" }, -- Optional { "williamboman/mason.nvim" }, -- Optional
{ "williamboman/mason-lspconfig.nvim" }, -- Optional { "williamboman/mason-lspconfig.nvim" }, -- Optional
-- Autocompletion -- Autocompletion
{ "hrsh7th/nvim-cmp" }, -- Required { "hrsh7th/nvim-cmp" }, -- Required
{ "hrsh7th/cmp-nvim-lsp" }, -- Required { "hrsh7th/cmp-nvim-lsp" }, -- Required
{ "hrsh7th/cmp-buffer" }, -- Optional { "hrsh7th/cmp-buffer" }, -- Optional
{ "hrsh7th/cmp-path" }, -- Optional { "hrsh7th/cmp-path" }, -- Optional
{ "saadparwaiz1/cmp_luasnip" }, -- Optional { "saadparwaiz1/cmp_luasnip" }, -- Optional
{ "hrsh7th/cmp-nvim-lua" }, -- Optional { "hrsh7th/cmp-nvim-lua" }, -- Optional
-- Snippets -- Snippets
{ "L3MON4D3/LuaSnip" }, -- Required { "L3MON4D3/LuaSnip" }, -- Required
{ "rafamadriz/friendly-snippets" }, -- Optional { "rafamadriz/friendly-snippets" }, -- Optional
}, },
}) })
-- JS -- JS
use("HerringtonDarkholme/yats.vim") use("HerringtonDarkholme/yats.vim")
use("chemzqm/vim-jsx-improve") use("chemzqm/vim-jsx-improve")
use("yuezk/vim-js") -- js use("yuezk/vim-js") -- js
use("maxmellon/vim-jsx-pretty") -- react/tsx syntax highlight & indent use("maxmellon/vim-jsx-pretty") -- react/tsx syntax highlight & indent
-- HTML/CSS -- HTML/CSS
use("mattn/emmet-vim") use("mattn/emmet-vim")
-- ZIG -- ZIG
use("ziglang/zig.vim") use("ziglang/zig.vim")
end) end)