styles and treesitter config update
This commit is contained in:
parent
253d536ba4
commit
4496f44c49
3 changed files with 13 additions and 28 deletions
23
lua/lsp.lua
23
lua/lsp.lua
|
@ -61,32 +61,13 @@ local servers = {
|
||||||
"vimls",
|
"vimls",
|
||||||
"clangd",
|
"clangd",
|
||||||
"rnix",
|
"rnix",
|
||||||
|
"pyright",
|
||||||
|
"ruff_lsp",
|
||||||
}
|
}
|
||||||
for _, lsp in ipairs(servers) do
|
for _, lsp in ipairs(servers) do
|
||||||
nvim_lsp[lsp].setup {capabilities = capabilities, on_attach = on_attach}
|
nvim_lsp[lsp].setup {capabilities = capabilities, on_attach = on_attach}
|
||||||
end
|
end
|
||||||
|
|
||||||
nvim_lsp.ruff_lsp.setup {
|
|
||||||
on_attach = on_attach,
|
|
||||||
init_options = {
|
|
||||||
settings = {
|
|
||||||
-- Any extra CLI arguments for `ruff` go here.
|
|
||||||
args = {},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
nvim_lsp.ruff_lsp.setup({
|
|
||||||
on_attach = on_attach,
|
|
||||||
capabilities = capabilities,
|
|
||||||
init_options = {
|
|
||||||
settings = {
|
|
||||||
-- Any extra CLI arguments for `ruff` go here.
|
|
||||||
args = {},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
nvim_lsp.rust_analyzer.setup({
|
nvim_lsp.rust_analyzer.setup({
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
|
|
|
@ -3,15 +3,19 @@ require('nvim-treesitter.configs').setup {
|
||||||
auto_install = true,
|
auto_install = true,
|
||||||
highlight = {
|
highlight = {
|
||||||
enable = true,
|
enable = true,
|
||||||
additional_vim_regex_highlighting=false,
|
additional_vim_regex_highlighting=true,
|
||||||
},
|
},
|
||||||
ident = {
|
ident = {
|
||||||
enable = true,
|
enable = true,
|
||||||
},
|
},
|
||||||
rainbow = {
|
incremental_selection = {
|
||||||
enable = true,
|
enable = true,
|
||||||
extended_mode = false,
|
keymaps = {
|
||||||
max_file_lines = nil,
|
init_selection = "gnn", -- set to `false` to disable one of the mappings
|
||||||
|
node_incremental = "grn",
|
||||||
|
scope_incremental = "grc",
|
||||||
|
node_decremental = "grm",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
vim.cmd 'highlight WhitespaceEOL ctermbg=red guibg=#ab0d0d'
|
vim.cmd 'highlight WhitespaceEOL ctermbg=red guibg=#ab0d0d'
|
||||||
vim.cmd 'match WhitespaceEOL /\\s\\+\\%#\\@<!$/'
|
vim.cmd 'match WhitespaceEOL /\\s\\+\\%#\\@<!$/'
|
||||||
|
|
||||||
vim.cmd 'highlight Visual cterm=bold ctermbg=Grey ctermfg=NONE'
|
vim.cmd 'highlight Visual cterm=bold ctermbg=Grey ctermfg=none'
|
||||||
vim.cmd 'highlight Search ctermfg=Black'
|
vim.cmd 'highlight Search ctermfg=Black'
|
||||||
vim.cmd 'highlight Comment ctermfg=DarkGrey'
|
vim.cmd 'highlight Comment ctermfg=DarkGrey'
|
||||||
vim.cmd 'highlight SignColumn ctermbg=0'
|
vim.cmd 'highlight SignColumn ctermbg=none'
|
||||||
vim.cmd 'highlight LineNr ctermbg=0 ctermfg=248'
|
vim.cmd 'highlight LineNr ctermbg=none ctermfg=DarkGrey'
|
||||||
vim.cmd 'highlight Folded ctermbg=Green ctermfg=Black'
|
vim.cmd 'highlight Folded ctermbg=Green ctermfg=Black'
|
||||||
vim.cmd 'highlight Pmenu ctermbg=253 guibg=253'
|
vim.cmd 'highlight Pmenu ctermbg=253 guibg=253'
|
||||||
vim.cmd 'highlight Pmenu ctermfg=232 guifg=232'
|
vim.cmd 'highlight Pmenu ctermfg=232 guifg=232'
|
||||||
|
|
Reference in a new issue