From 63fc6b84b4a6d499d067cbfd2fdc909ad5969d71 Mon Sep 17 00:00:00 2001 From: Lucas Garcia Rubio Date: Fri, 18 Apr 2025 20:07:28 -0300 Subject: [PATCH] novos ajustes --- init.lua | 51 +++++++++++++++++----------- lazy-lock.json | 32 ++++++++--------- lua/custom/plugins/codecompanion.lua | 40 +++++++++++++++++++--- lua/custom/plugins/copilot.lua | 11 ++++++ lua/custom/plugins/neotest-maven.lua | 2 +- lua/custom/plugins/noice.lua | 15 ++++++++ lua/kickstart/plugins/neo-tree.lua | 3 ++ 7 files changed, 112 insertions(+), 42 deletions(-) create mode 100644 lua/custom/plugins/copilot.lua create mode 100644 lua/custom/plugins/noice.lua diff --git a/init.lua b/init.lua index fd28a0d4..935c45bb 100644 --- a/init.lua +++ b/init.lua @@ -653,7 +653,7 @@ require('lazy').setup({ -- https://github.com/pmizio/typescript-tools.nvim -- -- But for many setups, the LSP (`ts_ls`) will work just fine - ts_ls = {}, + -- ts_ls = {}, -- lua_ls = { @@ -670,6 +670,16 @@ require('lazy').setup({ }, }, }, + ts_ls = { + root_dir = require('lspconfig').util.root_pattern { 'package.json', 'tsconfig.json' }, + single_file_support = false, + settings = {}, + }, + denols = { + root_dir = require('lspconfig').util.root_pattern { 'deno.json', 'deno.jsonc' }, + single_file_support = false, + settings = {}, + }, } -- Ensure the servers and tools above are installed @@ -755,6 +765,7 @@ require('lazy').setup({ -- -- You can use 'stop_after_first' to run the first available formatter from the list javascript = { 'prettierd', 'prettier', 'prettierrc', stop_after_first = true }, + typescript = { 'prettier', ' prettierd', 'prettierrc', stop_after_first = true }, }, }, }, @@ -794,7 +805,7 @@ require('lazy').setup({ -- into multiple repos for maintenance purposes. 'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-path', - 'Jezda1337/nvim-html-css', + -- 'Jezda1337/nvim-html-css', }, config = function() -- See `:help cmp` @@ -871,21 +882,21 @@ require('lazy').setup({ { name = 'nvim_lsp' }, { name = 'luasnip' }, { name = 'path' }, - { - name = 'html-css', - option = { - enable_on = { 'html' }, -- html is enabled by default - notify = false, - documentation = { - auto_show = true, -- show documentation on select - }, - -- add any external scss like one below - style_sheets = { - 'https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css', - 'https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css', - }, - }, - }, + -- { + -- name = 'html-css', + -- option = { + -- enable_on = { 'html' }, -- html is enabled by default + -- notify = false, + -- documentation = { + -- auto_show = true, -- show documentation on select + -- }, + -- -- add any external scss like one below + -- style_sheets = { + -- 'https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css', + -- 'https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css', + -- }, + -- }, + -- }, }, } end, @@ -898,10 +909,10 @@ require('lazy').setup({ -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. 'folke/tokyonight.nvim', priority = 1000, -- Make sure to load this before all the other start plugins. + opts = { + transparent = true, + }, init = function() - require('tokyonight').setup { - transparent = true, - } -- Load the colorscheme here. -- Like many other themes, this one has different styles, and you could load -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. diff --git a/lazy-lock.json b/lazy-lock.json index 980adc42..d0812950 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,43 +1,41 @@ { "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, - "auto-session": { "branch": "main", "commit": "0577cb821fc4a78858e82174adf2e3b658e4f5f2" }, + "auto-session": { "branch": "main", "commit": "0a1318557c03845f2e0dde347bc54507d1d8c34d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "codecompanion.nvim": { "branch": "main", "commit": "7ffbc5a8f7ba349cea0c3f20bac6c404d4130a4a" }, - "conform.nvim": { "branch": "master", "commit": "b1a75324ddf96b7bb84963a297b1ed334db087c0" }, + "codecompanion.nvim": { "branch": "main", "commit": "3f2cb946f1659133c6754d43990d6c70fd81baf6" }, + "conform.nvim": { "branch": "master", "commit": "eebc724d12c5579d733d1f801386e0ceb909d001" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, - "gitsigns.nvim": { "branch": "main", "commit": "3c76f7fabac723aa682365ef782f88a83ccdb4ac" }, + "gitsigns.nvim": { "branch": "main", "commit": "17ab794b6fce6fce768430ebc925347e349e1d60" }, "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, - "lualine.nvim": { "branch": "master", "commit": "1517caa8fff05e4b4999857319d3b0609a7f57fa" }, + "lualine.nvim": { "branch": "master", "commit": "7de0a690bc1878dd6fc347c599a19a0f34f48dec" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "ea387e0819ab189d536bb4067e4d8ece3801a292" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "98767d37f8e5255a5111fc1e3163232d4dc07bda" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "1255518cb067e038a4755f5cb3e980f79b6ab89c" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, - "mini.nvim": { "branch": "main", "commit": "687fa868d869078194c02065628712982d971fd6" }, + "mini.nvim": { "branch": "main", "commit": "e744b5dbb3158242af77124bd6763a8647ea82ed" }, "neo-tree.nvim": { "branch": "main", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" }, - "neogit": { "branch": "master", "commit": "6d1bd94f7fca92a50a892f494920696b5defa8c8" }, + "neogit": { "branch": "master", "commit": "0542ca3aa9bf0b67b7b7713e4d230f9c1fc2c631" }, "neotest": { "branch": "master", "commit": "dddbe8fe358b05b2b7e54fe4faab50563171a76d" }, - "neotest-maven": { "branch": "main", "commit": "07ae16fe5b8491a484310e8f7a55f9be7c37f863" }, + "neotest-maven": { "branch": "main", "commit": "3fc7b6743c4d9c659653150926838376190230c7" }, "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, - "nvim-autopairs": { "branch": "master", "commit": "84a81a7d1f28b381b32acf1e8fe5ff5bef4f7968" }, + "nvim-autopairs": { "branch": "master", "commit": "2a406cdd8c373ae7fe378a9e062a5424472bd8d8" }, "nvim-cmp": { "branch": "main", "commit": "059e89495b3ec09395262f16b1ad441a38081d04" }, "nvim-dap": { "branch": "master", "commit": "7aade9e99bef5f0735cf966e715b3ce45515d786" }, "nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" }, "nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" }, - "nvim-html-css": { "branch": "main", "commit": "651b98e20d33602d7edfdc1abf43b6626d3ee3d2" }, "nvim-jdtls": { "branch": "master", "commit": "2f7bff9b8d2ee1918b36ca55f19547d9d335a268" }, - "nvim-lint": { "branch": "master", "commit": "93b8040115c9114dac1047311763bef275e752dc" }, - "nvim-lspconfig": { "branch": "master", "commit": "9479cc2740351e36392fb82f3cf86b1a93e2b8ed" }, + "nvim-lint": { "branch": "master", "commit": "e7b4ffa6ab763af012e38b21af2c9159f10d2d33" }, + "nvim-lspconfig": { "branch": "master", "commit": "d3ad666b7895f958d088cceb6f6c199672c404fe" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-treesitter": { "branch": "master", "commit": "30654ee72a69e7c76a54b66d748dae088429e863" }, - "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" }, + "nvim-treesitter": { "branch": "master", "commit": "205faba1768a6e4c854f156bc6a21a41b242599c" }, + "nvim-web-devicons": { "branch": "master", "commit": "481bdaa3dca70c5f1863e634db6afede8980488c" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "render-markdown.nvim": { "branch": "main", "commit": "c283dec1ea94947499c36bb17443e15d6acf5cda" }, "springboot-nvim": { "branch": "main", "commit": "43567bc417c5767bd6d5eb8ff9f8ba8e98d6a9c2" }, "telescope-dap.nvim": { "branch": "master", "commit": "783366bd6c1e7fa0a5c59c07db37f49c805a28df" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, diff --git a/lua/custom/plugins/codecompanion.lua b/lua/custom/plugins/codecompanion.lua index a110e728..d6282c58 100644 --- a/lua/custom/plugins/codecompanion.lua +++ b/lua/custom/plugins/codecompanion.lua @@ -15,10 +15,42 @@ return { adapter = 'openai', }, }, + prompt_library = { + ['Generate PR description'] = { + strategy = 'workflow', + description = 'Generate PR description based on git diff', + prompts = { + { + { + role = 'system', + content = 'You are an expert assistant and the best in analyzing git diffs.', + opts = { + visible = false, + }, + }, + { + role = 'user', + content = function() + vim.g.codecompanion_auto_tool_mode = true + return [[### Steps to Follow + +You are required to create a Pull Request description based on the file at .github/pull_request_template.md. You must use @cmd_runner to read that file. + +1. The file is in Portuguese, so you must complete the description in Portuguese as well. +2. Use @cmd_runner to get the git diff of the current branch, by using the command `git diff origin/HEAD`. +3. Based on that diff, you will generate a Pull Request description based on .github/pull_request_template.md. +4. If necessary, you can obtain the name of the branch by using the command `git rev-parse --abbrev-ref HEAD`. +5. Write the entire pull request description.]] + end, + }, + }, + }, + }, + }, }, }, - { - 'MeanderingProgrammer/render-markdown.nvim', - ft = { 'markdown', 'codecompanion' }, - }, + -- { + -- 'MeanderingProgrammer/render-markdown.nvim', + -- ft = { 'markdown', 'codecompanion' }, + -- }, } diff --git a/lua/custom/plugins/copilot.lua b/lua/custom/plugins/copilot.lua new file mode 100644 index 00000000..9ee26470 --- /dev/null +++ b/lua/custom/plugins/copilot.lua @@ -0,0 +1,11 @@ +return { + -- { + -- 'CopilotC-Nvim/CopilotChat.nvim', + -- dependencies = { + -- { 'zbirenbaum/copilot.lua' }, -- or zbirenbaum/copilot.lua + -- { 'nvim-lua/plenary.nvim', branch = 'master' }, -- for curl, log and async functions + -- }, + -- build = 'make tiktoken', -- Only on MacOS or Linux + -- opts = {}, + -- }, +} diff --git a/lua/custom/plugins/neotest-maven.lua b/lua/custom/plugins/neotest-maven.lua index 5d1526b2..74d501df 100644 --- a/lua/custom/plugins/neotest-maven.lua +++ b/lua/custom/plugins/neotest-maven.lua @@ -1,7 +1,7 @@ return { { 'lucas-garcia-rubio/neotest-maven', - --dir = '~/Repositories/pessoal/plugins/neotest-maven', + -- dir = '~/Repositories/pessoal/plugins/neotest-maven', name = 'neotest-maven', ft = 'java', dependencies = { diff --git a/lua/custom/plugins/noice.lua b/lua/custom/plugins/noice.lua new file mode 100644 index 00000000..cd0c4401 --- /dev/null +++ b/lua/custom/plugins/noice.lua @@ -0,0 +1,15 @@ +return { + -- 'folke/noice.nvim', + -- event = 'VeryLazy', + -- opts = { + -- -- add any options here + -- }, + -- dependencies = { + -- -- if you lazy-load any plugin below, make sure to add proper `module="..."` entries + -- 'MunifTanjim/nui.nvim', + -- -- OPTIONAL: + -- -- `nvim-notify` is only needed, if you want to use the notification view. + -- -- If not available, we use `mini` as the fallback + -- 'rcarriga/nvim-notify', + -- }, +} diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/kickstart/plugins/neo-tree.lua index 80fbab30..ff659e96 100644 --- a/lua/kickstart/plugins/neo-tree.lua +++ b/lua/kickstart/plugins/neo-tree.lua @@ -25,6 +25,9 @@ return { ['\\'] = 'close_window', }, }, + follow_current_file = { + enabled = true, + }, }, }, }