chore: update & remove sidekick

lazy-lock.json

@@ -1,41 +1,46 @@
 {
-  "LazyVim": { "branch": "main", "commit": "3f034d0a7f58031123300309f2efd3bb0356ee21" },
+  "LazyVim": { "branch": "main", "commit": "28db03f958d58dfff3c647ce28fdc1cb88ac158d" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "735e53aa42423239e1f862e3356bdda56a2ba30e" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "905cc3d9684e77b054c380d969a27fc54b6240d4" },
-  "avante.nvim": { "branch": "main", "commit": "976fb4177cacf96f5b751ac4ea46aafcdea07551" },
+  "bamboo.nvim": { "branch": "master", "commit": "1309bc88bffcf1bedc3e84e7fa9004de93da774a" },
-  "blink.cmp": { "branch": "main", "commit": "485c03400608cb6534bbf84da8c1c471fc4808c0" },
+  "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
-  "catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" },
+  "catppuccin": { "branch": "main", "commit": "0a5de4da015a175f416d6ef1eda84661623e0500" },
-  "conform.nvim": { "branch": "master", "commit": "f9ef25a7ef00267b7d13bfc00b0dea22d78702d5" },
+  "conform.nvim": { "branch": "master", "commit": "e969e302bced7ffb9a0a0323629f31feb0ca35a6" },
-  "csvview.nvim": { "branch": "main", "commit": "9bd000f338bf020ed4791c95af023c1e14029236" },
+  "csvview.nvim": { "branch": "main", "commit": "7022e18a0fbae9aecf99a3ba02b2a541edc2b8a1" },
-  "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
+  "everforest": { "branch": "master", "commit": "b03a03148c8b34c24c96960b93da9c8883d11f54" },
-  "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
+  "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
-  "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
+  "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
-  "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
+  "gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" },
-  "grug-far.nvim": { "branch": "main", "commit": "2c7ef09353714bd4954f5459d9a7e2579a050dc7" },
+  "grug-far.nvim": { "branch": "main", "commit": "275dbedc96e61a6b8d1dfb28ba51586ddd233dcf" },
-  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "kanagawa.nvim": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" },
-  "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
+  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
-  "lualine.nvim": { "branch": "master", "commit": "9fef261b53fbe3a2ef01ee9667f6fde064b1ed10" },
+  "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
+  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "6c4830e37743b060d13c9269394176aea6a0fbc8" },
-  "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
+  "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
-  "mini.ai": { "branch": "main", "commit": "978ffc65c6b513fde9ef075326d34d89197f1ea5" },
+  "mini.ai": { "branch": "main", "commit": "4b0a6207341d895b6cfe9bcb1e4d3e8607bfe4f4" },
-  "mini.icons": { "branch": "main", "commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36" },
+  "mini.icons": { "branch": "main", "commit": "5b9076dae1bfbe47ba4a14bc8b967cde0ab5d77e" },
-  "mini.pairs": { "branch": "main", "commit": "b90e36aa5ca5e0d825e77ad67aac22214a4d9096" },
+  "mini.pairs": { "branch": "main", "commit": "b7fde3719340946feb75017ef9d75edebdeb0566" },
-  "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
+  "mini.surround": { "branch": "main", "commit": "d205d1741d1fcc1f3117b4e839bf00f74ad72fa2" },
-  "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
+  "minuet-ai.nvim": { "branch": "main", "commit": "3d25c24487876676d29d325c01ce108cbdbd0753" },
-  "nvim-lint": { "branch": "master", "commit": "936197073214c26a347fb933c9459c8766376b23" },
+  "neo-tree.nvim": { "branch": "main", "commit": "ba6871d15528e36657d19a3112cc1697c59da19a" },
-  "nvim-lspconfig": { "branch": "master", "commit": "fb733ac734249ccf293e5c8018981d4d8f59fa8f" },
+  "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
-  "nvim-treesitter": { "branch": "master", "commit": "e329e94a6a0a5ccf6ec8bfec1d10faf5eaae665f" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" },
+  "nvim-lint": { "branch": "master", "commit": "606b823a57b027502a9ae00978ebf4f5d5158098" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
+  "nvim-lspconfig": { "branch": "master", "commit": "a40d22e75d951ad2fcf236ceb013d88f81d2cc9a" },
-  "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "ec1a2431f8872f650a85ed71c24f0715df2e49c2" },
+  "nvim-treesitter": { "branch": "main", "commit": "0f5b204603234a523fafa8f6b860fd36f80a23f6" },
-  "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" },
+  "nvim-treesitter-textobjects": { "branch": "main", "commit": "a0e182ae21fda68c59d1f36c9ed45600aef50311" },
-  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" },
-  "render-markdown.nvim": { "branch": "main", "commit": "c21693fb68ebc5bcba9d73d9f81146007d025586" },
+  "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "a47388e5417e7f1cfa6962cc441a23c4c5fb2151" },
-  "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
+  "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" },
-  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
+  "render-markdown.nvim": { "branch": "main", "commit": "1c958131c083c8557ea499fdb08c88b8afb05c4e" },
-  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
+  "sidekick.nvim": { "branch": "main", "commit": "c2bdf8cfcd87a6be5f8b84322c1b5052e78e302e" },
-  "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" },
+  "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
-  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
+  "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
+  "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
+  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
+  "ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" },
+  "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
 }

lazyvim.json

@@ -1,13 +1,16 @@
 {
   "extras": [
+    "lazyvim.plugins.extras.coding.mini-surround",
+    "lazyvim.plugins.extras.editor.neo-tree",
+    "lazyvim.plugins.extras.formatting.prettier",
+    "lazyvim.plugins.extras.lang.dotnet",
     "lazyvim.plugins.extras.lang.json",
     "lazyvim.plugins.extras.lang.markdown",
-    "lazyvim.plugins.extras.lang.omnisharp",
     "lazyvim.plugins.extras.lang.typescript"
   ],
   "install_version": 8,
   "news": {
-    "NEWS.md": "10960"
+    "NEWS.md": "11866"
   },
   "version": 8
 }

lua/config/keymaps.lua

@@ -1,3 +1,9 @@
 -- Keymaps are automatically loaded on the VeryLazy event
 -- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
 -- Add any additional keymaps here
+
+-- map ctrl + . to code actions
+vim.keymap.set("n", "<C-.>", vim.lsp.buf.code_action, { desc = "Code Action" })
+
+-- map F12 to show code references (like in IntelliJ)
+vim.keymap.set("n", "<F12>", vim.lsp.buf.references, { desc = "Show References" })

lua/plugins/avante.lua

@@ -0,0 +1,150 @@
+if true then
+  return {}
+end
+
+local function dmx(model)
+  return {
+    __inherited_from = "openai",
+    api_key_name = "DMX_API_KEY",
+    endpoint = "https://www.dmxapi.cn/v1/",
+    model = model,
+  }
+end
+local llm_main = dmx("glm-4.6")
+
+return {
+  {
+    "yetone/avante.nvim",
+    build = vim.fn.has("win32") ~= 0 and "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false"
+      or "make",
+    event = "VeryLazy",
+    dependencies = {
+      "stevearc/dressing.nvim",
+      "nvim-lua/plenary.nvim",
+      "MunifTanjim/nui.nvim",
+      {
+        "MeanderingProgrammer/render-markdown.nvim",
+        opts = {
+          file_types = { "markdown", "Avante" },
+        },
+        ft = { "markdown", "Avante" },
+      },
+    },
+    opts = {
+      file_selector = {
+        provider = "fzf-lua",
+        provider_opts = {},
+      },
+      -- Key mappings for diff functionality
+      mappings = {
+        diff = {
+          theirs = "<M-l>",
+          ours = "<M-L>",
+        },
+      },
+
+      -- providers
+      provider = "dsv3",
+
+      providers = {
+        main = llm_main,
+        air = dmx("glm-4.5-air"),
+        dsv3 = dmx("deepseek-v3.2-exp"),
+      },
+
+      acp_providers = {
+        ["qwen-code"] = {
+          command = "qwen",
+          args = { "--experimental-acp" },
+          env = {
+            NODE_NO_WARNINGS = "1",
+          },
+        },
+      },
+    },
+  },
+
+  {
+    "nvim-neo-tree/neo-tree.nvim",
+    config = function()
+      require("neo-tree").setup({
+        filesystem = {
+          commands = {
+            avante_add_files = function(state)
+              local node = state.tree:get_node()
+              local filepath = node:get_id()
+              local relative_path = require("avante.utils").relative_path(filepath)
+
+              local sidebar = require("avante").get()
+
+              local open = sidebar:is_open()
+              -- ensure avante sidebar is open
+              if not open then
+                require("avante.api").ask()
+                sidebar = require("avante").get()
+              end
+
+              sidebar.file_selector:add_selected_file(relative_path)
+
+              -- remove neo tree buffer
+              if not open then
+                sidebar.file_selector:remove_selected_file("neo-tree filesystem [1]")
+              end
+            end,
+          },
+          window = {
+            mappings = {
+              ["oa"] = "avante_add_files",
+            },
+          },
+        },
+      })
+    end,
+  },
+
+  {
+    "saghen/blink.cmp",
+    dependencies = {
+      "Kaiser-Yang/blink-cmp-avante",
+      -- ... Other dependencies
+    },
+    opts = {
+      sources = {
+        -- Add 'avante' to the list
+        default = { "avante", "lsp", "path", "snippets", "buffer" },
+        providers = {
+          avante = {
+            module = "blink-cmp-avante",
+            name = "Avante",
+            opts = {
+              -- options for blink-cmp-avante
+            },
+          },
+          minuet = {
+            name = "minuet",
+            module = "minuet.blink",
+            score_offset = 100,
+          },
+        },
+      },
+    },
+  },
+  {
+    "milanglacier/minuet-ai.nvim",
+    event = "InsertEnter",
+    config = function()
+      require("minuet").setup({
+        virtualtext = {
+          auto_trigger_ft = { "*" },
+          keymap = {
+            accept = "<Tab>",
+            accept_line = "<M-Down>",
+            next = "<M-]>",
+            prev = "<M-[>",
+            dismiss = "<M-BS>",
+          },
+        },
+      })
+    end,
+  },
+}

lua/plugins/colorschemes.lua

@@ -0,0 +1,5 @@
+return {
+  { "rebelot/kanagawa.nvim", lazy = true },
+  { "ribru17/bamboo.nvim", lazy = true },
+  { "sainnhe/everforest", lazy = true },
+}

lua/plugins/editing.lua

@@ -1,123 +0,0 @@
-return {
-  {
-    "yetone/avante.nvim",
-    event = "VeryLazy",
-    lazy = true,
-    dependencies = {
-      "stevearc/dressing.nvim",
-      "nvim-lua/plenary.nvim",
-      "MunifTanjim/nui.nvim",
-      {
-        "MeanderingProgrammer/render-markdown.nvim",
-        opts = {
-          file_types = { "markdown", "Avante" },
-        },
-        ft = { "markdown", "Avante" },
-      },
-    },
-    opts = {
-      provider = "yochat",
-      auto_suggestions_provider = "codestral",
-      -- cursor_applying_provider = "yoqwen32",
-      -- behaviour = {
-      --     enable_cursor_planning_mode = true, -- enable cursor planning mode!
-      -- },
-
-      file_selector = {
-        provider = "fzf-lua",
-        provider_opts = {},
-      },
-
-      vendors = {
-
-        -- ds
-        dsv3 = {
-          __inherited_from = "openai",
-          api_key_name = "DEEPSEEK_API_KEY",
-          endpoint = "https://api.deepseek.com",
-          model = "deepseek-chat",
-        },
-
-        -- 百炼
-        qwenr1 = {
-          __inherited_from = "openai",
-          api_key_name = "QWEN_API_KEY",
-          endpoint = "https://dashscope.aliyuncs.com/compatible-mode/v1/",
-          model = "deepseek-r1",
-          disable_tools = true,
-        },
-        qwenchat = {
-          __inherited_from = "openai",
-          api_key_name = "QWEN_API_KEY",
-          endpoint = "https://dashscope.aliyuncs.com/compatible-mode/v1/",
-          model = "deepseek-v3",
-          disable_tools = true,
-        },
-        qwenqwq32 = {
-          __inherited_from = "openai",
-          api_key_name = "QWEN_API_KEY",
-          endpoint = "https://dashscope.aliyuncs.com/compatible-mode/v1/",
-          model = "qwq-32b",
-          disable_tools = true,
-        },
-
-        -- yostar
-        yor1 = {
-          __inherited_from = "openai",
-          api_key_name = "YOSTAR_API_KEY",
-          endpoint = "https://litellm.yostar.net",
-          model = "DeepSeek-R1",
-          disable_tools = true,
-        },
-        yochat = {
-          __inherited_from = "openai",
-          api_key_name = "YOSTAR_API_KEY",
-          endpoint = "https://litellm.yostar.net",
-          model = "DeepSeek-V3",
-          disable_tools = true,
-        },
-        yoqwq32 = {
-          __inherited_from = "openai",
-          api_key_name = "YOSTAR_API_KEY",
-          endpoint = "https://litellm.yostar.net",
-          model = "qwq-32b",
-          disable_tools = true,
-        },
-
-        codestral = {
-          __inherited_from = "openai",
-          api_key_name = "CODESTRAL_API_KEY",
-          endpoint = "https://codestral.mistral.ai/v1",
-          model = "codestral-latest",
-        },
-      },
-    },
-  },
-  {
-    "hat0uma/csvview.nvim",
-    ft = "csv",
-    config = function()
-      vim.api.nvim_create_autocmd("FileType", {
-        pattern = "csv",
-        command = "CsvViewEnable",
-      })
-
-      require("csvview").setup({
-        parser = { comments = { "#", "//" } },
-        keymaps = {
-          -- Text objects for selecting fields
-          textobject_field_inner = { "if", mode = { "o", "x" } },
-          textobject_field_outer = { "af", mode = { "o", "x" } },
-          -- Excel-like navigation:
-          -- Use <Tab> and <S-Tab> to move horizontally between fields.
-          -- Use <Enter> and <S-Enter> to move vertically between rows and place the cursor at the end of the field.
-          -- Note: In terminals, you may need to enable CSI-u mode to use <S-Tab> and <S-Enter>.
-          jump_next_field_end = { "<Tab>", mode = { "n", "v" } },
-          jump_prev_field_end = { "<S-Tab>", mode = { "n", "v" } },
-          jump_next_row = { "<Enter>", mode = { "n", "v" } },
-          jump_prev_row = { "<S-Enter>", mode = { "n", "v" } },
-        },
-      })
-    end,
-  },
-}

lua/plugins/lsp.lua

@@ -0,0 +1,39 @@
+return {
+  {
+    "neovim/nvim-lspconfig",
+    opts = {
+      servers = {
+        cssls = {},
+        denols = { single_file_support = false },
+        vtsls = { single_file_support = false },
+      },
+    },
+  },
+  {
+    "hat0uma/csvview.nvim",
+    ft = "csv",
+    config = function()
+      vim.api.nvim_create_autocmd("FileType", {
+        pattern = "csv",
+        command = "CsvViewEnable",
+      })
+
+      require("csvview").setup({
+        parser = { comments = { "#", "//" } },
+        keymaps = {
+          -- Text objects for selecting fields
+          textobject_field_inner = { "if", mode = { "o", "x" } },
+          textobject_field_outer = { "af", mode = { "o", "x" } },
+          -- Excel-like navigation:
+          -- Use <Tab> and <S-Tab> to move horizontally between fields.
+          -- Use <Enter> and <S-Enter> to move vertically between rows and place the cursor at the end of the field.
+          -- Note: In terminals, you may need to enable CSI-u mode to use <S-Tab> and <S-Enter>.
+          jump_next_field_end = { "<Tab>", mode = { "n", "v" } },
+          jump_prev_field_end = { "<S-Tab>", mode = { "n", "v" } },
+          jump_next_row = { "<Enter>", mode = { "n", "v" } },
+          jump_prev_row = { "<S-Enter>", mode = { "n", "v" } },
+        },
+      })
+    end,
+  },
+}

lua/plugins/neotree.lua

@@ -0,0 +1,13 @@
+return {
+  "nvim-neo-tree/neo-tree.nvim",
+  config = function()
+    require("neo-tree").setup({
+      filesystem = {
+        follow_current_file = {
+          enabled = true,
+          leave_dirs_open = false,
+        },
+      },
+    })
+  end,
+}

lua/plugins/sidekick.lua

@@ -0,0 +1,20 @@
+return {
+  {
+    "milanglacier/minuet-ai.nvim",
+    event = "InsertEnter",
+    config = function()
+      require("minuet").setup({
+        virtualtext = {
+          auto_trigger_ft = { "*" },
+        },
+        keymap = {
+          accept = "<Tab>",
+          accept_line = "<M-Down>",
+          next = "<M-]>",
+          prev = "<M-[>",
+          dismiss = "<M-BS>",
+        },
+      })
+    end,
+  },
+}

lua/plugins/surround.lua

@@ -0,0 +1,11 @@
+return {
+  {
+    "nvim-mini/mini.surround",
+    opts = {
+      mappings = {
+        replace = "cs",
+        delete = "ds",
+      },
+    },
+  },
+}