From 78566240e0fbe4e3d4f2c6782277459ca136ea6c Mon Sep 17 00:00:00 2001 From: Ian Griffin Date: Wed, 2 Apr 2025 19:08:48 +0800 Subject: some fixes --- lua/plugins/10_ide.lua | 85 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 68 insertions(+), 17 deletions(-) (limited to 'lua/plugins/10_ide.lua') diff --git a/lua/plugins/10_ide.lua b/lua/plugins/10_ide.lua index 3dfe6b2..6fdc7fa 100644 --- a/lua/plugins/10_ide.lua +++ b/lua/plugins/10_ide.lua @@ -9,8 +9,9 @@ return { "bash", "bibtex", "c", + "cs", "cpp", - "css", + "cs", "go", "html", "http", @@ -42,12 +43,12 @@ return { dependencies = { 'ms-jpq/coq.artifacts' }, branch = 'coq', build = ':COQdeps', + event = { "VimEnter" }, config = function() vim.cmd([[autocmd VimEnter * COQnow -s]]) end }, - -- -- Language Configurations -- { 'ap/vim-css-color', lazy = false }, @@ -63,6 +64,21 @@ return { }, { 'bellinitte/uxntal.vim', lazy = false }, + { + 'nvim-flutter/flutter-tools.nvim', + ft = 'dart', + dependencies = { + 'nvim-lua/plenary.nvim', + 'nanotee/nvim-lsp-basics', + }, + opts = { + lsp = { + color = { + enabled = true, + }, + }, + }, + }, -- -- Language Server @@ -108,11 +124,56 @@ return { vim.diagnostic.config({ virtual_text = false }) end }, + { + 'hrsh7th/cmp-nvim-lsp', + dependencies = { + 'hrsh7th/nvim-cmp', + } + }, + { + 'jacob411/Ollama-Copilot', + dependencies = { + 'hrsh7th/cmp-nvim-lsp', + }, + opts = { + model_name = "qwen2.5-coder:14b", + stream_suggestion = false, + python_command = "python3", + filetypes = { + "bash", + "c", + "cpp", + "cs", + "dart", + "go", + "html", + "javascript", + "javascriptreact", + "json", + "lua", + "python", + "tex", + "typescript", + "typescriptreact", + }, + ollama_model_opts = { + num_predict = 40, + temperature = 0.1, + }, + keymaps = { + suggestion = 'os', + reject = 'or', + insert_accept = '', + }, + + }, + }, { 'williamboman/mason-lspconfig.nvim', dependencies = { 'ms-jpq/coq_nvim', 'nanotee/nvim-lsp-basics', + 'jacob411/Ollama-Copilot', 'neovim/nvim-lspconfig', 'stevearc/aerial.nvim', 'williamboman/mason.nvim', @@ -135,6 +196,7 @@ return { "bash", "c", "cpp", + "cs", "dart", "go", "html", @@ -169,26 +231,14 @@ return { -- Show code diagnostics in a separate buffer window { 'folke/trouble.nvim', - opts = { - height = 6, - icons = false, - fold_open = "v", - fold_closed = ">", - signs = { - error = "E:", - warning = "W:", - hint = "H:", - information = "I:" - }, - use_diagnostic_signs = false - }, + opts = {}, cmd = { - "TroubleToggle", + "Trouble", }, keys = { - {'t', ':TroubleToggle'}, + {'t', ':Trouble diagnostics toggle'}, } }, -- @@ -220,6 +270,7 @@ return { -- Open request results in a horizontal split result_split_horizontal = true, -- Keep the http file buffer above|left when split horizontal|vertical + -- result_split_in_place = true, result = { show_curl_command = false, -- cgit v1.3