diff options
Diffstat (limited to '.config/nvim')
| -rw-r--r-- | .config/nvim/colors/mini-theme.lua | 7 | ||||
| -rw-r--r-- | .config/nvim/init.lua | 27 | ||||
| -rw-r--r-- | .config/nvim/nvim-pack-lock.json | 13 |
3 files changed, 32 insertions, 15 deletions
diff --git a/.config/nvim/colors/mini-theme.lua b/.config/nvim/colors/mini-theme.lua index 16b7831..0f8ba5e 100644 --- a/.config/nvim/colors/mini-theme.lua +++ b/.config/nvim/colors/mini-theme.lua @@ -42,7 +42,7 @@ local colors = { ["String"] = {link="Constant"}, ["Boolean"] = {link="Constant"}, - ["Function"] = {fg="#9999EE"--[[, bg="#23222b"]]}, + ["Function"] = {fg="#9999EE", bold=true}, ["Identifier"] = {link="Normal"}, ["Statement"] = {bold=true}, ["Label"] = {link="Normal"}, @@ -62,10 +62,11 @@ local colors = { ["@lsp.typemod.function.declaration"] = {link="Function"}, ["@lsp.type.function"] = {link="@function.call"}, - ["@lsp.type.function.lua"] = {link="Function"}, + ["@lsp.type.method"] = {link="@function.call"}, + ["@lsp.type.function.lua"] = {link="@function.call"}, ["@function.builtin"] = {link="@function.call"}, ["@function.method.call"] = {link="@function.call"}, - ["@function.call"] = {italic=true}, + ["@function.call"] = {fg="#9999EE"}, ["@variable"] = {link="Normal"}, -- ["@variable"] = {fg="#ff0000"}, 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({}) diff --git a/.config/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json index 905ad4c..4f75631 100644 --- a/.config/nvim/nvim-pack-lock.json +++ b/.config/nvim/nvim-pack-lock.json @@ -1,16 +1,17 @@ { "plugins": { - "github-nvim-theme": { - "rev": "c106c94", - "src": "https://github.com/projekt0n/github-nvim-theme" - }, "mini.pick": { - "rev": "96ee37d", + "rev": "bb764a5", "src": "https://github.com/nvim-mini/mini.pick" }, "nvim-lspconfig": { - "rev": "e688b48", + "rev": "a89bfcf", "src": "https://github.com/neovim/nvim-lspconfig" + }, + "nvim-treesitter": { + "rev": "65a266bf", + "src": "https://github.com/nvim-treesitter/nvim-treesitter", + "version": "'main'" } } }
\ No newline at end of file |