aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lazy-lock.json120
-rw-r--r--lazyvim.json9
-rw-r--r--lua/config/autocmds.lua55
-rw-r--r--lua/config/composer.lua104
-rw-r--r--lua/config/init.lua1
-rw-r--r--lua/config/lazy.lua6
-rw-r--r--lua/pi/dap/init.lua10
-rw-r--r--lua/pi/lsp/servers/phpactor.lua6
-rw-r--r--lua/plugins/CodeGPT.lua10
-rw-r--r--lua/plugins/aerial.lua54
-rw-r--r--lua/plugins/close-buffer.lua12
-rw-r--r--lua/plugins/code-annotation.lua35
-rw-r--r--lua/plugins/codecompanion.lua15
-rw-r--r--lua/plugins/copilot-chat.lua219
-rw-r--r--lua/plugins/flutter.lua2
-rw-r--r--lua/plugins/hurl.lua39
-rw-r--r--lua/plugins/icon-picker.lua2
-rw-r--r--lua/plugins/lsp.lua3
-rw-r--r--lua/plugins/navigator.lua43
-rw-r--r--lua/plugins/neotest.lua6
-rw-r--r--lua/plugins/note.lua29
-rw-r--r--lua/plugins/nvim-ts-autotag.lua7
-rw-r--r--lua/plugins/rayso.lua10
-rw-r--r--lua/plugins/spectre.lua70
-rw-r--r--lua/plugins/undotree.lua40
-rw-r--r--lua/plugins/which-key.lua12
-rw-r--r--lua/plugins/zenmode.lua44
27 files changed, 854 insertions, 109 deletions
diff --git a/lazy-lock.json b/lazy-lock.json
index d778abb..13cefff 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,14 +1,15 @@
{
- "CodeGPT.nvim": { "branch": "master", "commit": "9d0a58a0bdc858f2e9729b8b5ac8b994c3453c8f" },
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
- "CopilotChat.nvim": { "branch": "canary", "commit": "9333944fde3c65868818e245c73aa29eef826e9b" },
+ "CopilotChat.nvim": { "branch": "main", "commit": "1fe19d1fdbf9edcda8bad9b7b2d5e11aa95c1672" },
"FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
+ "LazyVim": { "branch": "main", "commit": "71ea193cf6ee9e8021be2e8c7f277f757779c1ac" },
"LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" },
"NeoColumn.nvim": { "branch": "main", "commit": "db7695c7c70fcacd290712deef659bca464634ee" },
"SmoothCursor.nvim": { "branch": "main", "commit": "12518b284e1e3f7c6c703b346815968e1620bee2" },
+ "aerial.nvim": { "branch": "master", "commit": "fd7fbe36772d7a955815c90ff9b58523bfdb410d" },
"animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" },
"baleia.nvim": { "branch": "main", "commit": "1b25eac3ac03659c3d3af75c7455e179e5f197f7" },
- "buffer_manager.nvim": { "branch": "main", "commit": "fd36131b2b3e0f03fd6353ae2ffc88cf920b3bbb" },
+ "buffer_manager.nvim": { "branch": "main", "commit": "f196217f7c1ddae74ed51dfc2c3befe6d62b26d1" },
"cmp-ai": { "branch": "main", "commit": "fa08e42144b0f3763d1a3fb81bafc495f769cab8" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
@@ -18,113 +19,124 @@
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
- "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
- "codeium.nvim": { "branch": "main", "commit": "17bbefff02be8fd66931f366bd4ed76a76e4a57e" },
+ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
+ "codecompanion.nvim": { "branch": "main", "commit": "c70ae04bf39709b2bb91304514524ad9d452aa5a" },
+ "codeium.nvim": { "branch": "main", "commit": "27d2b1ce8c7ba14dbf6e4504bdea8e5548be5476" },
"color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" },
"composer.nvim": { "branch": "main", "commit": "ec9537969adc7fc128cfe9c3a9925850455896c8" },
"copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" },
- "copilot.lua": { "branch": "master", "commit": "1a237cf50372830a61d92b0adf00d3b23882e0e1" },
+ "copilot.lua": { "branch": "master", "commit": "c810500b69cb8bcea58f2be635cb1340011714b5" },
"direnv.vim": { "branch": "master", "commit": "ab2a7e08dd630060cd81d7946739ac7442a4f269" },
- "dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" },
+ "dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
"duck.nvim": { "branch": "main", "commit": "d8a6b08af440e5a0e2b3b357e2f78bb1883272cd" },
"elixir-tools.nvim": { "branch": "main", "commit": "b465f6aff50257fa466de3886fc3e7de2dcff0de" },
"firenvim": { "branch": "master", "commit": "64f9389b88c8b0c7667d45c171a5f25c42d852fb" },
- "flutter-tools.nvim": { "branch": "main", "commit": "ce18f5da5f9c458cd26eef5c3accb0c37b2263c2" },
- "fzf": { "branch": "master", "commit": "e76aa37fd402f994ff194a02e47576fba928e8f4" },
- "fzf.vim": { "branch": "master", "commit": "ec75ffbfd50630bf2b8d444d89487e149bacf7f3" },
+ "flutter-tools.nvim": { "branch": "main", "commit": "818ad42b204cda5317baa399377ea30b35f6f8be" },
+ "fzf": { "branch": "master", "commit": "7f4964b366acde40dfd0035d925579b4587394d3" },
+ "fzf.vim": { "branch": "master", "commit": "556f45e79ae5e3970054fee4c4373472604a1b4e" },
"git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" },
- "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" },
+ "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
+ "guihua.lua": { "branch": "master", "commit": "d783191eaa75215beae0c80319fcce5e6b3beeda" },
"harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
+ "hurl.nvim": { "branch": "main", "commit": "bc8d748a3754f63d50ee8dfd54e20de80f22754c" },
"hydra.nvim": { "branch": "master", "commit": "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0" },
"icon-picker.nvim": { "branch": "master", "commit": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3" },
"image.nvim": { "branch": "main", "commit": "acbd1d7d64ac0643021a6146eb0557e7c2e793d0" },
- "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" },
+ "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" },
"indent-o-matic": { "branch": "master", "commit": "4d11e98f523d3c4500b1dc33f0d1a248a4f69719" },
- "laravel.nvim": { "branch": "main", "commit": "aabe7c59a7ec64baf3f2af3d56e6852955c065c3" },
- "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" },
- "lspkind-nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" },
+ "laravel.nvim": { "branch": "main", "commit": "325fa34f5e02d5393ad8a38fe7c9e1add94279e8" },
+ "lazy.nvim": { "branch": "main", "commit": "014d1d6d78df4e58f962158e6e00261d8632612c" },
+ "lspkind-nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
"lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" },
- "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
+ "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
"luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" },
"markdown-preview.nvim": { "branch": "main", "commit": "cc05a30393e2bf9f12e2d59fc35a1aa928ed1727" },
- "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
+ "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" },
"mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" },
- "mini.icons": { "branch": "main", "commit": "a2742459f0ee32806c2438ca06b4d8b331f3f4d4" },
- "mini.nvim": { "branch": "main", "commit": "61e5d46fc0cf71306c51275383767d996f559a60" },
+ "mini.icons": { "branch": "main", "commit": "54686be7d58807906cb2c8c2216e0bf9c044f19a" },
+ "mini.nvim": { "branch": "main", "commit": "2435d0de00174a45d6b352fefeaa6008ebe9f23b" },
+ "my-note.nvim": { "branch": "main", "commit": "bce15c38514df229eb446a6b6bef2fcbb1993e80" },
+ "navigator.lua": { "branch": "master", "commit": "b1d0da438b2e0fa32e2d52a4a047b4900bb0e8ca" },
"neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
- "neogen": { "branch": "main", "commit": "e932ba918b56723436b77aa3efb844a11b2851ab" },
- "neorg": { "branch": "main", "commit": "afc9a37bf021acb0853e95714c4c6436e1588286" },
+ "neogen": { "branch": "main", "commit": "37dd095892e3f846418c465852f7b21f81d0f46c" },
+ "neorg": { "branch": "main", "commit": "0460ccd3b97bc100ca1af0270588b4c76d29c4c4" },
"neotest": { "branch": "master", "commit": "6d3d22cdad49999ef774ebe1bc250a4994038964" },
"neotest-go": { "branch": "main", "commit": "92950ad7be2ca02a41abca5c6600ff6ffaf5b5d6" },
"neotest-plenary": { "branch": "master", "commit": "3523adcf9ffaad1911960c5813b0136c1b63a2ec" },
- "neotest-rust": { "branch": "main", "commit": "0418811e1e3499b2501593f2e131d02f5e6823d4" },
+ "neotest-python": { "branch": "master", "commit": "a2861ab3c9a0bf75a56b11835c2bfc8270f5be7e" },
"neotest-vim-test": { "branch": "master", "commit": "75c4228882ae4883b11bfce9b8383e637eb44192" },
- "noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" },
- "none-ls-extras.nvim": { "branch": "main", "commit": "ebb09961f1c0a377f9ed1685740cdf87b5cd39a8" },
+ "noice.nvim": { "branch": "main", "commit": "7b1960c48078a8b2fb44a89db82f4fa637b2d7c8" },
+ "none-ls-extras.nvim": { "branch": "main", "commit": "f50d4dece9f91813f049f8100d188933f7d654d9" },
"none-ls-luacheck.nvim": { "branch": "main", "commit": "a1dfea0d4c40c4023829c8b9a7ab0a26135985ca" },
"none-ls-shellcheck.nvim": { "branch": "main", "commit": "0f84461241e76e376a95fb7391deac82dc3efdbf" },
- "none-ls.nvim": { "branch": "main", "commit": "0e0a940477cc08fa7b1799384a1d668058ed4e61" },
+ "none-ls.nvim": { "branch": "main", "commit": "58866c670d68ef80397c317a3a1ee5f53ca646fd" },
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
"numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" },
- "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
+ "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" },
"nvim-bqf": { "branch": "main", "commit": "1b24dc6050c34e8cd377b6b4cd6abe40509e0187" },
- "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
+ "nvim-cmp": { "branch": "main", "commit": "ca4d3330d386e76967e53b85953c170658255ecb" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
- "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" },
+ "nvim-dap": { "branch": "master", "commit": "580d6e526358afd0e4bba053e68fd59cf581a161" },
"nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" },
"nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
- "nvim-dap-virtual-text": { "branch": "master", "commit": "3497eb39bf413a57ab5b7e7e2e192683e462148c" },
+ "nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" },
"nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" },
- "nvim-html-css": { "branch": "main", "commit": "c514bd27ad560636ed39dea3e370b3103754e244" },
- "nvim-lspconfig": { "branch": "master", "commit": "1c2595e38da319a1a58c94f58afe6fe6fe02e292" },
+ "nvim-early-retirement": { "branch": "main", "commit": "793bc848f71947f004c88c9fbc5604d55d4dddcc" },
+ "nvim-html-css": { "branch": "main", "commit": "4e406d4f1d12b716c1a0805ae63525442f4baf93" },
+ "nvim-lspconfig": { "branch": "master", "commit": "b8b725659fa60d2c5f5bd7459bcfee1d8b34acd5" },
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
"nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
- "nvim-python-repl": { "branch": "main", "commit": "c79254982e32f9d3abf2de0ce72e7bf48dbb9afd" },
- "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" },
+ "nvim-python-repl": { "branch": "main", "commit": "ccc5f104f5e934d49b1571a748a09dc9d210221e" },
+ "nvim-spectre": { "branch": "master", "commit": "08be31c104df3b4b049607694ebb2b6ced4f928b" },
"nvim-transparent": { "branch": "main", "commit": "8a2749a2fa74f97fe6557f61b89ac7fd873f3c21" },
- "nvim-treesitter": { "branch": "master", "commit": "cc2c11c403a9143827501223b4ee64432dcaf246" },
- "nvim-treesitter-context": { "branch": "master", "commit": "ddbc09bb984f0ca0796de2ac7cb27cfb57a0c6da" },
+ "nvim-treesitter": { "branch": "master", "commit": "0c26a5c4bc407fdbca545ab25cf6084fd069444b" },
+ "nvim-treesitter-context": { "branch": "master", "commit": "3288c5af7d3820d716272f1d05ab661cc540a5d6" },
"nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
- "nvim-treesitter-textobjects": { "branch": "master", "commit": "4a2d05ec24eaa6b655c7d19092a3b6c0219d46b9" },
- "nvim-web-devicons": { "branch": "master", "commit": "6b53401918a9033a41159d012160c5fb5eb249ae" },
+ "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
+ "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
+ "nvim-web-devicons": { "branch": "master", "commit": "87c34abe5d1dc7c1c0a95aaaf888059c614c68ac" },
"oil-git-status.nvim": { "branch": "main", "commit": "a7ea816bac0cc3b8b4c3605e2f2b87960be60a05" },
"oil-image-preview.nvim": { "branch": "master", "commit": "a71eacc879e1264339a62019ee3c2ff376f2cc39" },
- "oil.nvim": { "branch": "master", "commit": "9e6fb844fe4cce13d9e3f6a7c970cbc669bb1629" },
+ "oil.nvim": { "branch": "master", "commit": "9a59256c8e88b29d2150e99b5960b2f111e51f75" },
"pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" },
"playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
- "refactoring.nvim": { "branch": "master", "commit": "c406fc5fb4d7ba5fce7b668637075fad6e75e9f8" },
- "rustaceanvim": { "branch": "master", "commit": "29f42cc149f915d771c550b6dfe7c788d856cf04" },
- "smart-splits.nvim": { "branch": "master", "commit": "22ca8bf770965306082fe23dd22822134bf3b70a" },
- "solarized-osaka.nvim": { "branch": "main", "commit": "126d394c0c979a99206214a2b6b8c86e456c9c0f" },
- "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
- "telescope-file-browser.nvim": { "branch": "master", "commit": "3b8a1e17187cfeedb31decbd625da62398a8ff34" },
+ "rayso.nvim": { "branch": "main", "commit": "4a94c6fa2410e3800cf47a03b8f5e5315595ba99" },
+ "refactoring.nvim": { "branch": "master", "commit": "2db6d378e873de31d18ade549c2edba64ff1c2e3" },
+ "render-markdown.nvim": { "branch": "main", "commit": "3d2dc15542e56671dd14dfbfff63434ec21d8fcd" },
+ "rustaceanvim": { "branch": "master", "commit": "a244210b28f9055c2b4cfa85c92c8a71c13671c9" },
+ "smart-splits.nvim": { "branch": "master", "commit": "264e865589389409f1ac1da7673b1b732b1e8963" },
+ "solarized-osaka.nvim": { "branch": "main", "commit": "b023c3f3b9f1ce5b67c22e4401563d03554921cf" },
+ "telescope-dap.nvim": { "branch": "master", "commit": "783366bd6c1e7fa0a5c59c07db37f49c805a28df" },
+ "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
"telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" },
"telescope-live-grep-args.nvim": { "branch": "master", "commit": "649b662a8f476fd2c0289570764459e95ebaa3f3" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
- "telescope.nvim": { "branch": "master", "commit": "eae0d8fbde590b0eaa2f9481948cd6fd7dd21656" },
+ "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
- "treesj": { "branch": "main", "commit": "0d81326b5afd36babe7dd480aabbb0b05f33e688" },
- "trouble.nvim": { "branch": "main", "commit": "254145ffd528b98eb20be894338e2d5c93fa02c2" },
+ "treesj": { "branch": "main", "commit": "03415ac60791d48e120a80d37e080744faf3ac15" },
+ "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
"twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
"undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
- "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" },
- "vim-dadbod-completion": { "branch": "master", "commit": "880f7e9f2959e567c718d52550f9fae1aa07aa81" },
- "vim-dadbod-ui": { "branch": "master", "commit": "f29c85ab42861c6ef683289b0c6a51e0d436dcf6" },
+ "vim-dadbod": { "branch": "master", "commit": "fe5a55e92b2dded7c404006147ef97fb073d8b1b" },
+ "vim-dadbod-completion": { "branch": "master", "commit": "04485bfb53a629423233a4178d71cd4f8abf7406" },
+ "vim-dadbod-ui": { "branch": "master", "commit": "7f89265a84fc003ccfa500fd99b9fea9db2c75c7" },
"vim-dispatch": { "branch": "master", "commit": "a2ff28abdb2d89725192db5b8562977d392a4d3f" },
"vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" },
"vim-easy-align": { "branch": "master", "commit": "9815a55dbcd817784458df7a18acacc6f82b1241" },
- "vim-eunuch": { "branch": "master", "commit": "8fb3904be27b6b60d086f87c2570085902414069" },
- "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
+ "vim-eunuch": { "branch": "master", "commit": "6c6af39aa0a25223389607338ae965c5dfc7c972" },
+ "vim-fugitive": { "branch": "master", "commit": "320b18fba2a4f2fe3c8225c778c687e0d2620384" },
"vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
+ "vim-jsdoc": { "branch": "master", "commit": "6e5bc2a1f98a69e4902081c9f5969b228a7a5fd6" },
"vim-lastplace": { "branch": "master", "commit": "e58cb0df716d3c88605ae49db5c4741db8b48aa9" },
"vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
"vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
- "vim-test": { "branch": "master", "commit": "c090bfd93919888bb0b86e1ab707bc6a3095097f" },
- "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
+ "vim-test": { "branch": "master", "commit": "8872ec0f788af934386b2aef0cd28a5c2b923146" },
+ "which-key.nvim": { "branch": "main", "commit": "9b365a6428a9633e3eeb34dbef1b791511c54f70" },
+ "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }
}
diff --git a/lazyvim.json b/lazyvim.json
new file mode 100644
index 0000000..8e6b0ec
--- /dev/null
+++ b/lazyvim.json
@@ -0,0 +1,9 @@
+{
+ "extras": [
+
+ ],
+ "news": {
+ "NEWS.md": "6520"
+ },
+ "version": 6
+} \ No newline at end of file
diff --git a/lua/config/autocmds.lua b/lua/config/autocmds.lua
index 86d3e1d..24ff236 100644
--- a/lua/config/autocmds.lua
+++ b/lua/config/autocmds.lua
@@ -38,17 +38,6 @@ vim.api.nvim_create_autocmd({ "BufWritePre" }, {
end,
})
-if vim.fn.has "persistent_undo" then
- local target_path = vim.fn.expand "~/.cache/undodir"
- -- crear el directorio y cualquier directorio padre
- -- si la ubicación no existe.
- if not vim.fn.isdirectory(target_path) then
- vim.fn.mkdir(target_path, "p", 0700)
- end
-
- vim.o.undodir = target_path
- vim.o.undofile = true
-end
-- Función para alternar el ajuste de línea
function ToggleWrap()
local wrap = vim.wo.wrap
@@ -84,3 +73,47 @@ vim.api.nvim_create_autocmd("BufEnter", {
end
end,
})
+
+-- Autocmds are automatically loaded on the VeryLazy event
+-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
+-- Add any additional autocmds here
+--
+local function augroup(name)
+ return vim.api.nvim_create_augroup("my_lazyvim_" .. name, { clear = true })
+end
+
+-- Set filetype for .env and .env.* files
+vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
+ group = augroup("env_filetype"),
+ pattern = { "*.env", ".env.*" },
+ callback = function()
+ vim.opt_local.filetype = "sh"
+ end,
+})
+
+-- Set filetype for .hurl files
+vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
+ group = augroup("hurl_filetype"),
+ pattern = { "*.hurl" },
+ callback = function()
+ vim.opt_local.filetype = "hurl"
+ end,
+})
+
+-- Set filetype for .toml files
+vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
+ group = augroup("toml_filetype"),
+ pattern = { "*.tomg-config*" },
+ callback = function()
+ vim.opt_local.filetype = "toml"
+ end,
+})
+
+-- Set filetype for .ejs files
+vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
+ group = augroup("ejs_filetype"),
+ pattern = { "*.ejs", "*.ejs.t" },
+ callback = function()
+ vim.opt_local.filetype = "embedded_template"
+ end,
+})
diff --git a/lua/config/composer.lua b/lua/config/composer.lua
new file mode 100644
index 0000000..2405416
--- /dev/null
+++ b/lua/config/composer.lua
@@ -0,0 +1,104 @@
+vim.treesitter.query.set(
+ "json",
+ "composer_dependencies",
+ [[
+ (pair
+ key: (string
+ (string_content) @key (#match? @key "require|require-dev")
+ )
+ value: (object
+ (pair
+ key: (string (string_content) @depen)
+ )
+ )
+ )
+ ]]
+)
+local group = vim.api.nvim_create_augroup("composer-info", {})
+vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost" }, {
+ pattern = "composer.json",
+ group = group,
+ callback = function(event)
+ local parser = vim.treesitter.get_parser(event.buf, "json")
+ local tree = parser:parse()[1]
+ if tree == nil then
+ return
+ end
+ local query = vim.treesitter.query.get("json", "composer_dependencies")
+ if not query then
+ return
+ end
+
+ local dependencies = {}
+
+ for id, node in query:iter_captures(tree:root(), event.buf) do
+ if query.captures[id] == "depen" then
+ table.insert(dependencies, {
+ name = vim.treesitter.get_node_text(node, event.buf),
+ line = node:start(),
+ })
+ end
+ end
+
+ if #dependencies == 0 then
+ return
+ end
+
+ local ns = vim.api.nvim_create_namespace("composer-deps")
+ vim.api.nvim_buf_clear_namespace(event.buf, ns, 0, -1)
+
+ vim.system(
+ { "composer", "info", "-f", "json" },
+ {},
+ vim.schedule_wrap(function(out)
+ if out.code ~= 0 then
+ return
+ end
+
+ local data = vim.json.decode(out.stdout, {})
+ if type(data.installed) ~= "table" then
+ return
+ end
+
+ for _, dep in ipairs(dependencies) do
+ local info = vim.iter(data.installed):find(function(inst)
+ return dep.name == inst.name
+ end)
+ if info then
+ vim.api.nvim_buf_set_extmark(event.buf, ns, dep.line, 0, {
+ virt_text = { { string.format('<- %s', info.version), "comment" } },
+ virt_text_pos = "eol",
+ })
+ end
+ end
+ end)
+ )
+ vim.system(
+ { "composer", "outdated", "-f", "json" },
+ {},
+ vim.schedule_wrap(function(out)
+ if out.code ~= 0 then
+ return
+ end
+
+ local data = vim.json.decode(out.stdout, {})
+ if type(data.installed) ~= "table" then
+ return
+ end
+
+ for _, dep in ipairs(dependencies) do
+ local info = vim.iter(data.installed):find(function(inst)
+ return dep.name == inst.name
+ end)
+ if info then
+ vim.api.nvim_buf_set_extmark(event.buf, ns, dep.line - 1, 0, {
+ virt_text = { { string.format('^ %s (new version)', info.latest), "error" } },
+ virt_text_pos = "eol",
+ })
+ end
+ end
+ end)
+ )
+ end,
+})
+
diff --git a/lua/config/init.lua b/lua/config/init.lua
index 008ebf5..74e9c00 100644
--- a/lua/config/init.lua
+++ b/lua/config/init.lua
@@ -8,6 +8,7 @@ vim.api.nvim_create_autocmd("User", {
require "config.usercmds"
require "config.keymaps"
require "config.diagnostic"
+ require "config.composer"
end,
})
require "config.lazy"
diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua
index 70aaec7..34e034f 100644
--- a/lua/config/lazy.lua
+++ b/lua/config/lazy.lua
@@ -13,7 +13,7 @@ vim.opt.rtp:prepend(lazypath)
require("lazy").setup {
-- leave nil when passing the spec as the first argument to setup()
- spec = { { import = "plugins" } },
+ spec = { { "LazyVim/LazyVim", import = "plugins" } },
local_spec = true, -- load project specific .lazy.lua spec files. They will be added at the end of the spec.
defaults = {
-- Set this to `true` to have all your plugins lazy-loaded by default.
@@ -200,7 +200,3 @@ require("lazy").setup {
},
}
-
-
-
-
diff --git a/lua/pi/dap/init.lua b/lua/pi/dap/init.lua
index 97084fd..13b6954 100644
--- a/lua/pi/dap/init.lua
+++ b/lua/pi/dap/init.lua
@@ -10,11 +10,11 @@ for _, ft_path in ipairs(vim.api.nvim_get_runtime_file("lua/pi/dap/configs/*.lua
end
-- Signs
-vim.fn.sign_define("DapBreakpoint", { text = "", texthl = "", linehl = "", numhl = "" })
-vim.fn.sign_define("DapStopped", { text = "▶", texthl = "", linehl = "", numhl = "" })
-vim.fn.sign_define("DapBreakpointRejected", { text = "", texthl = "", linehl = "", numhl = "" })
-vim.fn.sign_define("DapBreakpointCondition", { text = "", texthl = "", linehl = "", numhl = "" })
-vim.fn.sign_define("DapLogPoint", { text = "󰍢", texthl = "", linehl = "", numhl = "" })
+vim.fn.sign_define("DapBreakpoint", { text = " ", texthl = "", linehl = "", numhl = "" })
+vim.fn.sign_define("DapStopped", { text = " ", texthl = "", linehl = "", numhl = "" })
+vim.fn.sign_define("DapBreakpointRejected", { text = " ", texthl = "", linehl = "", numhl = "" })
+vim.fn.sign_define("DapBreakpointCondition", { text = " ", texthl = "", linehl = "", numhl = "" })
+vim.fn.sign_define("DapLogPoint", { text = "󰍢 ", texthl = "", linehl = "", numhl = "" })
-- UI structure
dapui.setup {
diff --git a/lua/pi/lsp/servers/phpactor.lua b/lua/pi/lsp/servers/phpactor.lua
index e5a92ed..6196cdb 100644
--- a/lua/pi/lsp/servers/phpactor.lua
+++ b/lua/pi/lsp/servers/phpactor.lua
@@ -28,8 +28,8 @@ local function phpactor_attach(_, bufnr)
},
position = "50%",
size = {
- width = "80%",
- height = "60%",
+ width = "60%",
+ height = "40%",
},
}
@@ -65,7 +65,7 @@ return function(ops)
["language_server_configuration.auto_config"] = false,
["code_transform.import_globals"] = true,
["language_server_phpstan.enabled"] = true,
- ["language_server_phpstan.level"] = 7,
+ ["language_server_phpstan.level"] = "7",
["language_server_phpstan.bin"] = "phpstan",
},
handlers = {
diff --git a/lua/plugins/CodeGPT.lua b/lua/plugins/CodeGPT.lua
deleted file mode 100644
index ee3579b..0000000
--- a/lua/plugins/CodeGPT.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-return {
- "dpayne/CodeGPT.nvim",
- dependencies = {
- 'nvim-lua/plenary.nvim',
- 'MunifTanjim/nui.nvim',
- },
- config = function()
- require("codegpt.config")
- end
-}
diff --git a/lua/plugins/aerial.lua b/lua/plugins/aerial.lua
new file mode 100644
index 0000000..f8bc139
--- /dev/null
+++ b/lua/plugins/aerial.lua
@@ -0,0 +1,54 @@
+-- Silent keymap option
+local opts = { silent = true }
+
+return {
+ {
+ "folke/edgy.nvim",
+ optional = true,
+ opts = function(_, opts)
+ opts.right = opts.right or {}
+ table.insert(opts.right, "aerial")
+ table.insert(opts.right, {
+ title = "hurl.nvim",
+ ft = "hurl-nvim",
+ size = { width = 0.5 },
+ })
+
+ end,
+ },
+ {
+ "stevearc/aerial.nvim",
+ keys = {
+ { "<leader>ta", "<cmd>AerialToggle<cr>", desc = "AerialToggle" },
+ },
+ config = function()
+ local status_ok, aerial = pcall(require, "aerial")
+ if not status_ok then
+ return
+ end
+
+ aerial.setup({
+ -- optionally use on_attach to set keymaps when aerial has attached to a buffer
+ on_attach = function(bufnr)
+ -- Jump forwards/backwards with '{' and '}'
+ vim.keymap.set("n", "{", "<cmd>AerialPrev<CR>", { buffer = bufnr })
+ vim.keymap.set("n", "}", "<cmd>AerialNext<CR>", { buffer = bufnr })
+
+ vim.keymap.set("n", "<leader>fi", "<cmd>Telescope aerial<CR>", opts)
+ end,
+ })
+
+ local tele_status_ok, telescope = pcall(require, "telescope")
+ if not tele_status_ok then
+ return
+ end
+
+ -- Define a custom command to open aerial with telescope
+ vim.keymap.set("n", "<leader>fi", "<cmd>Telescope aerial<CR>", {
+ desc = "Telescope Aerial",
+ })
+
+ telescope.load_extension("aerial")
+ end,
+ },
+}
diff --git a/lua/plugins/close-buffer.lua b/lua/plugins/close-buffer.lua
new file mode 100644
index 0000000..947f31a
--- /dev/null
+++ b/lua/plugins/close-buffer.lua
@@ -0,0 +1,12 @@
+return {
+ -- Send buffers into early retirement by automatically closing them after x minutes of inactivity.
+ {
+ "chrisgrieser/nvim-early-retirement",
+ config = true,
+ event = "VeryLazy",
+ opts = {
+ -- if a buffer has been inactive for this many minutes, close it
+ retirementAgeMins = 30,
+ },
+ },
+}
diff --git a/lua/plugins/code-annotation.lua b/lua/plugins/code-annotation.lua
new file mode 100644
index 0000000..eae61d0
--- /dev/null
+++ b/lua/plugins/code-annotation.lua
@@ -0,0 +1,35 @@
+local neogeo_opts = {}
+
+if not vim.g.vscode then
+ neogeo_opts = {
+ enabled = true,
+ -- Only use luasnip as snippet engine if that is not vscode
+ snippet_engine = "luasnip",
+ }
+end
+
+return {
+ -- JsDoc generator
+ {
+ "heavenshell/vim-jsdoc",
+ ft = "javascript,typescript,typescriptreact,svelte",
+ cmd = "JsDoc",
+ keys = {
+ { "<leader>jd", "<cmd>JsDoc<cr>", desc = "JsDoc" },
+ },
+ -- make sure that you will have lehre install locally on plugin folder, refer https://github.com/heavenshell/vim-jsdoc#manual-installation
+ build = "make install",
+ },
+ {
+ -- A better annotation generator. Supports multiple languages and annotation conventions.
+ -- <C-n> to jump to next annotation, <C-p> to jump to previous annotation
+ "danymat/neogen",
+ vscode = true,
+ dependencies = "nvim-treesitter/nvim-treesitter",
+ opts = neogeo_opts,
+ cmd = "Neogen",
+ keys = {
+ { "<leader>ci", "<cmd>Neogen<cr>", desc = "Neogen - Annotation generator" },
+ },
+ },
+}
diff --git a/lua/plugins/codecompanion.lua b/lua/plugins/codecompanion.lua
new file mode 100644
index 0000000..a98a7af
--- /dev/null
+++ b/lua/plugins/codecompanion.lua
@@ -0,0 +1,15 @@
+return {
+ "olimorris/codecompanion.nvim",
+ dependencies = {
+ "nvim-lua/plenary.nvim",
+ "nvim-treesitter/nvim-treesitter",
+ "hrsh7th/nvim-cmp", -- Optional: For using slash commands and variables in the chat buffer
+ "nvim-telescope/telescope.nvim", -- Optional: For using slash commands
+ {
+ "MeanderingProgrammer/render-markdown.nvim",
+ ft = { "markdown", "codecompanion" },
+ }, -- Optional: For prettier markdown rendering
+ { "stevearc/dressing.nvim", opts = {} }, -- Optional: Improves `vim.ui.select`
+ },
+ config = true,
+}
diff --git a/lua/plugins/copilot-chat.lua b/lua/plugins/copilot-chat.lua
index 63ec0b2..0ae500d 100644
--- a/lua/plugins/copilot-chat.lua
+++ b/lua/plugins/copilot-chat.lua
@@ -1,15 +1,224 @@
+local IS_DEV = false
+
+local prompts = {
+ -- Code related prompts
+ Explain = "Please explain how the following code works.",
+ Review = "Please review the following code and provide suggestions for improvement.",
+ Tests = "Please explain how the selected code works, then generate unit tests for it.",
+ Refactor = "Please refactor the following code to improve its clarity and readability.",
+ FixCode = "Please fix the following code to make it work as intended.",
+ FixError = "Please explain the error in the following text and provide a solution.",
+ BetterNamings = "Please provide better names for the following variables and functions.",
+ Documentation = "Please provide documentation for the following code.",
+ SwaggerApiDocs = "Please provide documentation for the following API using Swagger.",
+ SwaggerJsDocs = "Please write JSDoc for the following API using Swagger.",
+ -- Text related prompts
+ Summarize = "Please summarize the following text.",
+ Spelling = "Please correct any grammar and spelling errors in the following text.",
+ Wording = "Please improve the grammar and wording of the following text.",
+ Concise = "Please rewrite the following text to make it more concise.",
+}
+
return {
+ -- { import = "plugins.extras.copilot-vim" }, -- Or use { import = "lazyvim.plugins.extras.coding.copilot" },
+ {
+ "folke/which-key.nvim",
+ optional = true,
+ opts = {
+ spec = {
+ { "<leader>a", group = "ai" },
+ { "gm", group = "+Copilot chat" },
+ { "gmh", desc = "Show help" },
+ { "gmd", desc = "Show diff" },
+ { "gmp", desc = "Show system prompt" },
+ { "gms", desc = "Show selection" },
+ { "gmy", desc = "Yank diff" },
+ },
+ },
+ },
{
+ dir = IS_DEV and "~/Projects/resea