ringofstorms/nvim
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed damn treesitter they ahve custom setup function

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2023-07-05 14:02:11 -05:00
parent 452abf2029
commit b58786f5b4
10 changed files with 146 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lua/plugins/http_rest.lua
View file

@ -1,7 +1,7 @@
return {
"rest-nvim/rest.nvim",
event = "BufEnter *.http",
requires = { "nvim-lua/plenary.nvim" },
dependencies = { "nvim-lua/plenary.nvim" },
keys = {
{
"<leader>r",

30
lua/plugins/lsp.lua
View file

@ -71,7 +71,13 @@ return {
{
-- Autocompletion
"hrsh7th/nvim-cmp",
dependencies = { "hrsh7th/cmp-nvim-lsp", "L3MON4D3/LuaSnip", "saadparwaiz1/cmp_luasnip" },
dependencies = {
"hrsh7th/cmp-nvim-lsp",
"L3MON4D3/LuaSnip",
"saadparwaiz1/cmp_luasnip",
"hrsh7th/cmp-buffer",
"hrsh7th/cmp-path",
},
},
{
"williamboman/mason.nvim",
@ -93,7 +99,7 @@ return {
{ "folke/neodev.nvim", opts = {} },
{
"neovim/nvim-lspconfig",
after = { "nvim-telescope/telescope.nvim" },
dependencies = { "nvim-telescope/telescope.nvim" },
config = function()
local config = require("lspconfig")
local util = require("lspconfig/util")
@ -197,8 +203,24 @@ return {
end, { "i", "s" }),
}),
sources = {
{ name = "nvim_lsp" },
{ name = "luasnip" },
{ name = "nvim_lsp", priority = 8 },
{ nane = "buffer", priority = 7 },
{ name = "luasnip", priority = 6 },
{ name = "path" },
},
sorting = {
priority_weight = 1,
comparators = {
cmp.config.compare.locality,
cmp.config.compare.recently_used,
cmp.config.compare.score,
cmp.config.compare.offset,
cmp.config.compare.order,
},
},
window = {
completion = cmp.config.window.bordered(),
documentation = cmp.config.window.bordered(),
},
})
end,

2
lua/plugins/markdown_glow.lua
View file

@ -1,7 +1,7 @@
return {
"lnc3l0t/glow.nvim",
branch = "advanced_window",
config = {
opts = {
default_type = "keep",
},
cmd = "Glow",

2
lua/plugins/null-ls.lua
View file

@ -17,7 +17,7 @@ end
return {
{
"jose-elias-alvarez/null-ls.nvim",
after = { "williamboman/mason.nvim" },
dependencies = { "williamboman/mason.nvim" },
opts = function(_, config)
-- config variable is the default definitions table for the setup function call
local null_ls = require("null-ls")

2
lua/plugins/rust-tools.lua
View file

@ -1,5 +1,5 @@
return {
"simrat39/rust-tools.nvim",
event = "BufEnter *.rs",
after = { "mason-lspconfig.nvim", "inlay-hints." },
dependencies = { "mason-lspconfig.nvim", "inlay-hints." },
}

8
lua/plugins/telescope.lua
View file

@ -52,6 +52,14 @@ return {
},
},
opts = {
pickers = {
buffers = {
sort_lastused = true,
},
find_files = {
sort_lastused = true,
}
},
defaults = {
vimgrep_arguments = {
"rg",

12
lua/plugins/text-case.lua Normal file
View file

@ -0,0 +1,12 @@
return {
"johmsalas/text-case.nvim",
dependencies = "nvim-telescope/telescope.nvim",
event = "BufEnter",
config = function()
require("textcase").setup()
require("telescope").load_extension("textcase")
end,
keys = {
{ "<leader>,c", "<cmd>TextCaseOpenTelescope<cr>", desc = "Change case of selection", mode = {"n", "v"} },
},
}

149
lua/plugins/treesitter.lua
View file

@ -8,80 +8,85 @@ if output == nil or output == "" then
end
return {
"nvim-treesitter/nvim-treesitter",
dependencies = { "windwp/nvim-ts-autotag", "JoosepAlviste/nvim-ts-context-commentstring" },
build = ":TSUpdate",
event = "BufRead",
cmd = {
"TSBufDisable",
"TSBufEnable",
"TSBufToggle",
"TSDisable",
"TSEnable",
"TSToggle",
"TSInstall",
"TSInstallInfo",
"TSInstallSync",
"TSModuleInfo",
"TSUninstall",
"TSUpdate",
"TSUpdateSync",
},
opts = {
-- ensure_installed = 'all',
ensure_installed = {
"lua",
"http",
"json",
"bash",
"css",
"diff",
"dockerfile",
"dot",
"git_rebase",
"gitattributes",
"html",
"java",
"javascript",
"jq",
"jsdoc",
"json5",
"kotlin",
"latex",
"make",
"markdown",
"markdown_inline",
"nix",
"python",
"regex",
"rst",
"rust",
"scss",
"sql",
"terraform",
"toml",
"tsx",
"jsx",
"typescript",
"vue",
"yaml",
{
"nvim-treesitter/nvim-treesitter",
dependencies = { "windwp/nvim-ts-autotag", "JoosepAlviste/nvim-ts-context-commentstring" },
build = ":TSUpdate",
event = "BufRead",
cmd = {
"TSBufDisable",
"TSBufEnable",
"TSBufToggle",
"TSDisable",
"TSEnable",
"TSToggle",
"TSInstall",
"TSInstallInfo",
"TSInstallSync",
"TSModuleInfo",
"TSUninstall",
"TSUpdate",
"TSUpdateSync",
},
auto_install = auto,
highlight = {
enable = true,
use_languagetree = true,
-- disable = function(_, bufnr) return vim.api.nvim_buf_line_count(bufnr) > 10000 end,
additional_vim_regex_highlighting = false,
},
incremental_selection = { enable = true },
ident = { enable = true },
autotag = { enable = true },
context_commentstring = { enable = true, enable_autocmd = false },
rainbow = {
enable = true,
extended_mode = true,
max_file_lines = nil,
opts = {
-- https://github.com/nvim-treesitter/nvim-treesitter#supported-languages
--ensure_installed = "all",
ensure_installed = {
"lua",
"http",
"json",
"bash",
"css",
"diff",
"dockerfile",
"dot",
"git_rebase",
"gitattributes",
"html",
"java",
"javascript",
"jq",
"jsdoc",
"json5",
"kotlin",
"latex",
"make",
"markdown",
"markdown_inline",
"nix",
"python",
"regex",
"rst",
"rust",
"scss",
"sql",
"terraform",
"toml",
"tsx",
"typescript",
"vue",
"yaml",
},
auto_install = auto,
highlight = {
enable = true,
use_languagetree = true,
-- disable = function(_, bufnr) return vim.api.nvim_buf_line_count(bufnr) > 10000 end,
-- additional_vim_regex_highlighting = false,
},
incremental_selection = { enable = true },
ident = { enable = true },
autotag = { enable = true },
context_commentstring = { enable = true, enable_autocmd = false },
rainbow = {
enable = true,
extended_mode = true,
max_file_lines = nil,
},
},
config = function(_, opts)
require("nvim-treesitter.configs").setup(opts)
end,
},
"nvim-treesitter/playground",
}