aaaa

4 files changed, 13 insertions, 30 deletions

diff --git a/.config/nvim/colors/mine.lua b/.config/nvim/colors/mine.lua
index 06fd8f1..48af24b 100644
--- a/.config/nvim/colors/mine.lua
+++ b/.config/nvim/colors/mine.lua
@@ -47,7 +47,7 @@ local colors = {
   ["Statement"]                    = {fg="#FF4499"},
   ["Label"]                        = {fg="#FF9944"},
 
-  ["Operator"]                     = {fg="#AAAABB"},
+  -- ["Operator"]                     = {link="Normal"},
 
   ["PreProc"]                      = {fg="#FF4499"},
   ["Typedef"]                      = {fg="#AA7FFF"},
diff --git a/.config/nvim/colors/mini-theme.lua b/.config/nvim/colors/mini-theme.lua
index 0f8ba5e..a960479 100644
--- a/.config/nvim/colors/mini-theme.lua
+++ b/.config/nvim/colors/mini-theme.lua
@@ -47,7 +47,7 @@ local colors = {
   ["Statement"]                    = {bold=true},
   ["Label"]                        = {link="Normal"},
 
-  ["Operator"]                     = {fg="#505050"},
+  ["Operator"]                     = {link="Normal"},
 
   ["Special"]                      = {fg="#CCCCDD"},
   ["SpecialChar"]                  = {fg="#FFFFFF"},
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,
diff --git a/.config/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json
index 4f75631..b67f075 100644
--- a/.config/nvim/nvim-pack-lock.json
+++ b/.config/nvim/nvim-pack-lock.json
@@ -1,15 +1,15 @@
 {
   "plugins": {
     "mini.pick": {
-      "rev": "bb764a5",
+      "rev": "b435139",
       "src": "https://github.com/nvim-mini/mini.pick"
     },
     "nvim-lspconfig": {
-      "rev": "a89bfcf",
+      "rev": "07f4e93de92e8d4ea7ab99602e3a8c9ac0fb778a",
       "src": "https://github.com/neovim/nvim-lspconfig"
     },
     "nvim-treesitter": {
-      "rev": "65a266bf",
+      "rev": "17885756e63df73ed90db62e4630f744ceda6514",
       "src": "https://github.com/nvim-treesitter/nvim-treesitter",
       "version": "'main'"
     }