Nvim: update treesitter and use themify

This commit is contained in:
Robert Kmieć
2024-09-06 09:36:15 +02:00
parent 801ba0dfdf
commit fcecb7f575
8 changed files with 75 additions and 206 deletions

View File

@@ -73,7 +73,7 @@ vim.opt.cmdheight = 1
-- Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable
-- delays and poor user experience.
--vim.opt.updatetime = 300
vim.opt.updatetime = 300
-- Don't pass messages to |ins-completion-menu|.
vim.opt.shortmess:append('c')

View File

@@ -5,7 +5,7 @@ if not vim.loop.fs_stat(lazypath) then
"clone",
"--filter=blob:none",
"https://github.com/folke/lazy.nvim.git",
"--branch=stable", -- latest stable release
--"--branch=stable", -- latest stable release
lazypath,
})
end
@@ -18,5 +18,8 @@ require'lazy'.setup('plugins', {
change_detection = {
enabled = true,
notify = false
},
dev = {
path = '/home/kmcr'
}
})

View File

@@ -1,162 +1,35 @@
return {{
"xero/miasma.nvim",
return {
'lmantw/themify.nvim',
lazy = false,
priority = 1000,
priority = 999,
config = function()
--vim.cmd("colorscheme miasma")
end,
},
{
"wuelnerdotexe/vim-enfocado",
lazy = false,
priority = 1000,
config = function()
--vim.cmd.colorscheme('enfocado')
end
},
{
"fenetikm/falcon",
lazy = false,
priority = 1000,
config = function()
--vim.cmd.colorscheme('falcon')
end
},
{
"casr/vim-colors-reference",
lazy = false,
priority = 1000,
config = function()
--vim.cmd.colorscheme('reference')
end
},
{
"blazkowolf/gruber-darker.nvim",
lazy = false,
priority = 1000,
config = function()
--vim.cmd.colorscheme('gruber-darker')
end
},
{
"rebelot/kanagawa.nvim",
lazy = false,
priority = 1000,
config = function()
--vim.cmd.colorscheme('kanagawa')
end
},
{
"jaredgorski/spacecamp",
lazy = false,
priority = 1000,
config = function()
--vim.cmd.colorscheme('spacecamp')
end
},
{
"lifepillar/vim-gruvbox8",
lazy = false,
priority = 1000,
config = function()
--vim.cmd.colorscheme('gruvbox8')
end
},
{
"marko-cerovac/material.nvim",
lazy = false,
priority = 1000,
config = function()
--vim.cmd.colorscheme('material')
end
},
{
"srcery-colors/srcery-vim",
lazy = false,
priority = 1000,
config = function()
--vim.cmd.colorscheme('srcery')
end
},
{
"tanvirtin/monokai.nvim",
lazy = false,
priority = 1000,
config = function()
--vim.cmd.colorscheme('monokai')
end
},
{
"dasupradyumna/midnight.nvim",
lazy = false,
priority = 1000,
config = function()
vim.cmd.colorscheme('midnight')
end
},
{
"bluz71/vim-moonfly-colors",
lazy = false,
priority = 1000,
config = function()
--vim.cmd.colorscheme('moonfly')
end
},
{
"kuznetsss/meadow.nvim",
lazy = false,
priority = 1000,
config = function()
-- require('meadow').setup()
-- vim.cmd.colorscheme('meadow')
-- vim.cmd [[ hi! Conceal guibg=black ]]
end
},
{
"kepano/flexoki-neovim",
lazy = false,
priority = 1000,
config = function()
--vim.cmd.colorscheme('flexoki-dark')
end
},
{
"https://gitlab.com/bartekjaszczak/distinct-nvim",
lazy = false,
priority = 1000,
config = function()
-- require("distinct").setup({
-- doc_comments_different_color = true, -- Use different colour for documentation comments
-- })
-- vim.cmd.colorscheme('distinct')
end
},
{
'kevinm6/kurayami.nvim',
lazy = false,
priority = 1000,
config = function()
--vim.cmd.colorscheme('kurayami')
end
},
{
'gerardbm/vim-atomic',
lazy = false,
priority = 1000,
config = function()
--vim.cmd.colorscheme('atomic')
end
},
{
'fynnfluegge/monet.nvim',
config = function()
--vim.cmd.colorscheme('atomic')
end
},
{
'sho-87/kanagawa-paper.nvim',
config = function()
--vim.cmd.colorscheme('kanagawa-paper')
require('themify').setup({
"xero/miasma.nvim",
"wuelnerdotexe/vim-enfocado",
"fenetikm/falcon",
"casr/vim-colors-reference",
"blazkowolf/gruber-darker.nvim",
"rebelot/kanagawa.nvim",
"jaredgorski/spacecamp",
"lifepillar/vim-gruvbox8",
"marko-cerovac/material.nvim",
"srcery-colors/srcery-vim",
"tanvirtin/monokai.nvim",
"dasupradyumna/midnight.nvim",
"bluz71/vim-moonfly-colors",
"kuznetsss/meadow.nvim",
"kepano/flexoki-neovim",
{
url = "https://gitlab.com/bartekjaszczak/distinct-nvim",
},
'kevinm6/kurayami.nvim',
'gerardbm/vim-atomic',
'fynnfluegge/monet.nvim',
'sho-87/kanagawa-paper.nvim',
'qaptoR-nvim/chocolatier.nvim',
'default'
})
end
}
}

View File

@@ -1,27 +0,0 @@
return {
"luckasRanarison/nvim-devdocs",
dependencies = {
"nvim-lua/plenary.nvim",
"nvim-telescope/telescope.nvim",
"nvim-treesitter/nvim-treesitter",
},
opts = {
dir_path = vim.fn.stdpath("data") .. "/devdocs", -- installation directory
telescope = {}, -- passed to the telescope picker
float_win = { -- passed to nvim_open_win(), see :h api-floatwin
relative = "editor",
height = 25,
width = 100,
border = "rounded",
},
wrap = true, -- text wrap, only applies to floating window
previewer_cmd = nil, -- for example: "glow"
cmd_args = {}, -- example using glow: { "-s", "dark", "-w", "80" }
cmd_ignore = {}, -- ignore cmd rendering for the listed docs
picker_cmd = false, -- use cmd previewer in picker preview
picker_cmd_args = {}, -- example using glow: { "-p" }
ensure_installed = nil, -- get automatically installed
after_open = function(bufnr) end, -- callback that runs after the Devdocs window is opened. Devdocs buffer ID will be passed in
},
event = "VeryLazy"
}

View File

@@ -1,4 +1,14 @@
return {
'glacambre/firenvim',
build = ":call firenvim#install(0)"
build = ":call firenvim#install(0)",
config = function()
vim.api.nvim_create_autocmd({'UIEnter'}, {
callback = function(event)
local client = vim.api.nvim_get_chan_info(vim.v.event.chan).client
if client ~= nil and client.name == "Firenvim" then
vim.o.laststatus = 0
end
end
})
end
}

View File

@@ -5,13 +5,14 @@ return {
-- "SmiteshP/nvim-navbuddy",
"jubnzv/virtual-types.nvim",
--"ray-x/lsp_signature.nvim",
'sontungexpt/better-diagnostic-virtual-text',
{url = "http://git.sr.ht/~p00f/clangd_extensions.nvim"},
},
config = function()
local nvim_lsp = require('lspconfig')
require('clangd_extensions').setup({
inlay_hints = {
inline = true,
inline = false,
-- Options other than `highlight' and `priority' only work
-- if `inline' is disabled
-- Only show inlay hints for the current line
@@ -126,6 +127,7 @@ return {
-- })
require("clangd_extensions.inlay_hints").setup_autocmd()
require("clangd_extensions.inlay_hints").set_inlay_hints()
require("better-diagnostic-virtual-text.api").setup_buf(ev.buf, {})
local signs = {
{ name = "DiagnosticSignError", text = "" },

View File

@@ -17,5 +17,9 @@ return { {
-- WARN
toc_format = '%s- [%s](<%s#%s>)',
}
},
}, {
'SCJangra/table-nvim',
ft = 'markdown',
opts = {},
}
} }

View File

@@ -7,23 +7,15 @@ return {
--"nvim-treesitter/playground",
},
build = ':TSUpdate',
config = function()
opts = function()
-- Tree-sitter configuration
local ts = require'nvim-treesitter.configs'
ts.setup {
highlight = {
enable = true,
disable = function(lang, buf)
local max_filesize = 100 * 1024
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
if ok and stats and stats.size > max_filesize then
return true
end
end,
additional_vim_regex_highlighting = false,
},
ignore_install = {'javascript'},
sync_install = true,
auto_install = true,
ensure_installed = {
"arduino",
"awk",
@@ -64,8 +56,20 @@ return {
"vim",
"yaml",
},
modules = {},
highlight = {
enable = true,
disable = function(lang, buf)
local max_filesize = 100 * 1024 -- 100 KB
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
if ok and stats and stats.size > max_filesize then
return true
end
end,
additional_vim_regex_highlighting = false,
},
indent = {
enable = false,
enable = false,
},
incremental_selection = {
enable = true,
@@ -79,11 +83,11 @@ return {
matchup = {
enable = true,
-- disable = { "c", "ruby" },
include_match_words
},
}
vim.opt.foldmethod = "expr"
vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
vim.opt.foldmethod = "manual"
vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
vim.opt.foldlevelstart = 99
vim.opt.foldminlines = 50
end
}