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

updating dependencies

Browse source
This commit is contained in:
RingOfStorms (Josh) 2024-09-21 17:18:15 -05:00
parent fcf9595091
commit 9ddc54e493
5 changed files with 158 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lua/plugins/editor_lua_line.lua
View file

@ -13,7 +13,7 @@ local function langs()
local out = nil
if client.name == "pyright" then
out = vim.fn.system({ "python", "-V" })
elseif client.name == "tsserver" then
elseif client.name == "tsserver" or client.name == "ts_ls" then
out = "node " .. vim.fn.system({ "node", "--version" })
end
if out ~= nil and out ~= "" then

10
lua/plugins/lsp.lua
View file

@ -60,7 +60,7 @@ return {
group = vim.api.nvim_create_augroup("myconfig-lsp-detach", { clear = true }),
callback = function(event)
vim.lsp.buf.clear_references()
vim.api.nvim_clear_autocmds({ group = "myconfig-lsp-highlight", buffer = event.buf })
-- vim.api.nvim_clear_autocmds({ group = "myconfig-lsp-highlight", buffer = event.buf })
end,
})
@ -112,7 +112,13 @@ return {
},
rust_analyzer = {},
nil_ls = {},
tsserver = {
-- tsserver = {
-- -- typescript/javascript
-- implicitProjectConfiguration = {
-- checkJs = true,
-- },
-- },
ts_ls = {
-- typescript/javascript
implicitProjectConfiguration = {
checkJs = true,

2
lua/plugins/session.lua
View file

@ -2,7 +2,7 @@ return {
"rmagatti/auto-session",
lazy = false,
init = function()
vim.o.sessionoptions = "blank,buffers,curdir,folds,tabpages,winsize,winpos,terminal"
vim.o.sessionoptions = "blank,buffers,curdir,folds,tabpages,winsize,winpos,terminal,localoptions,help"
end,
opts = {
auto_session_use_git_branch = true,

113
lua/plugins/treesitter.lua
View file

@ -1,57 +1,60 @@
return {
"nvim-treesitter/nvim-treesitter",
dependencies = { "windwp/nvim-ts-autotag", "JoosepAlviste/nvim-ts-context-commentstring" },
init = function()
U.cmd_executable("tree-sitter", {
[false] = function()
vim.notify("tree-sitter not installed, code syntax will be broken.", 2)
end,
})
end,
event = "BufRead",
cmd = {
"TSBufDisable",
"TSBufEnable",
"TSBufToggle",
"TSDisable",
"TSEnable",
"TSToggle",
"TSInstall",
"TSInstallInfo",
"TSInstallSync",
"TSModuleInfo",
"TSUninstall",
"TSUpdate",
"TSUpdateSync",
},
opts = function()
local nonNixOpts = {}
if not NIX then
nonNixOpts = {
ensure_installed = "all",
auto_install = true,
}
end
return U.assign({
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 },
rainbow = {
enable = true,
extended_mode = true,
max_file_lines = nil,
},
}, nonNixOpts)
end,
config = function(_, opts)
require("nvim-treesitter.configs").setup(opts)
end,
"nvim-treesitter/nvim-treesitter",
dependencies = { "windwp/nvim-ts-autotag", "JoosepAlviste/nvim-ts-context-commentstring" },
init = function()
U.cmd_executable("tree-sitter", {
[false] = function()
vim.notify("tree-sitter not installed, code syntax will be broken.", 2)
end,
})
end,
event = "BufRead",
cmd = {
"TSBufDisable",
"TSBufEnable",
"TSBufToggle",
"TSDisable",
"TSEnable",
"TSToggle",
"TSInstall",
"TSInstallInfo",
"TSInstallSync",
"TSModuleInfo",
"TSUninstall",
"TSUpdate",
"TSUpdateSync",
},
opts = function()
local nonNixOpts = {}
if not NIX then
nonNixOpts = {
ensure_installed = "all",
auto_install = true,
}
end
return U.assign({
highlight = {
enable = true,
use_languagetree = true,
disable = function(lang, bufnr)
if lang == "sql" then
return true
end
return vim.api.nvim_buf_line_count(bufnr) > 4000
end,
additional_vim_regex_highlighting = false,
},
incremental_selection = { enable = true },
ident = { enable = true },
autotag = { enable = true },
rainbow = {
enable = true,
extended_mode = true,
max_file_lines = nil,
},
}, nonNixOpts)
end,
config = function(_, opts)
require("nvim-treesitter.configs").setup(opts)
end,
}