aboutsummaryrefslogtreecommitdiff
path: root/.config/nvim/init.lua
diff options
context:
space:
mode:
Diffstat (limited to '.config/nvim/init.lua')
-rw-r--r--.config/nvim/init.lua27
1 files changed, 21 insertions, 6 deletions
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 1c289df..198924c 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -22,7 +22,7 @@ vim.g.mapleader = " "
vim.pack.add({
"https://github.com/neovim/nvim-lspconfig",
"https://github.com/nvim-mini/mini.pick",
- "https://github.com/projekt0n/github-nvim-theme",
+ {src="https://github.com/nvim-treesitter/nvim-treesitter", version="main"},
})
for _, plugin in ipairs(vim.pack.get()) do
@@ -38,11 +38,28 @@ 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>",
+ },
+ },
+})
+
vim.keymap.set("n", "<leader>f", ":Pick files tool='rg'<CR>")
-- Switch between semantically related files easily :)
-local exts = {{"c", "h"}, {"cc", "hh"}, {"frag", "vert"}}
+local exts = {{"c", "h"}, {"cc", "hh"}, {"cpp", "hpp"}, {"frag", "vert"}}
vim.keymap.set("n", "<leader>s", function()
local bufpath = vim.api.nvim_buf_get_name(0)
for _, pair in ipairs(exts) do
@@ -64,7 +81,7 @@ vim.keymap.set("n", "<leader>h", function()
{bufnr=0})
end)
-vim.lsp.enable({"lua_ls", "clangd", "zls"})
+vim.lsp.enable({"lua_ls", "clangd", "ols"})
vim.diagnostic.config({
virtual_text = true,
severity_sort = true,
@@ -87,8 +104,6 @@ vim.api.nvim_create_autocmd("LspAttach", {
end,
})
-vim.g.adwaita_darker = true
-
-vim.cmd.colorscheme("github_dark_default")
+vim.cmd.colorscheme("mini-theme")
require('vim._extui').enable({})