diff options
Diffstat (limited to '.config/nvim/init.lua')
| -rw-r--r-- | .config/nvim/init.lua | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 198924c..78d754a 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -38,23 +38,14 @@ require("mini.pick").setup({ }, }, }) -require("nvim-treesitter.config").setup({ - ensure_installed = { "c", "lua", "odin", "vim", "vimdoc", "query", "markdown_inline" }, - auto_install = vim.fn.executable("tree-sitter") == 1, - highlight = { - enable = true, - }, - incremental_selection = { - enable = true, - keymaps = { - init_selection = "<C-space>", - node_incremental = "<C-space>", - scope_incremental = false, - node_decremental = "<bs>", - }, - }, -}) +require("nvim-treesitter").install({"c", "cpp", "lua", "odin", "vim", "vimdoc"}) +require("nvim-treesitter").setup() + +vim.api.nvim_create_autocmd("FileType", { + pattern = "odin", + callback = function() vim.treesitter.start() end +}) vim.keymap.set("n", "<leader>f", ":Pick files tool='rg'<CR>") @@ -74,13 +65,6 @@ vim.keymap.set("n", "<leader>s", function() print("no files to swap to") end) --- toggle inlay hints -vim.keymap.set("n", "<leader>h", function() - vim.lsp.inlay_hint.enable( - not vim.lsp.inlay_hint.is_enabled({bufnr=0}), - {bufnr=0}) -end) - vim.lsp.enable({"lua_ls", "clangd", "ols"}) vim.diagnostic.config({ virtual_text = true, @@ -96,9 +80,8 @@ vim.api.nvim_create_autocmd("LspAttach", { for i = 32, 126 do table.insert(chars, string.char(i)) end - -- client.server_capabilities.semanticTokensProvider = nil - client.server_capabilities.completionProvider.triggerCharacters = chars if client:supports_method("textDocument/completion") then + client.server_capabilities.completionProvider.triggerCharacters = chars vim.lsp.completion.enable(true, client.id, ev.buf, {autotrigger=true}) end end, |