diff --git a/lua/lsp.lua b/lua/lsp.lua index 02b412e..79e4823 100644 --- a/lua/lsp.lua +++ b/lua/lsp.lua @@ -61,32 +61,13 @@ local servers = { "vimls", "clangd", "rnix", + "pyright", + "ruff_lsp", } for _, lsp in ipairs(servers) do nvim_lsp[lsp].setup {capabilities = capabilities, on_attach = on_attach} 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({ on_attach = on_attach, capabilities = capabilities, diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 0643a2b..f564586 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -3,15 +3,19 @@ require('nvim-treesitter.configs').setup { auto_install = true, highlight = { enable = true, - additional_vim_regex_highlighting=false, + additional_vim_regex_highlighting=true, }, ident = { enable = true, }, - rainbow = { + incremental_selection = { enable = true, - extended_mode = false, - max_file_lines = nil, + keymaps = { + init_selection = "gnn", -- set to `false` to disable one of the mappings + node_incremental = "grn", + scope_incremental = "grc", + node_decremental = "grm", + }, } } diff --git a/lua/theme.lua b/lua/theme.lua index ad482d8..f55229b 100644 --- a/lua/theme.lua +++ b/lua/theme.lua @@ -2,11 +2,11 @@ vim.cmd 'highlight WhitespaceEOL ctermbg=red guibg=#ab0d0d' vim.cmd 'match WhitespaceEOL /\\s\\+\\%#\\@