fix deepseek

lazy-lock.json

@@ -1,37 +1,37 @@
 {
-  "actions-preview.nvim": { "branch": "master", "commit": "9f52a01c374318e91337697ebed51c6fae57f8a4" },
-  "avante.nvim": { "branch": "main", "commit": "1a4f2575d663cc3e0c5c9d17383f1479dd4fd28f" },
+  "actions-preview.nvim": { "branch": "master", "commit": "4ab7842eb6a5b6d2b004f8234dcf33382a0fdde2" },
+  "avante.nvim": { "branch": "main", "commit": "39787969c769204861f1339e52ffcdd00e648220" },
   "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
   "cmp-nvim-ultisnips": { "branch": "main", "commit": "2be0eda0f7fbf47ebd9fbdace369cc45d57acf49" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "conform.nvim": { "branch": "master", "commit": "8ed162b0637d4c4f69ebe3e8e49b35662a82e137" },
-  "csvview.nvim": { "branch": "main", "commit": "9f9aa7e7a9f977de9cf056b2d1878edd5474be7e" },
+  "conform.nvim": { "branch": "master", "commit": "f9ef25a7ef00267b7d13bfc00b0dea22d78702d5" },
+  "csvview.nvim": { "branch": "main", "commit": "7dcb6aa2965a1d5555d4940ed0c9c2f0e173ecdb" },
   "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
   "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
-  "gitsigns.nvim": { "branch": "main", "commit": "2bc3b472bbc2484214549af4d9f38c127b886a55" },
-  "grug-far.nvim": { "branch": "main", "commit": "3a8690461afac34c0e5bacb0f7b4bc3066aab665" },
-  "kanagawa.nvim": { "branch": "master", "commit": "988082eb00b845e4afbcaa4fd8e903da8a3ab3b9" },
-  "lazy.nvim": { "branch": "main", "commit": "f15a93907ddad3d9139aea465ae18336d87f5ce6" },
-  "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" },
+  "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
+  "grug-far.nvim": { "branch": "main", "commit": "bdcdeed04ea3d49c25036235d027ade401df9c9d" },
+  "kanagawa.nvim": { "branch": "master", "commit": "709018d5af92d2e5780bfb8a6d36e9cad01a6402" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "lualine.nvim": { "branch": "master", "commit": "9fef261b53fbe3a2ef01ee9667f6fde064b1ed10" },
   "mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" },
   "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "5d172e8315444dbc32867d1c7b04d8e7e68ec4e1" },
-  "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
-  "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" },
-  "nvim-lspconfig": { "branch": "master", "commit": "7af2c37192deae28d1305ae9e68544f7fb5408e1" },
-  "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" },
-  "nvim-treesitter": { "branch": "master", "commit": "2cade9e3d105732b794bc37e7cb2dc53b1cf99dc" },
-  "nvim-web-devicons": { "branch": "master", "commit": "1020869742ecb191f260818234517f4a1515cfe8" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" },
+  "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
+  "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" },
+  "nvim-lspconfig": { "branch": "master", "commit": "200280dab91a7df2ca42fd2ab3cb4c5fab056666" },
+  "nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" },
+  "nvim-treesitter": { "branch": "master", "commit": "e329e94a6a0a5ccf6ec8bfec1d10faf5eaae665f" },
+  "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "render-markdown.nvim": { "branch": "main", "commit": "e05a9f22f31c088ece3fa5928daf546a015b66ee" },
+  "render-markdown.nvim": { "branch": "main", "commit": "84d413b0c432adaeaf3dcaac646638bd99d06aa6" },
   "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
   "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
-  "toggleterm.nvim": { "branch": "main", "commit": "e76134e682c1a866e3dfcdaeb691eb7b01068668" },
   "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
   "typescript-tools.nvim": { "branch": "master", "commit": "35e397ce467bedbbbb5bfcd0aa79727b59a08d4a" },
-  "ultisnips": { "branch": "master", "commit": "35252b3327bf0cb55136399dfe615637093a8291" },
-  "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" }
+  "ultisnips": { "branch": "master", "commit": "dbc458e110bb49299da76ec53f8b09b4f6dce28a" },
+  "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
+  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
 }

lua/plugins/editing.lua

@@ -51,9 +51,9 @@ return {
                 -- engine = 'ripgrep' is default, but 'astgrep' can be specified
             });
 
-            vim.keymap.set("n", "<leader>g", function()
+            vim.keymap.set("n", "<leader>gf", function()
                 vim.cmd [[GrugFar]]
-            end, { desc = "Run GrugFar" })
+            end, { desc = "GrugFar" })
         end
     }, {
         "folke/flash.nvim",
@@ -70,6 +70,8 @@ return {
 
             -- generic
             vim.keymap.set('n', '<leader>tl', builtin.live_grep, { desc = 'Telescope live grep' })
+            vim.keymap.set('n', '<leader>td', builtin.lsp_document_symbols, { desc = 'Telescope document symbols' })
+            vim.keymap.set('n', '<leader>tw', builtin.lsp_dynamic_workspace_symbols, { desc = 'Telescope dynamic workspace symbols' })
             vim.keymap.set('n', '<leader>th', builtin.help_tags, { desc = 'Telescope help tags' })
             vim.keymap.set('n', '<leader>to', builtin.oldfiles, { desc = 'Telescope oldfiles' })
             vim.keymap.set('n', '<leader>tt', function()
@@ -117,17 +119,6 @@ return {
             vim.keymap.set('n', '[c', function()
                 vim.cmd [[cprev]]
             end, {desc = 'Prev Quicklist'})
-
-            -- well, avante
-            vim.keymap.set('n', '<leader>apd', function()
-                vim.cmd [[AvanteSwitchProvider deepseek]]
-            end, {desc = 'deepseek-v3 official'})
-            vim.keymap.set('n', '<leader>apg', function()
-                vim.cmd [[AvanteSwitchProvider groq]]
-            end, {desc = 'groq r1-distill-70b'})
-            vim.keymap.set('n', '<leader>aps', function()
-                vim.cmd [[AvanteSwitchProvider siliconflow]]
-            end, {desc = 'siliconflow deepseek-v3'})
         end
     }, {
         "folke/trouble.nvim",
@@ -144,54 +135,119 @@ return {
         "yetone/avante.nvim",
         event = 'VeryLazy',
         lazy = false,
-        build = "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false",
         dependencies = {
             "stevearc/dressing.nvim",
             "nvim-lua/plenary.nvim",
             "MunifTanjim/nui.nvim",
         },
         opts = {
-            provider = "deepseek",
-            auto_suggestions_provider = "deepseek",
+            provider = "dsv3",
+            auto_suggestions_provider = "codestral",
+            -- cursor_applying_provider = "yoqwen32",
+            -- behaviour = {
+            --     enable_cursor_planning_mode = true, -- enable cursor planning mode!
+            -- },
 
-            vendors = {
-              deepseek = {
-                __inherited_from = "openai",
-                api_key_name = "DEEPSEEK_API_KEY",
-                endpoint = "https://api.deepseek.com/v1",
-                model = "deepseek-chat",
-                timeout = 30000,
-                temperature = 0,
-                max_tokens = 8192,
-              },
-              groq = {
-                __inherited_from = "openai",
-                api_key_name = "GROQ_API_KEY",
-                endpoint = "https://api.groq.com/openai/v1",
-                model = "deepseek-r1-distill-llama-70b",
-                timeout = 30000,
-                temperature = 0,
-                max_tokens = 8192,
-              },
-              siliconflow = {
-                __inherited_from = "openai",
-                api_key_name = "SILICONFLOW_API_KEY",
-                endpoint = "https://api.siliconflow.cn/v1",
-                model = "Pro/deepseek-ai/DeepSeek-V3",
-                timeout = 30000,
-                temperature = 0,
-                max_tokens = 4096,
-              },
-            },
             file_selector = {
               provider = "telescope",
               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,
+                max_completion_tokens = 12288,
+              },
+              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',
-      config = function()
-        require('csvview').setup()
-      end
+        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
+    }, {
+        'tpope/vim-fugitive',
+        config = function()
+            vim.keymap.set('n', '<leader>gs', ':Git<CR>', {desc = "Git Status"})
+            vim.keymap.set('n', '<leader>gd', ':Git diff<CR>', {desc = "Git Diff"})
+        end
     }
 }

lua/plugins/tsdev.lua

@@ -9,6 +9,7 @@ return {
                 settings = {
                     complete_function_calls = true,
                 },
+                root_dir = lspconfig.util.root_pattern("package.json"),
                 single_file_support = false,
             })
 
@@ -88,7 +89,7 @@ return {
             }
             lspconfig.denols.setup{
                 single_file_support = false,
-                root_dir = require('lspconfig.util').root_pattern("deno.json", "deno.jsonc")
+                root_dir = lspconfig.util.root_pattern("deno.json", "deno.jsonc")
             }
             lspconfig.marksman.setup{
                 capabilities = capabilities

lua/plugins/visuals.lua

@@ -85,21 +85,5 @@ return {
         ---@module 'render-markdown'
         ---@type render.md.UserConfig
         opts = {},
-    },{
-        'akinsho/toggleterm.nvim',
-        config = function()
-            local Terminal  = require('toggleterm.terminal').Terminal
-            local lazygit = Terminal:new({
-                cmd = "lazygit",
-                hidden = true,
-                direction = 'float',
-            })
-
-            function _lazygit_toggle()
-              lazygit:toggle()
-            end
-
-            vim.api.nvim_set_keymap("n", "<leader>lg", "<cmd>lua _lazygit_toggle()<CR>", {noremap = true, silent = true})
-        end
     }
 }