mirror of
https://github.com/LazyVim/LazyVim.git
synced 2025-07-14 11:24:38 +02:00
Merge branch 'main' into main
This commit is contained in:
commit
1a34fc6c3a
63 changed files with 1832 additions and 625 deletions
2
.github/.release-please-manifest.json
vendored
2
.github/.release-please-manifest.json
vendored
|
@ -1,3 +1,3 @@
|
||||||
{
|
{
|
||||||
".": "13.5.3"
|
".": "14.8.0"
|
||||||
}
|
}
|
||||||
|
|
298
CHANGELOG.md
298
CHANGELOG.md
|
@ -1,5 +1,303 @@
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [14.8.0](https://github.com/LazyVim/LazyVim/compare/v14.7.0...v14.8.0) (2025-01-20)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **chezmoi:** add snacks picker integration for chezmoi files ([#5429](https://github.com/LazyVim/LazyVim/issues/5429)) ([970d1a0](https://github.com/LazyVim/LazyVim/commit/970d1a05da37554aa17b671c869431a7b387d8be))
|
||||||
|
* **dial:** add checkbox augend for markdown ([#5411](https://github.com/LazyVim/LazyVim/issues/5411)) ([b19f207](https://github.com/LazyVim/LazyVim/commit/b19f2070b847a3067436f4d16a0cc5b84a9f9819))
|
||||||
|
* **snacks.picker:** added leader-sS to search lsp workspace symbols ([8787ec1](https://github.com/LazyVim/LazyVim/commit/8787ec1227e10123ad7291cf916020d9a8626525))
|
||||||
|
* **snacks:** added git diff keymap to pick hunks with leader-gd ([62cb4a4](https://github.com/LazyVim/LazyVim/commit/62cb4a465c490c7d41f7a3bf52fb0e222f2cf83b))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **markdown:** disable checkbox rendering since it's annoying to edit ([4f31bfa](https://github.com/LazyVim/LazyVim/commit/4f31bfab86402c819e5ea1e18b3c5d139628c864))
|
||||||
|
* **snacks.picker:** fix mapping for `Recent (cwd)` ([#5407](https://github.com/LazyVim/LazyVim/issues/5407)) ([8307b0f](https://github.com/LazyVim/LazyVim/commit/8307b0fe506a38417f3b7835e2c4b43d9a970946))
|
||||||
|
* **snacks.picker:** fix mapping for Projects for consistency ([#5433](https://github.com/LazyVim/LazyVim/issues/5433)) ([eb7b453](https://github.com/LazyVim/LazyVim/commit/eb7b453b48ab7e3008013e0edf2822f622111e97))
|
||||||
|
* **snacks.picker:** respect lazyvim.config.kind_filter ([#5415](https://github.com/LazyVim/LazyVim/issues/5415)) ([df7426e](https://github.com/LazyVim/LazyVim/commit/df7426eefa79d5dfa2fcbe2f381abfb2cca70bad))
|
||||||
|
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* **java:** setting opts.dap_main to false to disable main class scan ([#5391](https://github.com/LazyVim/LazyVim/issues/5391)) ([66c3577](https://github.com/LazyVim/LazyVim/commit/66c3577bc779d31a7c2addd47de7cc6d215795ba))
|
||||||
|
|
||||||
|
## [14.7.0](https://github.com/LazyVim/LazyVim/compare/v14.6.1...v14.7.0) (2025-01-14)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **extras:** added extra for snacks picker ([#5368](https://github.com/LazyVim/LazyVim/issues/5368)) ([13044c2](https://github.com/LazyVim/LazyVim/commit/13044c298ed1837a2d938b64710528d359dc8407))
|
||||||
|
|
||||||
|
## [14.6.1](https://github.com/LazyVim/LazyVim/compare/v14.6.0...v14.6.1) (2025-01-08)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **blink:** added new luasnip preset ([8d2d9a9](https://github.com/LazyVim/LazyVim/commit/8d2d9a9bd965aab0a752f24ec327d2f391a8406b))
|
||||||
|
* **luasnip:** correctly remove duplicate snippets ([#5214](https://github.com/LazyVim/LazyVim/issues/5214)) ([05c3447](https://github.com/LazyVim/LazyVim/commit/05c3447558fa6eef7ae3c0d3e7ed1c281572274d))
|
||||||
|
* **nlua:** debugger not responding ([#5319](https://github.com/LazyVim/LazyVim/issues/5319)) ([4e746d0](https://github.com/LazyVim/LazyVim/commit/4e746d0e5625662e1f121b39f63836b653ed728b))
|
||||||
|
|
||||||
|
## [14.6.0](https://github.com/LazyVim/LazyVim/compare/v14.5.0...v14.6.0) (2024-12-20)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **colorscheme:** add fzf integration to catppuccin ([#5175](https://github.com/LazyVim/LazyVim/issues/5175)) ([751803f](https://github.com/LazyVim/LazyVim/commit/751803f98bf3baaf7db1c1e2ddd28e082396124a))
|
||||||
|
* **lualine:** add fzf extensions. ([#5203](https://github.com/LazyVim/LazyVim/issues/5203)) ([7a16a75](https://github.com/LazyVim/LazyVim/commit/7a16a752ba1fa535bb54d6492fb8df6c72ab8ba0))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **blink:** remove compatibility with 0.7.6 release ([#5212](https://github.com/LazyVim/LazyVim/issues/5212)) ([857f330](https://github.com/LazyVim/LazyVim/commit/857f330c2139c328cfce0251b11713dc179d6a81))
|
||||||
|
* **codeium:** doesnt automatically load when `vim.g.ai_cmp` is set to false ([#5182](https://github.com/LazyVim/LazyVim/issues/5182)) ([b51279c](https://github.com/LazyVim/LazyVim/commit/b51279c6d727a09cd3d2bf3c9d0cf829810280bb))
|
||||||
|
* **fzf:** fzf.lua compatible hidden scrollbar ([#5177](https://github.com/LazyVim/LazyVim/issues/5177)) ([3a79273](https://github.com/LazyVim/LazyVim/commit/3a79273f3c3bbd22bcdba795b7b8fe6a949db96e))
|
||||||
|
* **luasnip:** use blink's luasnip source. Closes [#5211](https://github.com/LazyVim/LazyVim/issues/5211) ([86de9c9](https://github.com/LazyVim/LazyVim/commit/86de9c9e443572b0244ee9bbdcf5f10ecaabaf74))
|
||||||
|
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* **supermaven:** add lazy-loading ([#5183](https://github.com/LazyVim/LazyVim/issues/5183)) ([a3a28bf](https://github.com/LazyVim/LazyVim/commit/a3a28bf8e43f7239316942c2f2bac6e74b28586b))
|
||||||
|
|
||||||
|
|
||||||
|
### Reverts
|
||||||
|
|
||||||
|
* fix(fzf): fzf.lua compatible hidden scrollbar ([#5177](https://github.com/LazyVim/LazyVim/issues/5177)) ([c40692c](https://github.com/LazyVim/LazyVim/commit/c40692c1b0a95492eead8cc093972c634d54043b))
|
||||||
|
|
||||||
|
## [14.5.0](https://github.com/LazyVim/LazyVim/compare/v14.4.0...v14.5.0) (2024-12-17)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **blink:** increase lazydev scores ([22015e0](https://github.com/LazyVim/LazyVim/commit/22015e0b4835ae148c19b459bf494fe5f72b415b))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **blink:** add `vim.snippet` fixes to blink (was already added to cmp). Fixes [#5067](https://github.com/LazyVim/LazyVim/issues/5067) ([5ea3cfa](https://github.com/LazyVim/LazyVim/commit/5ea3cfa48e6ac88b90282da86dba7799f67b2e30))
|
||||||
|
* **blink:** don't trigger automatically on insert ([2cf3d23](https://github.com/LazyVim/LazyVim/commit/2cf3d234bfc31a1a4eda282ddabc12987f762893))
|
||||||
|
* **blink:** remove show_on_insert_on_trigger_character since this has been fixed for {} and others ([0f3a120](https://github.com/LazyVim/LazyVim/commit/0f3a1201861e6d6e8834aa8937dcf3e4a70a937a))
|
||||||
|
* **illuminate:** disable snacks.words when illuminate extra is enabled. Fixes [#5125](https://github.com/LazyVim/LazyVim/issues/5125) ([d025115](https://github.com/LazyVim/LazyVim/commit/d0251155ab2a293136c933b4e925e1fa16d39a2d))
|
||||||
|
* **supermaven:** don't attach to bigfile and some snacks ft. Fixes [#5139](https://github.com/LazyVim/LazyVim/issues/5139) ([25ee13c](https://github.com/LazyVim/LazyVim/commit/25ee13ce29ad8c4e10d677e641955cfd3c810fb5))
|
||||||
|
* **vscode:** disable some snacks plugins in vscode. Closes [#5124](https://github.com/LazyVim/LazyVim/issues/5124) ([301135b](https://github.com/LazyVim/LazyVim/commit/301135b2749affe71645c610001c8253ae78c591))
|
||||||
|
|
||||||
|
## [14.4.0](https://github.com/LazyVim/LazyVim/compare/v14.3.0...v14.4.0) (2024-12-15)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **blink:** boost results from ai providers and enable async, to get much faster completions ([6bc56e4](https://github.com/LazyVim/LazyVim/commit/6bc56e4e8142e3d453f2fbfea8ace62fcfc3750f))
|
||||||
|
* **keymaps:** unlink luasnip on `esc` ([ef91026](https://github.com/LazyVim/LazyVim/commit/ef9102677f9b7a31d0bb7cfcd76f24401a7385fc))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **blink:** allow overriding `<Tab>` key. Fixes [#5095](https://github.com/LazyVim/LazyVim/issues/5095). Closes [#5099](https://github.com/LazyVim/LazyVim/issues/5099) ([89314cb](https://github.com/LazyVim/LazyVim/commit/89314cb2aae76b434122592ac8da264fa689bdff))
|
||||||
|
* **keymaps:** better escape ([8f113a5](https://github.com/LazyVim/LazyVim/commit/8f113a514c130cba8d0f79acdd091d18ef997829))
|
||||||
|
|
||||||
|
## [14.3.0](https://github.com/LazyVim/LazyVim/compare/v14.2.0...v14.3.0) (2024-12-15)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **config:** better icon for snippets ([195a6e6](https://github.com/LazyVim/LazyVim/commit/195a6e611495da9dbb1afef4b470926cc2535f19))
|
||||||
|
* **keymaps:** stop native snippets on escape. Closes [#5083](https://github.com/LazyVim/LazyVim/issues/5083) ([15c81fd](https://github.com/LazyVim/LazyVim/commit/15c81fdbb839f0c657fe4c077114475e82f423fe))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **blink:** super-tab and ai completions ([413566a](https://github.com/LazyVim/LazyVim/commit/413566af591e9152f156944bff35c89d5d973148))
|
||||||
|
|
||||||
|
## [14.2.0](https://github.com/LazyVim/LazyVim/compare/v14.1.0...v14.2.0) (2024-12-14)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **blink:** add `<c-y>` to keymaps ([3866fbc](https://github.com/LazyVim/LazyVim/commit/3866fbcd40dfd52f4012dfbb434208a9f953cf05))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **blink:** `draw.treesitter` expects table ([#5044](https://github.com/LazyVim/LazyVim/issues/5044)) ([08a7f7e](https://github.com/LazyVim/LazyVim/commit/08a7f7e3f92aeced3092c5ec462d784f765e8654))
|
||||||
|
* **blink:** compat with 0.7.6 ([63eab6d](https://github.com/LazyVim/LazyVim/commit/63eab6d9a54b6d9e93d3cc445d57014bbe8cc271))
|
||||||
|
* **blink:** only override color symbol kind for blink ([b07378d](https://github.com/LazyVim/LazyVim/commit/b07378dde40f1fa98b099cbd496129f5ca376e2c))
|
||||||
|
* **health:** added `fzf` to healthchecks ([380cea9](https://github.com/LazyVim/LazyVim/commit/380cea97bf92fda3ad4ae14d1d4d37acffe5019a))
|
||||||
|
* **health:** added curl to health checks ([5de1532](https://github.com/LazyVim/LazyVim/commit/5de15329fb5f7a846140fca96f9c5587245d63c1))
|
||||||
|
|
||||||
|
## [14.1.0](https://github.com/LazyVim/LazyVim/compare/v14.0.2...v14.1.0) (2024-12-13)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **blink:** use block vs. icon for colors ([#5037](https://github.com/LazyVim/LazyVim/issues/5037)) ([4488cb2](https://github.com/LazyVim/LazyVim/commit/4488cb24f72e04dd5adb2e7c0388a51c2b36f4f0))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **blink:** add backward compat for config ([1517ec9](https://github.com/LazyVim/LazyVim/commit/1517ec9bb46b454d253186aff5e5abd41e96d723))
|
||||||
|
|
||||||
|
## [14.0.2](https://github.com/LazyVim/LazyVim/compare/v14.0.1...v14.0.2) (2024-12-13)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **cmp:** disable nvim-cmp/blink.cmp when needed ([60b7704](https://github.com/LazyVim/LazyVim/commit/60b77045d57d5473e50042b9b879c9c1054e6a10))
|
||||||
|
* **cmp:** wrong extras check for nvim-cmp ([009e358](https://github.com/LazyVim/LazyVim/commit/009e3587be1badc04c9a8b8b459e8555b405509c))
|
||||||
|
|
||||||
|
## [14.0.1](https://github.com/LazyVim/LazyVim/compare/v14.0.0...v14.0.1) (2024-12-13)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **NEWS:** typo ([0fd7140](https://github.com/LazyVim/LazyVim/commit/0fd7140a6de936edb27a4ba4f4825153ae801c21))
|
||||||
|
|
||||||
|
## [14.0.0](https://github.com/LazyVim/LazyVim/compare/v13.9.1...v14.0.0) (2024-12-13)
|
||||||
|
|
||||||
|
|
||||||
|
### ⚠ BREAKING CHANGES
|
||||||
|
|
||||||
|
* **cmp:** moved `nvim-cmp` to extras and prefer `blink.cmp` on Neovim >= `0.10` as default completion engine
|
||||||
|
* **cmp:** moved `nvim-cmp` to extras and prefer `blink.cmp` on Neovim >= `0.10` as default completion engine
|
||||||
|
* **snacks:** use `snacks.scope` indent objects in favor of custom `mini.ai` indent objects
|
||||||
|
* **snacks:** use `snacks.indent` and moved `indent-blankline` to extras
|
||||||
|
* **pick:** make fzf the default picker for LazyVim
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **cmp:** moved `nvim-cmp` to extras and prefer `blink.cmp` on Neovim >= `0.10` as default completion engine ([152f9d1](https://github.com/LazyVim/LazyVim/commit/152f9d113fa2b4fc2af72d2846c4dd68c31b7596))
|
||||||
|
* **cmp:** moved `nvim-cmp` to extras and prefer `blink.cmp` on Neovim >= `0.10` as default completion engine ([2cbfb9b](https://github.com/LazyVim/LazyVim/commit/2cbfb9b6b7b9b4bb1c9ce94ad02ab0a851310fc0))
|
||||||
|
* **keymaps:** added leader-uD to toggle dim mode ([9b97388](https://github.com/LazyVim/LazyVim/commit/9b973882b8bcbab32f850da7c553cdc6388af4ad))
|
||||||
|
* **keymaps:** added leader-z to toggle zen mode ([e6d6a09](https://github.com/LazyVim/LazyVim/commit/e6d6a096b34ad887b9f954a3f43bcc3fd7833f73))
|
||||||
|
* **keymaps:** added leader-Z to toggle zoom ([f2e1cac](https://github.com/LazyVim/LazyVim/commit/f2e1cac965e41d7761073856b11bea223cac1e4d))
|
||||||
|
* **lualine:** add snacks profiler status ([7bc8490](https://github.com/LazyVim/LazyVim/commit/7bc8490d46e002d624f45037fc507e8dd10d4b70))
|
||||||
|
* **pick:** make fzf the default picker for LazyVim ([ae2340f](https://github.com/LazyVim/LazyVim/commit/ae2340f60a012df125c87fe46e6d98d0be04bd10))
|
||||||
|
* **rust:** exclude bad directories from rust-analyzer ([#5021](https://github.com/LazyVim/LazyVim/issues/5021)) ([94f6df0](https://github.com/LazyVim/LazyVim/commit/94f6df048fbecfdf2f65ab96156b713555df40dc))
|
||||||
|
* **snacks:** added `snacks.input` ([54bece1](https://github.com/LazyVim/LazyVim/commit/54bece17b390453ea0beac41e419394d5e0d69ff))
|
||||||
|
* **snacks:** added leader-ua to toggle global animations ([303980d](https://github.com/LazyVim/LazyVim/commit/303980d267577972bb12e34ef152a0e8b9a953e2))
|
||||||
|
* **snacks:** added leader-ug to toggle indent guides ([b3ac642](https://github.com/LazyVim/LazyVim/commit/b3ac642317cd60e9b35869068dd74fe779a22146))
|
||||||
|
* **snacks:** added leader-uS to toggle scroll ([cded8d4](https://github.com/LazyVim/LazyVim/commit/cded8d4d2808250db5ea864fb8e479fd8b5a4a2c))
|
||||||
|
* **snacks:** added profiler keymaps ([a8332c6](https://github.com/LazyVim/LazyVim/commit/a8332c6d50106cf35e45953cdaa463cbb6c5b085))
|
||||||
|
* **snacks:** enable `snacks.scroll` ([1a1a484](https://github.com/LazyVim/LazyVim/commit/1a1a48497c53e232b0f525baab87d5f23a2205b2))
|
||||||
|
* **snacks:** use `snacks.indent` and moved `indent-blankline` to extras ([94fdc42](https://github.com/LazyVim/LazyVim/commit/94fdc421a11b960e116888658dd9b2b85c3b58fc))
|
||||||
|
* **snacks:** use `snacks.scope` indent objects in favor of custom `mini.ai` indent objects ([d904a1e](https://github.com/LazyVim/LazyVim/commit/d904a1ef47638e4defede775a7f0966fb8e0a2b4))
|
||||||
|
* **snacks:** use `Snacks.zen.zoom()` instead of custom **maximize** ([e389a5a](https://github.com/LazyVim/LazyVim/commit/e389a5ada955c253771ff5c9f8301e2f17c206d2))
|
||||||
|
* **which-key:** make `helix` the default which-key preset ([44c712a](https://github.com/LazyVim/LazyVim/commit/44c712aa31e7e05971259841e1f87c9f3d9c6cd5))
|
||||||
|
* **zen:** zoom with leader-wm and leader-uZ. zen with leader-uz ([2acedaa](https://github.com/LazyVim/LazyVim/commit/2acedaa3a8312e53d84a299bd82d616e1c26328a))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **blink:** disable cmdline integration for now since it doesn't work well with the enter keymap ([20eff4f](https://github.com/LazyVim/LazyVim/commit/20eff4fc3f55fbeb1e415f0cc5a2d1f3019e5da6))
|
||||||
|
* **blink:** remove unneeded code ([d95e530](https://github.com/LazyVim/LazyVim/commit/d95e530c02cbb2bcf36da5bb3e235780bdf6d239))
|
||||||
|
* **blink:** unset provider.kind ([#5024](https://github.com/LazyVim/LazyVim/issues/5024)) ([29c4dea](https://github.com/LazyVim/LazyVim/commit/29c4dea4e75b82ad4b06c21e360eefa3951a3fba))
|
||||||
|
* **blink:** unset sources.compat. Fixes [#5016](https://github.com/LazyVim/LazyVim/issues/5016). Closes [#5017](https://github.com/LazyVim/LazyVim/issues/5017) ([2946031](https://github.com/LazyVim/LazyVim/commit/29460318f302b6dceaf16bd06c45cb3ed58d5fd8))
|
||||||
|
* **clangd:** avoid nil-indexing the completion sorting comparators ([#5011](https://github.com/LazyVim/LazyVim/issues/5011)) ([c4b0d6d](https://github.com/LazyVim/LazyVim/commit/c4b0d6d0d1ee11c07c0ab4ed3f87f97b76a6f592))
|
||||||
|
* **clangd:** nvim-cmp optional ([94be6fb](https://github.com/LazyVim/LazyVim/commit/94be6fb78786e9a53e914db9d5cfab09b13225ba))
|
||||||
|
* **copliot:** restructure copilot-cmp spec ([34d2bdc](https://github.com/LazyVim/LazyVim/commit/34d2bdcac6fabe5d02e157bffa3475391ca1f7ec))
|
||||||
|
* fqn for nvim-cmp ([a9a273d](https://github.com/LazyVim/LazyVim/commit/a9a273d041e2dd0e5654b5b492fd29138259fe68))
|
||||||
|
* **git:** make nvim-cmp optional for the git extra ([ec92fa8](https://github.com/LazyVim/LazyVim/commit/ec92fa85586b4082f04b30ad94cb98b24463665e))
|
||||||
|
* **java:** only setup debug adapter config if mason is installed ([#5013](https://github.com/LazyVim/LazyVim/issues/5013)) ([aad0edb](https://github.com/LazyVim/LazyVim/commit/aad0edbf749bcbe16e9ef8d2a65a19dd3fe2bd87))
|
||||||
|
* **java:** only setup debug adapter config if mason is installed (for real this time) ([#5014](https://github.com/LazyVim/LazyVim/issues/5014)) ([5b1b6b2](https://github.com/LazyVim/LazyVim/commit/5b1b6b29d717adeffb0528cffef9f1a3972d3701))
|
||||||
|
* **java:** only use mason-registry if mason installed ([#4991](https://github.com/LazyVim/LazyVim/issues/4991)) ([21b02f0](https://github.com/LazyVim/LazyVim/commit/21b02f056d924d0a3cb3513b163e3dbdfa9c15ec))
|
||||||
|
* **mini.animate:** disable `snacks.scroll` when `mini.animate` is enabled ([9b07544](https://github.com/LazyVim/LazyVim/commit/9b07544e89ecead354ef0f17ebc3127f3fa5bbd8))
|
||||||
|
* **mini.indentscope:** disable snacks and indent-blankline scope ([98c77f1](https://github.com/LazyVim/LazyVim/commit/98c77f1de479b12bc29dc8339fbfe694959d99ed))
|
||||||
|
* **nvim-cmp:** set high prio for loading the nvim-cmp extra to prevent issues with opts ([adf8db6](https://github.com/LazyVim/LazyVim/commit/adf8db69ed91f8c15fe3cf37df9dc0801dbaeb39))
|
||||||
|
* **nvim-cmp:** specs ([88e77b0](https://github.com/LazyVim/LazyVim/commit/88e77b0e2439a27d06e95e89839227f1e9446c74))
|
||||||
|
* **ui:** use `Snacks.util.color` instead of `LazyVim.ui.fg` ([6d774ba](https://github.com/LazyVim/LazyVim/commit/6d774ba8f21f87aaa8bf9dbeb0a84b747541b349))
|
||||||
|
|
||||||
|
## [13.9.1](https://github.com/LazyVim/LazyVim/compare/v13.9.0...v13.9.1) (2024-12-12)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **blink:** set kind to int, not string, if overriding ([#4999](https://github.com/LazyVim/LazyVim/issues/4999)) ([cee60a6](https://github.com/LazyVim/LazyVim/commit/cee60a6d3040181ac9c5b709d79e80e180b34d48))
|
||||||
|
|
||||||
|
## [13.9.0](https://github.com/LazyVim/LazyVim/compare/v13.8.0...v13.9.0) (2024-12-11)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **luasnip:** add default user snippet location ([#4987](https://github.com/LazyVim/LazyVim/issues/4987)) ([8c79ab6](https://github.com/LazyVim/LazyVim/commit/8c79ab601af19b5370d560aa619567371ac70d86))
|
||||||
|
* **vscode:** add vscode-specific keymaps and sync undo/redo with vscode ([#4983](https://github.com/LazyVim/LazyVim/issues/4983)) ([9ad1c49](https://github.com/LazyVim/LazyVim/commit/9ad1c49b67a5c4330e366cde41ab11b156de03f2))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **autocmds:** remove snacks_win from close_with_q, since they have their own keymaps ([99c361f](https://github.com/LazyVim/LazyVim/commit/99c361f708924ddc63599115580bda537cc7f119))
|
||||||
|
* **blink:** config breaking changes. Fixes [#4990](https://github.com/LazyVim/LazyVim/issues/4990) ([439340b](https://github.com/LazyVim/LazyVim/commit/439340bd8a970aa23d513aea96c93e84b3af42dc))
|
||||||
|
|
||||||
|
## [13.8.0](https://github.com/LazyVim/LazyVim/compare/v13.7.0...v13.8.0) (2024-12-07)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **git:** added toggles for gitsigns.nvim and mini.diff ([2ebba15](https://github.com/LazyVim/LazyVim/commit/2ebba15e1274f5437a418ddacfe9dbf342fd8a18))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **dot:** kitty ft with bash treesitter highlights ([7ef2dfd](https://github.com/LazyVim/LazyVim/commit/7ef2dfd3ba9a3dffaa8c57c1bb5e130b9aa74217))
|
||||||
|
* **keymaps:** toggle name ([b2f7505](https://github.com/LazyVim/LazyVim/commit/b2f750558a3737879f8151e741e7a3988886e37f))
|
||||||
|
* **mini.diff:** toggle ([3f4b1ff](https://github.com/LazyVim/LazyVim/commit/3f4b1ff00364d089e19f4b3c738fd5298243fadb))
|
||||||
|
* **rust:** only use mason.nvim if it is present ([#4963](https://github.com/LazyVim/LazyVim/issues/4963)) ([5ddad99](https://github.com/LazyVim/LazyVim/commit/5ddad99bac203e87e6f78f3ab7567a49b0d1d8a6))
|
||||||
|
|
||||||
|
## [13.7.0](https://github.com/LazyVim/LazyVim/compare/v13.6.0...v13.7.0) (2024-12-05)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **blink:** enabled treesitter highlighting ([0a9447c](https://github.com/LazyVim/LazyVim/commit/0a9447c1b1776c2d8d7b7d495538ddfab7c6cd08))
|
||||||
|
* **extras.ai:** blink.cmp integration and kind overrides for menu drawing ([#4942](https://github.com/LazyVim/LazyVim/issues/4942)) ([f841ecf](https://github.com/LazyVim/LazyVim/commit/f841ecf6bdde98a0983e44171b1ad8513e159e29))
|
||||||
|
* **rust:** add bacon-ls and improve debugging ([#3212](https://github.com/LazyVim/LazyVim/issues/3212)) ([ea794ff](https://github.com/LazyVim/LazyVim/commit/ea794ffd94adeb2b1d2870ed97dbd3f000d911b3))
|
||||||
|
* **snacks:** silence copy url keymap ([#4939](https://github.com/LazyVim/LazyVim/issues/4939)) ([03e203b](https://github.com/LazyVim/LazyVim/commit/03e203bfbe1e5de38cfc0082e5d1b720cab83c0e))
|
||||||
|
* **toggle:** added leader-A to toggle tabline. Closes [#4951](https://github.com/LazyVim/LazyVim/issues/4951) ([8232651](https://github.com/LazyVim/LazyVim/commit/8232651c4a4a80da34f8b6c1742b04144ae4b959))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **blink:** update config for latest changes ([#4953](https://github.com/LazyVim/LazyVim/issues/4953)) ([090ca75](https://github.com/LazyVim/LazyVim/commit/090ca75d3b326280a67e727ef77e15920a90e3c9))
|
||||||
|
* **copilot:** CopilotChat.nvim has moved to main ([#4931](https://github.com/LazyVim/LazyVim/issues/4931)) ([0d6026a](https://github.com/LazyVim/LazyVim/commit/0d6026a3e8a255cf825ad293de101bc1e1a667eb))
|
||||||
|
* **extras.treesitter-context:** change event back to `LazyFile` ([#4940](https://github.com/LazyVim/LazyVim/issues/4940)) ([83017ff](https://github.com/LazyVim/LazyVim/commit/83017ff28afa8b8ddf9254564d8b4a9c96ec3f7d))
|
||||||
|
* **supermaven:** blink.cmp integration ([#4941](https://github.com/LazyVim/LazyVim/issues/4941)) ([d714711](https://github.com/LazyVim/LazyVim/commit/d71471151b8906155e048ea3d3fe2fa7d651990e))
|
||||||
|
* **tex:** specify filetype for <localleader>l ([#4905](https://github.com/LazyVim/LazyVim/issues/4905)) ([12e3752](https://github.com/LazyVim/LazyVim/commit/12e37529e718b926e7513d0397e32771aeb6e049))
|
||||||
|
* **ui:** actually disable mini-indentscope on snacks_dashboard ([#4947](https://github.com/LazyVim/LazyVim/issues/4947)) ([bfe29fb](https://github.com/LazyVim/LazyVim/commit/bfe29fb01330d2bfdfe14582133907217f4b8192))
|
||||||
|
* **ui:** disable mini.indentscope on `ft=snacks_dashboard` ([#4928](https://github.com/LazyVim/LazyVim/issues/4928)) ([4bf3a39](https://github.com/LazyVim/LazyVim/commit/4bf3a392234f4c4421af644683d95d8aab945382))
|
||||||
|
* **ui:** properly clear maximize state on exit. See [#4934](https://github.com/LazyVim/LazyVim/issues/4934) ([9ec253b](https://github.com/LazyVim/LazyVim/commit/9ec253b9b6bf9673f610035d741a345d6be7a44f))
|
||||||
|
|
||||||
|
## [13.6.0](https://github.com/LazyVim/LazyVim/compare/v13.5.3...v13.6.0) (2024-12-01)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **colorscheme:** enable catppuccin snacks integration by default ([#4882](https://github.com/LazyVim/LazyVim/issues/4882)) ([5659786](https://github.com/LazyVim/LazyVim/commit/5659786893ead10782e2b603c0754d83a0ae78d6))
|
||||||
|
* **extras:** added extra for `smear-cursor.nvim` ([40dba86](https://github.com/LazyVim/LazyVim/commit/40dba869254309865fcdabbc6d8c6b8e187c2444))
|
||||||
|
* **lang:** add maxInlayHintLength for vtsls to resolve inlay hint to… ([#4902](https://github.com/LazyVim/LazyVim/issues/4902)) ([1847e3f](https://github.com/LazyVim/LazyVim/commit/1847e3fb25cb29a9bc1c662cabe6984509733595))
|
||||||
|
* **smear-cursor:** enable `cursor_color = "none"`, to show trail using color of target text fg color ([275c786](https://github.com/LazyVim/LazyVim/commit/275c78665e0534dfb62de34fc1a47e2f0f87acdb))
|
||||||
|
* **snacks:** add keymap to copy url from gitbrowse ([#4870](https://github.com/LazyVim/LazyVim/issues/4870)) ([cdf3f1f](https://github.com/LazyVim/LazyVim/commit/cdf3f1f2bdc4e57de506a9d7c55fa7e0131be692))
|
||||||
|
* **snacks:** added leader-. to toggle a scratch buffer. Uses `count` for new scratch buffers ([6d42f10](https://github.com/LazyVim/LazyVim/commit/6d42f1084d14025d67accbbcbbe9686de505ed96))
|
||||||
|
* **snacks:** added leader-n to show notification history ([be0cb96](https://github.com/LazyVim/LazyVim/commit/be0cb9622dd47a5f62fbb32ac6f485a33a253119))
|
||||||
|
* **snacks:** added leader-S to select a previous scratch buffer ([e05379b](https://github.com/LazyVim/LazyVim/commit/e05379babc99b43e6c97743ba4800449c9c78f60))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **blink:** fixed luasnip completions for blink ([7bb954f](https://github.com/LazyVim/LazyVim/commit/7bb954fd1d096dc68217611e696fc02dbca7cf50))
|
||||||
|
* **blink:** icons ([2263b94](https://github.com/LazyVim/LazyVim/commit/2263b94439a14c133358d1abe4c0d7eef914105e))
|
||||||
|
* **blink:** make sure blink.compat is setup correctly when used in extras ([91a3c66](https://github.com/LazyVim/LazyVim/commit/91a3c663a7ab6c9ce782e1ff0fd6bc9315f2a670))
|
||||||
|
* **blink:** updated to config to reflect breaking changes ([efcba66](https://github.com/LazyVim/LazyVim/commit/efcba66a2262b2c956a4203f522026f03af9c903))
|
||||||
|
* **dial:** add and/or augend to python ft ([#4875](https://github.com/LazyVim/LazyVim/issues/4875)) ([ecfaed3](https://github.com/LazyVim/LazyVim/commit/ecfaed3cc1cbe3013f1201594adde2ea0022c455))
|
||||||
|
* **java:** give java a default nvim-dap config ([#4261](https://github.com/LazyVim/LazyVim/issues/4261)) ([c9102bc](https://github.com/LazyVim/LazyVim/commit/c9102bc35185284ddce28eb216fd125fa0e0fa8b))
|
||||||
|
* **java:** minisurround jdtls keybind conflict ([#4886](https://github.com/LazyVim/LazyVim/issues/4886)) ([30fac42](https://github.com/LazyVim/LazyVim/commit/30fac4206a393b05736199873bac87ecdfacd2a0))
|
||||||
|
* **lazydev:** use luals' bundled luv library ([eb525c6](https://github.com/LazyVim/LazyVim/commit/eb525c680d0423f5addb12e10f87ce5b81fc0d9e))
|
||||||
|
* **lsp:** don't leak keymaps from LSP server configs ([#4849](https://github.com/LazyVim/LazyVim/issues/4849)) ([85e4118](https://github.com/LazyVim/LazyVim/commit/85e41180654f6cd6c7975442b3a4877b4b4fd475))
|
||||||
|
* **mini.animate:** disable when in Neovide ([66459f9](https://github.com/LazyVim/LazyVim/commit/66459f9361316fc4f723c8ac12f4fdc44f195b12))
|
||||||
|
* **octo:** upstream changed mappings to `localleader` ([#4850](https://github.com/LazyVim/LazyVim/issues/4850)) ([c979225](https://github.com/LazyVim/LazyVim/commit/c979225c372f04c3ba4b2f74c3b9c102ddd5f364))
|
||||||
|
* **snacks:** remove lazygit requirement for git browse/blame keymaps ([#4869](https://github.com/LazyVim/LazyVim/issues/4869)) ([2c37492](https://github.com/LazyVim/LazyVim/commit/2c37492461bf6af09a3e940f8b3ea0a123608bfd))
|
||||||
|
* **sql:** fix autocomplete, it was using the wrong plugin name on the `LazyVim.has` check ([#4900](https://github.com/LazyVim/LazyVim/issues/4900)) ([ed10d3c](https://github.com/LazyVim/LazyVim/commit/ed10d3cf19dfb99d38bda0e09be3296571113670))
|
||||||
|
* **sql:** only use cmp if it is available ([#4891](https://github.com/LazyVim/LazyVim/issues/4891)) ([9eccb5d](https://github.com/LazyVim/LazyVim/commit/9eccb5d2defef4c1fe63719528b20bb210e1ef0c))
|
||||||
|
* **ui:** disable indent-blankline on `ft=snacks_dashboard` ([#4895](https://github.com/LazyVim/LazyVim/issues/4895)) ([c022759](https://github.com/LazyVim/LazyVim/commit/c02275919e8238f2a333bedb4eca8d138b4ea567))
|
||||||
|
|
||||||
## [13.5.3](https://github.com/LazyVim/LazyVim/compare/v13.5.2...v13.5.3) (2024-11-22)
|
## [13.5.3](https://github.com/LazyVim/LazyVim/compare/v13.5.2...v13.5.3) (2024-11-22)
|
||||||
|
|
||||||
|
|
||||||
|
|
61
NEWS.md
61
NEWS.md
|
@ -1,5 +1,60 @@
|
||||||
# What's new?
|
# What's new?
|
||||||
|
|
||||||
|
## 14.x
|
||||||
|
|
||||||
|
Big new release with a lot of changes and improvements!
|
||||||
|
Two new plugins have been added, and a lot of plugins have been replaced.
|
||||||
|
With these changes, default **LazyVim** is now just `34` plugins.
|
||||||
|
|
||||||
|
### Added Plugins
|
||||||
|
|
||||||
|
- [fzf-lua](https://github.com/ibhagwan/fzf-lua) as a replacement for [telescope.nvim](https://github.com/nvim-telescope/telescope.nvim)
|
||||||
|
- to use **telescope.nvim** instead, enable the `editor.telescope` extra
|
||||||
|
- [blink.cmp](https://github.com/saghen/blink.cmp) as a replacement for [nvim-cmp](https://github.com/hrsh7th/nvim-cmp)
|
||||||
|
- to use **nvim-cmp** instead, enable the `coding.nvim-cmp` extra
|
||||||
|
|
||||||
|
### Removed Plugins
|
||||||
|
|
||||||
|
- [dressing.nvim](https://github.com/stevearc/dressing.nvim) (replaced with [fzf-lua](https://github.com/ibhagwan/fzf-lua) and [snacks.input](https://github.com/folke/snacks.nvim))
|
||||||
|
- [telescope-fzf-native.nvim](https://github.com/nvim-telescope/telescope-fzf-native.nvim) (replaced with [fzf-lua](https://github.com/ibhagwan/fzf-lua))
|
||||||
|
- [telescope.nvim](https://github.com/nvim-telescope/telescope.nvim) (replaced with [fzf-lua](https://github.com/ibhagwan/fzf-lua))
|
||||||
|
- [indent-blankline.nvim](https://github.com/lukas-reineke/indent-blankline.nvim) (replaced with [snacks.indent](https://github.com/Folke/snacks.nvim))
|
||||||
|
- to use **indent-blankline.nvim** instead, enable the `indent-blankline` extra
|
||||||
|
- [nvim-cmp](https://github.com/hrsh7th/nvim-cmp) (replaced with [blink](https://github.com/Saghen/blink.cmp))
|
||||||
|
- [nvim-snippets](https://github.com/hrsh7th/vim-vsnip) (replaced with [blink](https://github.com/Saghen/blink.cmp))
|
||||||
|
- [cmp-buffer](https://github.com/hrsh7th/cmp-buffer) (replaced with [blink](https://github.com/Saghen/blink.cmp))
|
||||||
|
- [cmp-nvim-lsp](https://github.com/hrsh7th/cmp-nvim-lsp) (replaced with [blink](https://github.com/Saghen/blink.cmp))
|
||||||
|
- [cmp-path](https://github.com/hrsh7th/cmp-path) (replaced with [blink](https://github.com/Saghen/blink.cmp))
|
||||||
|
|
||||||
|
### Changes
|
||||||
|
|
||||||
|
- added [`snacks.input`](https://github.com/folke/snacks.nvim/blob/main/docs/input.md)
|
||||||
|
- added [`snacks.scroll`](https://github.com/folke/snacks.nvim/blob/main/docs/scroll.md)
|
||||||
|
- added [`snacks.indent`](https://github.com/folke/snacks.nvim/blob/main/docs/indent.md)
|
||||||
|
- added [`snacks.scope`](https://github.com/folke/snacks.nvim/blob/main/docs/scope.md)
|
||||||
|
- added [`snacks.dim`](https://github.com/folke/snacks.nvim/blob/main/docs/dim.md)
|
||||||
|
- added [`snacks.zen`](https://github.com/folke/snacks.nvim/blob/main/docs/zen.md)
|
||||||
|
- changed default [`which-key`](https://github.com/folke/which-key.nvim) preset to `helix`
|
||||||
|
- drop `LazyVim.ui.fg` in favor of [`Snacks.util.color`](https://github.com/folke/snacks.nvim/blob/main/docs/util.md)
|
||||||
|
|
||||||
|
To disable **all animations**, add the following to your `options.lua`:
|
||||||
|
|
||||||
|
```lua
|
||||||
|
vim.g.snacks_animate = false
|
||||||
|
```
|
||||||
|
|
||||||
|
### Keymaps
|
||||||
|
|
||||||
|
- `<leader>uz` to toggle [zen mode](https://github.com/folke/snacks.nvim/blob/main/docs/zen.md)
|
||||||
|
- `<leader>uZ` & `<leader>wm` to toggle [zoom mode](https://github.com/folke/snacks.nvim/blob/main/docs/zen.md)
|
||||||
|
- `<leader>uD` to toggle [dimming](https://github.com/folke/snacks.nvim/blob/main/docs/dim.md)
|
||||||
|
- `<leader>ua` to toggle [animations](https://github.com/folke/snacks.nvim/blob/main/docs/animate.md)
|
||||||
|
- `<leader>uS` to toggle [scroll](https://github.com/folke/snacks.nvim/blob/main/docs/scroll.md)
|
||||||
|
- `<leader>ug` to toggle [indent guides](https://github.com/folke/snacks.nvim/blob/main/docs/indent.md)
|
||||||
|
- [`snacks.profiler`](https://github.com/folke/snacks.nvim/blob/main/docs/profiler.md) keymaps under `<leader>dp`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## 13.x
|
## 13.x
|
||||||
|
|
||||||
- **LazyVim** now uses `Snacks.dashboard` as the default dashboard.
|
- **LazyVim** now uses `Snacks.dashboard` as the default dashboard.
|
||||||
|
@ -21,6 +76,8 @@
|
||||||
- `Snacks.terminal` is similar to `lazyterm`, but has more features
|
- `Snacks.terminal` is similar to `lazyterm`, but has more features
|
||||||
and creates bottom splits by default (similar to the `edgy` integrating)
|
and creates bottom splits by default (similar to the `edgy` integrating)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## 12.x
|
## 12.x
|
||||||
|
|
||||||
- **Markdown Extra**: [headlines.nvim](https://github.com/lukas-reineke/headlines.nvim) has been removed in favor of [markdown.nvim](https://github.com/MeanderingProgrammer/markdown.nvim)
|
- **Markdown Extra**: [headlines.nvim](https://github.com/lukas-reineke/headlines.nvim) has been removed in favor of [markdown.nvim](https://github.com/MeanderingProgrammer/markdown.nvim)
|
||||||
|
@ -48,6 +105,8 @@
|
||||||
- moved `neoconf.nvim` to extras. Project specific LSP settings
|
- moved `neoconf.nvim` to extras. Project specific LSP settings
|
||||||
can be done with a `.lazy.lua` file instead.
|
can be done with a `.lazy.lua` file instead.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## 11.x
|
## 11.x
|
||||||
|
|
||||||
- **Keymaps:**
|
- **Keymaps:**
|
||||||
|
@ -107,6 +166,8 @@ Additionally, some core plugins have been moved to extras.
|
||||||
- `mini.indentscope` scopes are now also highlighted with `indent-blankline`
|
- `mini.indentscope` scopes are now also highlighted with `indent-blankline`
|
||||||
- `nvim-treesitter-context`
|
- `nvim-treesitter-context`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## 10.x
|
## 10.x
|
||||||
|
|
||||||
- added new extra for [mini.diff](https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-diff.md)
|
- added new extra for [mini.diff](https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-diff.md)
|
||||||
|
|
|
@ -67,7 +67,7 @@ LazyVim 是一个基于 [💤 lazy.nvim](https://github.com/folke/lazy.nvim) 的
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
docker run -w /root -it --rm alpine:edge sh -uelic '
|
docker run -w /root -it --rm alpine:edge sh -uelic '
|
||||||
apk add git lazygit neovim ripgrep alpine-sdk --update
|
apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
|
||||||
git clone https://github.com/LazyVim/starter ~/.config/nvim
|
git clone https://github.com/LazyVim/starter ~/.config/nvim
|
||||||
cd ~/.config/nvim
|
cd ~/.config/nvim
|
||||||
nvim
|
nvim
|
||||||
|
|
|
@ -68,7 +68,7 @@ Sie können eine Startvorlage für **LazyVim** [hier](https://github.com/LazyVim
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
docker run -w /root -it --rm alpine:edge sh -uelic '
|
docker run -w /root -it --rm alpine:edge sh -uelic '
|
||||||
apk add git lazygit neovim ripgrep alpine-sdk --update
|
apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
|
||||||
git clone https://github.com/LazyVim/starter ~/.config/nvim
|
git clone https://github.com/LazyVim/starter ~/.config/nvim
|
||||||
cd ~/.config/nvim
|
cd ~/.config/nvim
|
||||||
nvim
|
nvim
|
||||||
|
|
145
README-ES.md
Normal file
145
README-ES.md
Normal file
|
@ -0,0 +1,145 @@
|
||||||
|
<div align="center">
|
||||||
|
<img src="https://user-images.githubusercontent.com/292349/213446185-2db63fd5-8c84-459c-9f04-e286382d6e80.png">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<hr>
|
||||||
|
|
||||||
|
<h4 align="center">
|
||||||
|
<a href="https://lazyvim.github.io/installation">Instalar</a>
|
||||||
|
·
|
||||||
|
<a href="https://lazyvim.github.io/configuration">Configurar</a>
|
||||||
|
·
|
||||||
|
<a href="https://lazyvim.github.io">Documentación</a>
|
||||||
|
</h4>
|
||||||
|
|
||||||
|
<div align="center"><p>
|
||||||
|
<a href="https://github.com/LazyVim/LazyVim/releases/latest">
|
||||||
|
<img alt="Última versión" src="https://img.shields.io/github/v/release/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=C9CBFF&logoColor=D9E0EE&labelColor=302D41&include_prerelease&sort=semver" />
|
||||||
|
</a>
|
||||||
|
<a href="https://github.com/LazyVim/LazyVim/pulse">
|
||||||
|
<img alt="Último commit" src="https://img.shields.io/github/last-commit/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=8bd5ca&logoColor=D9E0EE&labelColor=302D41"/>
|
||||||
|
</a>
|
||||||
|
<a href="https://github.com/LazyVim/LazyVim/blob/main/LICENSE">
|
||||||
|
<img alt="Licencia" src="https://img.shields.io/github/license/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=ee999f&logoColor=D9E0EE&labelColor=302D41" />
|
||||||
|
</a>
|
||||||
|
<a href="https://github.com/LazyVim/LazyVim/stargazers">
|
||||||
|
<img alt="Estrellas" src="https://img.shields.io/github/stars/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=c69ff5&logoColor=D9E0EE&labelColor=302D41" />
|
||||||
|
</a>
|
||||||
|
<a href="https://github.com/LazyVim/LazyVim/issues">
|
||||||
|
<img alt="Problemas" src="https://img.shields.io/github/issues/LazyVim/LazyVim?style=for-the-badge&logo=bilibili&color=F5E0DC&logoColor=D9E0EE&labelColor=302D41" />
|
||||||
|
</a>
|
||||||
|
<a href="https://github.com/LazyVim/LazyVim">
|
||||||
|
<img alt="Tamaño del repositorio" src="https://img.shields.io/github/repo-size/LazyVim/LazyVim?color=%23DDB6F2&label=SIZE&logo=codesandbox&style=for-the-badge&logoColor=D9E0EE&labelColor=302D41" />
|
||||||
|
</a>
|
||||||
|
<a href="https://twitter.com/intent/follow?screen_name=folke">
|
||||||
|
<img alt="seguir en Twitter" src="https://img.shields.io/twitter/follow/folke?style=for-the-badge&logo=twitter&color=8aadf3&logoColor=D9E0EE&labelColor=302D41" />
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
LazyVim es una configuración de Neovim impulsada por [💤 lazy.nvim](https://github.com/folke/lazy.nvim) que facilita la personalización y extensión de tu configuración. En lugar de tener que elegir entre comenzar desde cero o usar una distribución predefinida, LazyVim ofrece lo mejor de ambos mundos: la flexibilidad para ajustar tu configuración según sea necesario, junto con la conveniencia de una configuración preconfigurada.
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
## ✨ Características
|
||||||
|
|
||||||
|
- 🔥 Convierte tu Neovim en un IDE completo
|
||||||
|
- 💤 Personaliza y extiende fácilmente tu configuración con [lazy.nvim](https://github.com/folke/lazy.nvim)
|
||||||
|
- 🚀 Extremadamente rápido
|
||||||
|
- 🧹 Ajustes predeterminados sensatos para opciones, autocmds y combinaciones de teclas
|
||||||
|
- 📦 Viene con una gran cantidad de plugins preconfigurados y listos para usar
|
||||||
|
|
||||||
|
## ⚡️ Requisitos
|
||||||
|
|
||||||
|
- Neovim >= **0.9.0** (debe ser compilado con **LuaJIT**)
|
||||||
|
- Git >= **2.19.0** (para soporte de clones parciales)
|
||||||
|
- una [Fuente Nerd](https://www.nerdfonts.com/) **_(opcional)_**
|
||||||
|
- un compilador **C** para `nvim-treesitter`. Consulta [aquí](https://github.com/nvim-treesitter/nvim-treesitter#requirements)
|
||||||
|
|
||||||
|
## 🚀 Empezando
|
||||||
|
|
||||||
|
Puedes encontrar una plantilla de inicio para **LazyVim** [aquí](https://github.com/LazyVim/starter)
|
||||||
|
|
||||||
|
<details><summary>Probarlo con Docker</summary>
|
||||||
|
|
||||||
|
```sh
|
||||||
|
docker run -w /root -it --rm alpine:edge sh -uelic '
|
||||||
|
apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
|
||||||
|
git clone https://github.com/LazyVim/starter ~/.config/nvim
|
||||||
|
cd ~/.config/nvim
|
||||||
|
nvim
|
||||||
|
'
|
||||||
|
```
|
||||||
|
|
||||||
|
</details>
|
||||||
|
|
||||||
|
<details><summary>Instalar el <a href="https://github.com/LazyVim/starter">LazyVim Starter</a></summary>
|
||||||
|
|
||||||
|
- Haz una copia de seguridad de tus archivos actuales de Neovim:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
mv ~/.config/nvim ~/.config/nvim.bak
|
||||||
|
mv ~/.local/share/nvim ~/.local/share/nvim.bak
|
||||||
|
```
|
||||||
|
|
||||||
|
- Clona el starter
|
||||||
|
|
||||||
|
```sh
|
||||||
|
git clone https://github.com/LazyVim/starter ~/.config/nvim
|
||||||
|
```
|
||||||
|
|
||||||
|
- Elimina la carpeta `.git`, para que puedas agregarla a tu propio repositorio más tarde
|
||||||
|
|
||||||
|
```sh
|
||||||
|
rm -rf ~/.config/nvim/.git
|
||||||
|
```
|
||||||
|
|
||||||
|
- ¡Inicia Neovim!
|
||||||
|
|
||||||
|
```sh
|
||||||
|
nvim
|
||||||
|
```
|
||||||
|
|
||||||
|
Consulta los comentarios en los archivos sobre cómo personalizar **LazyVim**.
|
||||||
|
|
||||||
|
</details>
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
Hay un excelente video creado por [@elijahmanor](https://github.com/elijahmanor) con una guía para empezar.
|
||||||
|
|
||||||
|
[](https://www.youtube.com/watch?v=N93cTbtLCIM)
|
||||||
|
|
||||||
|
[@dusty-phillips](https://github.com/dusty-phillips) escribió un libro completo llamado
|
||||||
|
[LazyVim para Desarrolladores Ambiciosos](https://lazyvim-ambitious-devs.phillips.codes)
|
||||||
|
disponible de forma gratuita en línea.
|
||||||
|
|
||||||
|
## 📂 Estructura de Archivos
|
||||||
|
|
||||||
|
Los archivos dentro de la configuración se cargarán automáticamente en el momento adecuado,
|
||||||
|
por lo que no necesitas requerir esos archivos manualmente.
|
||||||
|
**LazyVim** viene con un conjunto de archivos de configuración predeterminados que se cargarán
|
||||||
|
**_antes_** que los tuyos. Consulta [aquí](https://github.com/LazyVim/LazyVim/tree/main/lua/lazyvim/config)
|
||||||
|
|
||||||
|
Puedes agregar tus especificaciones de plugins personalizadas en `lua/plugins/`. Todos los archivos allí
|
||||||
|
serán cargados automáticamente por [lazy.nvim](https://github.com/folke/lazy.nvim)
|
||||||
|
|
||||||
|
<pre>
|
||||||
|
~/.config/nvim
|
||||||
|
├── lua
|
||||||
|
│ ├── config
|
||||||
|
│ │ ├── autocmds.lua
|
||||||
|
│ │ ├── keymaps.lua
|
||||||
|
│ │ ├── lazy.lua
|
||||||
|
│ │ └── options.lua
|
||||||
|
│ └── plugins
|
||||||
|
│ ├── spec1.lua
|
||||||
|
│ ├── **
|
||||||
|
│ └── spec2.lua
|
||||||
|
└── init.lua
|
||||||
|
</pre>
|
||||||
|
|
||||||
|
## ⚙️ Configuración
|
||||||
|
|
||||||
|
Consulta la [documentación](https://lazyvim.github.io)
|
150
README-IT.md
Normal file
150
README-IT.md
Normal file
|
@ -0,0 +1,150 @@
|
||||||
|
<div align="center">
|
||||||
|
<img src="https://user-images.githubusercontent.com/292349/213446185-2db63fd5-8c84-459c-9f04-e286382d6e80.png">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<hr>
|
||||||
|
|
||||||
|
<h4 align="center">
|
||||||
|
<a href="https://lazyvim.github.io/installation">Installazione</a>
|
||||||
|
·
|
||||||
|
<a href="https://lazyvim.github.io/configuration">Configurazione</a>
|
||||||
|
·
|
||||||
|
<a href="https://lazyvim.github.io">Documentazione</a>
|
||||||
|
</h4>
|
||||||
|
|
||||||
|
<div align="center"><p>
|
||||||
|
<a href="https://github.com/LazyVim/LazyVim/releases/latest">
|
||||||
|
<img alt="Latest release" src="https://img.shields.io/github/v/release/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=C9CBFF&logoColor=D9E0EE&labelColor=302D41&include_prerelease&sort=semver" />
|
||||||
|
</a>
|
||||||
|
<a href="https://github.com/LazyVim/LazyVim/pulse">
|
||||||
|
<img alt="Last commit" src="https://img.shields.io/github/last-commit/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=8bd5ca&logoColor=D9E0EE&labelColor=302D41"/>
|
||||||
|
</a>
|
||||||
|
<a href="https://github.com/LazyVim/LazyVim/blob/main/LICENSE">
|
||||||
|
<img alt="License" src="https://img.shields.io/github/license/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=ee999f&logoColor=D9E0EE&labelColor=302D41" />
|
||||||
|
</a>
|
||||||
|
<a href="https://github.com/LazyVim/LazyVim/stargazers">
|
||||||
|
<img alt="Stars" src="https://img.shields.io/github/stars/LazyVim/LazyVim?style=for-the-badge&logo=starship&color=c69ff5&logoColor=D9E0EE&labelColor=302D41" />
|
||||||
|
</a>
|
||||||
|
<a href="https://github.com/LazyVim/LazyVim/issues">
|
||||||
|
<img alt="Issues" src="https://img.shields.io/github/issues/LazyVim/LazyVim?style=for-the-badge&logo=bilibili&color=F5E0DC&logoColor=D9E0EE&labelColor=302D41" />
|
||||||
|
</a>
|
||||||
|
<a href="https://github.com/LazyVim/LazyVim">
|
||||||
|
<img alt="Repo Size" src="https://img.shields.io/github/repo-size/LazyVim/LazyVim?color=%23DDB6F2&label=SIZE&logo=codesandbox&style=for-the-badge&logoColor=D9E0EE&labelColor=302D41" />
|
||||||
|
</a>
|
||||||
|
<a href="https://twitter.com/intent/follow?screen_name=folke">
|
||||||
|
<img alt="follow on Twitter" src="https://img.shields.io/twitter/follow/folke?style=for-the-badge&logo=twitter&color=8aadf3&logoColor=D9E0EE&labelColor=302D41" />
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
LazyVim è una configurazione di Neovim basata su [💤 lazy.nvim](https://github.com/folke/lazy.nvim)
|
||||||
|
che rende semplice personalizzare ed estendere la tua configurazione.
|
||||||
|
Piuttosto che dover scegliere tra partire da zero o utilizzare una
|
||||||
|
distribuzione preconfigurata, LazyVim offre il meglio di entrambi i mondi:
|
||||||
|
la flessibilità di modificare la tua configurazione come necessario,
|
||||||
|
insieme alla comodità di un setup preconfigurato.
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
## ✨ Caratteristiche
|
||||||
|
|
||||||
|
- 🔥 Trasforma il tuo Neovim in un IDE completo
|
||||||
|
- 💤 Personalizza ed estendi facilmente la tua configurazione con [lazy.nvim](https://github.com/folke/lazy.nvim)
|
||||||
|
- 🚀 Estremamente veloce
|
||||||
|
- 🧹 Impostazioni di default ottimizzate per opzioni, AutoCmd e scorciatoie da tastiera
|
||||||
|
- 📦 Distribuito con una vasta gamma di plugin preconfigurati e pronti all'uso
|
||||||
|
|
||||||
|
## ⚡️ Requisiti
|
||||||
|
|
||||||
|
- Neovim >= **0.9.0** (deve essere compilato con **LuaJIT**)
|
||||||
|
- Git >= **2.19.0** (per supportare cloni parziali)
|
||||||
|
- a [Nerd Font](https://www.nerdfonts.com/) **_(opzionale)_**
|
||||||
|
- un compilatore **C** per `nvim-treesitter`. Leggi [qui](https://github.com/nvim-treesitter/nvim-treesitter#requirements)
|
||||||
|
|
||||||
|
## 🚀 Per iniziare
|
||||||
|
|
||||||
|
Puoi trovare un template per **LazyVim** [qui](https://github.com/LazyVim/starter)
|
||||||
|
|
||||||
|
<details><summary>Provalo con Docker</summary>
|
||||||
|
|
||||||
|
```sh
|
||||||
|
docker run -w /root -it --rm alpine:edge sh -uelic '
|
||||||
|
apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
|
||||||
|
git clone https://github.com/LazyVim/starter ~/.config/nvim
|
||||||
|
cd ~/.config/nvim
|
||||||
|
nvim
|
||||||
|
'
|
||||||
|
```
|
||||||
|
|
||||||
|
</details>
|
||||||
|
|
||||||
|
<details><summary>Installa il <a href="https://github.com/LazyVim/starter">LazyVim Starter</a></summary>
|
||||||
|
|
||||||
|
- Fai un backup dei tuoi file di Neovim attuali:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
mv ~/.config/nvim ~/.config/nvim.bak
|
||||||
|
mv ~/.local/share/nvim ~/.local/share/nvim.bak
|
||||||
|
```
|
||||||
|
|
||||||
|
- Clona lo Starter
|
||||||
|
|
||||||
|
```sh
|
||||||
|
git clone https://github.com/LazyVim/starter ~/.config/nvim
|
||||||
|
```
|
||||||
|
|
||||||
|
- Rimuovi la cartella `.git`, così puoi aggiungerla al tuo repo in seguito
|
||||||
|
|
||||||
|
```sh
|
||||||
|
rm -rf ~/.config/nvim/.git
|
||||||
|
```
|
||||||
|
|
||||||
|
- Avvia Neovim!
|
||||||
|
|
||||||
|
```sh
|
||||||
|
nvim
|
||||||
|
```
|
||||||
|
|
||||||
|
Consulta i commenti nei file su come personalizzare **LazyVim**.
|
||||||
|
|
||||||
|
</details>
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
Qui un video creato da [@elijahmanor](https://github.com/elijahmanor) con una guida per iniziare.
|
||||||
|
|
||||||
|
[](https://www.youtube.com/watch?v=N93cTbtLCIM)
|
||||||
|
|
||||||
|
[@dusty-phillips](https://github.com/dusty-phillips) ha scritto un libro comprensivo chiamato
|
||||||
|
[LazyVim per Sviluppatori Ambiziosi](https://lazyvim-ambitious-devs.phillips.codes)
|
||||||
|
che è disponibile gratuitamente online.
|
||||||
|
|
||||||
|
## 📂 Struttura dei file
|
||||||
|
|
||||||
|
I file presenti nella configurazione verranno caricati automaticamente al momento
|
||||||
|
più opportuno, quindi non è necessario richiamare manualmente quei file.
|
||||||
|
**LazyVim** ha un set di configurazioni predefinite che verranno caricate
|
||||||
|
prima delle tue. Vedi [qui](https://github.com/LazyVim/LazyVim/tree/main/lua/lazyvim/config)
|
||||||
|
|
||||||
|
Puoi aggiungere i tuoi plugin personalizzati sotto `lua/plugins/`. Tutti
|
||||||
|
i file presenti verranno automaticamente caricati da [lazy.nvim](https://github.com/folke/lazy.nvim)
|
||||||
|
|
||||||
|
<pre>
|
||||||
|
~/.config/nvim
|
||||||
|
├── lua
|
||||||
|
│ ├── config
|
||||||
|
│ │ ├── autocmds.lua
|
||||||
|
│ │ ├── keymaps.lua
|
||||||
|
│ │ ├── lazy.lua
|
||||||
|
│ │ └── options.lua
|
||||||
|
│ └── plugins
|
||||||
|
│ ├── spec1.lua
|
||||||
|
│ ├── **
|
||||||
|
│ └── spec2.lua
|
||||||
|
└── init.lua
|
||||||
|
</pre>
|
||||||
|
|
||||||
|
## ⚙️ Configurazione
|
||||||
|
|
||||||
|
Consulta la [documentazione](https://lazyvim.github.io)
|
|
@ -67,7 +67,7 @@ LazyVimは、ゼロから始めるか、あらかじめ作成されたディス
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
docker run -w /root -it --rm alpine:edge sh -uelic '
|
docker run -w /root -it --rm alpine:edge sh -uelic '
|
||||||
apk add git lazygit neovim ripgrep alpine-sdk --update
|
apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
|
||||||
git clone https://github.com/LazyVim/starter ~/.config/nvim
|
git clone https://github.com/LazyVim/starter ~/.config/nvim
|
||||||
cd ~/.config/nvim
|
cd ~/.config/nvim
|
||||||
nvim
|
nvim
|
||||||
|
|
|
@ -65,7 +65,7 @@ LazyVim은 [💤 lazy.nvim](https://github.com/folke/lazy.nvim)를 기반으로
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
docker run -w /root -it --rm alpine:edge sh -uelic '
|
docker run -w /root -it --rm alpine:edge sh -uelic '
|
||||||
apk add git lazygit neovim ripgrep alpine-sdk --update
|
apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
|
||||||
git clone https://github.com/LazyVim/starter ~/.config/nvim
|
git clone https://github.com/LazyVim/starter ~/.config/nvim
|
||||||
cd ~/.config/nvim
|
cd ~/.config/nvim
|
||||||
nvim
|
nvim
|
||||||
|
|
|
@ -70,7 +70,7 @@ Podes encontrar uma template **LazyVim** starter para começar, [aqui](https://g
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
docker run -w /root -it --rm alpine:edge sh -uelic '
|
docker run -w /root -it --rm alpine:edge sh -uelic '
|
||||||
apk add git lazygit neovim ripgrep alpine-sdk --update
|
apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
|
||||||
git clone https://github.com/LazyVim/starter ~/.config/nvim
|
git clone https://github.com/LazyVim/starter ~/.config/nvim
|
||||||
cd ~/.config/nvim
|
cd ~/.config/nvim
|
||||||
nvim
|
nvim
|
||||||
|
|
|
@ -69,7 +69,7 @@ You can find a starter template for **LazyVim** [here](https://github.com/LazyVi
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
docker run -w /root -it --rm alpine:edge sh -uelic '
|
docker run -w /root -it --rm alpine:edge sh -uelic '
|
||||||
apk add git lazygit neovim ripgrep alpine-sdk --update
|
apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
|
||||||
git clone https://github.com/LazyVim/starter ~/.config/nvim
|
git clone https://github.com/LazyVim/starter ~/.config/nvim
|
||||||
cd ~/.config/nvim
|
cd ~/.config/nvim
|
||||||
nvim
|
nvim
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
*LazyVim.txt* For Neovim Last change: 2024 November 29
|
*LazyVim.txt* For Neovim Last change: 2025 January 23
|
||||||
|
|
||||||
==============================================================================
|
==============================================================================
|
||||||
Table of Contents *LazyVim-table-of-contents*
|
Table of Contents *LazyVim-table-of-contents*
|
||||||
|
@ -68,7 +68,7 @@ Try it with Docker ~
|
||||||
|
|
||||||
>sh
|
>sh
|
||||||
docker run -w /root -it --rm alpine:edge sh -uelic '
|
docker run -w /root -it --rm alpine:edge sh -uelic '
|
||||||
apk add git lazygit neovim ripgrep alpine-sdk --update
|
apk add git lazygit fzf curl neovim ripgrep alpine-sdk --update
|
||||||
git clone https://github.com/LazyVim/starter ~/.config/nvim
|
git clone https://github.com/LazyVim/starter ~/.config/nvim
|
||||||
cd ~/.config/nvim
|
cd ~/.config/nvim
|
||||||
nvim
|
nvim
|
||||||
|
|
|
@ -66,7 +66,6 @@ vim.api.nvim_create_autocmd("FileType", {
|
||||||
"neotest-summary",
|
"neotest-summary",
|
||||||
"notify",
|
"notify",
|
||||||
"qf",
|
"qf",
|
||||||
"snacks_win",
|
|
||||||
"spectre_panel",
|
"spectre_panel",
|
||||||
"startuptime",
|
"startuptime",
|
||||||
"tsplayground",
|
"tsplayground",
|
||||||
|
|
|
@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
|
||||||
---@class LazyVimConfig: LazyVimOptions
|
---@class LazyVimConfig: LazyVimOptions
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
M.version = "13.5.3" -- x-release-please-version
|
M.version = "14.8.0" -- x-release-please-version
|
||||||
LazyVim.config = M
|
LazyVim.config = M
|
||||||
|
|
||||||
---@class LazyVimOptions
|
---@class LazyVimOptions
|
||||||
|
@ -85,7 +85,7 @@ local defaults = {
|
||||||
Package = " ",
|
Package = " ",
|
||||||
Property = " ",
|
Property = " ",
|
||||||
Reference = " ",
|
Reference = " ",
|
||||||
Snippet = " ",
|
Snippet = " ",
|
||||||
String = " ",
|
String = " ",
|
||||||
Struct = " ",
|
Struct = " ",
|
||||||
Supermaven = " ",
|
Supermaven = " ",
|
||||||
|
|
|
@ -45,8 +45,12 @@ map("n", "<leader>bo", function()
|
||||||
end, { desc = "Delete Other Buffers" })
|
end, { desc = "Delete Other Buffers" })
|
||||||
map("n", "<leader>bD", "<cmd>:bd<cr>", { desc = "Delete Buffer and Window" })
|
map("n", "<leader>bD", "<cmd>:bd<cr>", { desc = "Delete Buffer and Window" })
|
||||||
|
|
||||||
-- Clear search with <esc>
|
-- Clear search and stop snippet on escape
|
||||||
map({ "i", "n" }, "<esc>", "<cmd>noh<cr><esc>", { desc = "Escape and Clear hlsearch" })
|
map({ "i", "n", "s" }, "<esc>", function()
|
||||||
|
vim.cmd("noh")
|
||||||
|
LazyVim.cmp.actions.snippet_stop()
|
||||||
|
return "<esc>"
|
||||||
|
end, { expr = true, desc = "Escape and Clear hlsearch" })
|
||||||
|
|
||||||
-- Clear search, diff update and redraw
|
-- Clear search, diff update and redraw
|
||||||
-- taken from runtime/lua/_editor.lua
|
-- taken from runtime/lua/_editor.lua
|
||||||
|
@ -122,14 +126,22 @@ map("n", "[w", diagnostic_goto(false, "WARN"), { desc = "Prev Warning" })
|
||||||
-- toggle options
|
-- toggle options
|
||||||
LazyVim.format.snacks_toggle():map("<leader>uf")
|
LazyVim.format.snacks_toggle():map("<leader>uf")
|
||||||
LazyVim.format.snacks_toggle(true):map("<leader>uF")
|
LazyVim.format.snacks_toggle(true):map("<leader>uF")
|
||||||
Snacks.toggle.option("spell", { name = "Spelling"}):map("<leader>us")
|
Snacks.toggle.option("spell", { name = "Spelling" }):map("<leader>us")
|
||||||
Snacks.toggle.option("wrap", {name = "Wrap"}):map("<leader>uw")
|
Snacks.toggle.option("wrap", { name = "Wrap" }):map("<leader>uw")
|
||||||
Snacks.toggle.option("relativenumber", { name = "Relative Number"}):map("<leader>uL")
|
Snacks.toggle.option("relativenumber", { name = "Relative Number" }):map("<leader>uL")
|
||||||
Snacks.toggle.diagnostics():map("<leader>ud")
|
Snacks.toggle.diagnostics():map("<leader>ud")
|
||||||
Snacks.toggle.line_number():map("<leader>ul")
|
Snacks.toggle.line_number():map("<leader>ul")
|
||||||
Snacks.toggle.option("conceallevel", {off = 0, on = vim.o.conceallevel > 0 and vim.o.conceallevel or 2}):map("<leader>uc")
|
Snacks.toggle.option("conceallevel", { off = 0, on = vim.o.conceallevel > 0 and vim.o.conceallevel or 2, name = "Conceal Level" }):map("<leader>uc")
|
||||||
|
Snacks.toggle.option("showtabline", { off = 0, on = vim.o.showtabline > 0 and vim.o.showtabline or 2, name = "Tabline" }):map("<leader>uA")
|
||||||
Snacks.toggle.treesitter():map("<leader>uT")
|
Snacks.toggle.treesitter():map("<leader>uT")
|
||||||
Snacks.toggle.option("background", { off = "light", on = "dark" , name = "Dark Background"}):map("<leader>ub")
|
Snacks.toggle.option("background", { off = "light", on = "dark" , name = "Dark Background" }):map("<leader>ub")
|
||||||
|
Snacks.toggle.dim():map("<leader>uD")
|
||||||
|
Snacks.toggle.animate():map("<leader>ua")
|
||||||
|
Snacks.toggle.indent():map("<leader>ug")
|
||||||
|
Snacks.toggle.scroll():map("<leader>uS")
|
||||||
|
Snacks.toggle.profiler():map("<leader>dpp")
|
||||||
|
Snacks.toggle.profiler_highlights():map("<leader>dph")
|
||||||
|
|
||||||
if vim.lsp.inlay_hint then
|
if vim.lsp.inlay_hint then
|
||||||
Snacks.toggle.inlay_hints():map("<leader>uh")
|
Snacks.toggle.inlay_hints():map("<leader>uh")
|
||||||
end
|
end
|
||||||
|
@ -138,15 +150,15 @@ end
|
||||||
if vim.fn.executable("lazygit") == 1 then
|
if vim.fn.executable("lazygit") == 1 then
|
||||||
map("n", "<leader>gg", function() Snacks.lazygit( { cwd = LazyVim.root.git() }) end, { desc = "Lazygit (Root Dir)" })
|
map("n", "<leader>gg", function() Snacks.lazygit( { cwd = LazyVim.root.git() }) end, { desc = "Lazygit (Root Dir)" })
|
||||||
map("n", "<leader>gG", function() Snacks.lazygit() end, { desc = "Lazygit (cwd)" })
|
map("n", "<leader>gG", function() Snacks.lazygit() end, { desc = "Lazygit (cwd)" })
|
||||||
map("n", "<leader>gf", function() Snacks.lazygit.log_file() end, { desc = "Lazygit Current File History" })
|
map("n", "<leader>gf", function() Snacks.picker.git_log_file() end, { desc = "Git Current File History" })
|
||||||
map("n", "<leader>gl", function() Snacks.lazygit.log({ cwd = LazyVim.root.git() }) end, { desc = "Lazygit Log" })
|
map("n", "<leader>gl", function() Snacks.picker.git_log({ cwd = LazyVim.root.git() }) end, { desc = "Git Log" })
|
||||||
map("n", "<leader>gL", function() Snacks.lazygit.log() end, { desc = "Lazygit Log (cwd)" })
|
map("n", "<leader>gL", function() Snacks.picker.git_log() end, { desc = "Git Log (cwd)" })
|
||||||
end
|
end
|
||||||
|
|
||||||
map("n", "<leader>gb", function() Snacks.git.blame_line() end, { desc = "Git Blame Line" })
|
map("n", "<leader>gb", function() Snacks.picker.git_log_line() end, { desc = "Git Blame Line" })
|
||||||
map({ "n", "x" }, "<leader>gB", function() Snacks.gitbrowse() end, { desc = "Git Browse (open)" })
|
map({ "n", "x" }, "<leader>gB", function() Snacks.gitbrowse() end, { desc = "Git Browse (open)" })
|
||||||
map({"n", "x" }, "<leader>gY", function()
|
map({"n", "x" }, "<leader>gY", function()
|
||||||
Snacks.gitbrowse({ open = function(url) vim.fn.setreg("+", url) end })
|
Snacks.gitbrowse({ open = function(url) vim.fn.setreg("+", url) end, notify = false })
|
||||||
end, { desc = "Git Browse (copy)" })
|
end, { desc = "Git Browse (copy)" })
|
||||||
|
|
||||||
-- quit
|
-- quit
|
||||||
|
@ -174,7 +186,8 @@ map("n", "<leader>w", "<c-w>", { desc = "Windows", remap = true })
|
||||||
map("n", "<leader>-", "<C-W>s", { desc = "Split Window Below", remap = true })
|
map("n", "<leader>-", "<C-W>s", { desc = "Split Window Below", remap = true })
|
||||||
map("n", "<leader>|", "<C-W>v", { desc = "Split Window Right", remap = true })
|
map("n", "<leader>|", "<C-W>v", { desc = "Split Window Right", remap = true })
|
||||||
map("n", "<leader>wd", "<C-W>c", { desc = "Delete Window", remap = true })
|
map("n", "<leader>wd", "<C-W>c", { desc = "Delete Window", remap = true })
|
||||||
LazyVim.ui.maximize():map("<leader>wm")
|
Snacks.toggle.zoom():map("<leader>wm"):map("<leader>uZ")
|
||||||
|
Snacks.toggle.zen():map("<leader>uz")
|
||||||
|
|
||||||
-- tabs
|
-- tabs
|
||||||
map("n", "<leader><tab>l", "<cmd>tablast<cr>", { desc = "Last Tab" })
|
map("n", "<leader><tab>l", "<cmd>tablast<cr>", { desc = "Last Tab" })
|
||||||
|
|
|
@ -5,12 +5,22 @@ vim.g.maplocalleader = "\\"
|
||||||
-- LazyVim auto format
|
-- LazyVim auto format
|
||||||
vim.g.autoformat = true
|
vim.g.autoformat = true
|
||||||
|
|
||||||
|
-- Snacks animations
|
||||||
|
-- Set to `false` to globally disable all snacks animations
|
||||||
|
vim.g.snacks_animate = true
|
||||||
|
|
||||||
-- LazyVim picker to use.
|
-- LazyVim picker to use.
|
||||||
-- Can be one of: telescope, fzf
|
-- Can be one of: telescope, fzf
|
||||||
-- Leave it to "auto" to automatically use the picker
|
-- Leave it to "auto" to automatically use the picker
|
||||||
-- enabled with `:LazyExtras`
|
-- enabled with `:LazyExtras`
|
||||||
vim.g.lazyvim_picker = "auto"
|
vim.g.lazyvim_picker = "auto"
|
||||||
|
|
||||||
|
-- LazyVim completion engine to use.
|
||||||
|
-- Can be one of: nvim-cmp, blink.cmp
|
||||||
|
-- Leave it to "auto" to automatically use the completion engine
|
||||||
|
-- enabled with `:LazyExtras`
|
||||||
|
vim.g.lazyvim_cmp = "auto"
|
||||||
|
|
||||||
-- if the completion engine supports the AI source,
|
-- if the completion engine supports the AI source,
|
||||||
-- use that instead of inline suggestions
|
-- use that instead of inline suggestions
|
||||||
vim.g.ai_cmp = true
|
vim.g.ai_cmp = true
|
||||||
|
|
|
@ -17,7 +17,7 @@ function M.check()
|
||||||
error("Neovim >= 0.9.0 is required")
|
error("Neovim >= 0.9.0 is required")
|
||||||
end
|
end
|
||||||
|
|
||||||
for _, cmd in ipairs({ "git", "rg", { "fd", "fdfind" }, "lazygit" }) do
|
for _, cmd in ipairs({ "git", "rg", { "fd", "fdfind" }, "lazygit", "fzf", "curl" }) do
|
||||||
local name = type(cmd) == "string" and cmd or vim.inspect(cmd)
|
local name = type(cmd) == "string" and cmd or vim.inspect(cmd)
|
||||||
local commands = type(cmd) == "string" and { cmd } or cmd
|
local commands = type(cmd) == "string" and { cmd } or cmd
|
||||||
---@cast commands string[]
|
---@cast commands string[]
|
||||||
|
|
|
@ -1,113 +1,14 @@
|
||||||
return {
|
return {
|
||||||
|
|
||||||
-- auto completion
|
|
||||||
{
|
{
|
||||||
"hrsh7th/nvim-cmp",
|
import = "lazyvim.plugins.extras.coding.nvim-cmp",
|
||||||
version = false, -- last release is way too old
|
enabled = function()
|
||||||
event = "InsertEnter",
|
return LazyVim.cmp_engine() == "nvim-cmp"
|
||||||
dependencies = {
|
|
||||||
"hrsh7th/cmp-nvim-lsp",
|
|
||||||
"hrsh7th/cmp-buffer",
|
|
||||||
"hrsh7th/cmp-path",
|
|
||||||
},
|
|
||||||
-- Not all LSP servers add brackets when completing a function.
|
|
||||||
-- To better deal with this, LazyVim adds a custom option to cmp,
|
|
||||||
-- that you can configure. For example:
|
|
||||||
--
|
|
||||||
-- ```lua
|
|
||||||
-- opts = {
|
|
||||||
-- auto_brackets = { "python" }
|
|
||||||
-- }
|
|
||||||
-- ```
|
|
||||||
opts = function()
|
|
||||||
vim.api.nvim_set_hl(0, "CmpGhostText", { link = "Comment", default = true })
|
|
||||||
local cmp = require("cmp")
|
|
||||||
local defaults = require("cmp.config.default")()
|
|
||||||
local auto_select = true
|
|
||||||
return {
|
|
||||||
auto_brackets = {}, -- configure any filetype to auto add brackets
|
|
||||||
completion = {
|
|
||||||
completeopt = "menu,menuone,noinsert" .. (auto_select and "" or ",noselect"),
|
|
||||||
},
|
|
||||||
preselect = auto_select and cmp.PreselectMode.Item or cmp.PreselectMode.None,
|
|
||||||
mapping = cmp.mapping.preset.insert({
|
|
||||||
["<C-b>"] = cmp.mapping.scroll_docs(-4),
|
|
||||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
|
||||||
["<C-n>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
|
|
||||||
["<C-p>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
|
|
||||||
["<C-Space>"] = cmp.mapping.complete(),
|
|
||||||
["<CR>"] = LazyVim.cmp.confirm({ select = auto_select }),
|
|
||||||
["<C-y>"] = LazyVim.cmp.confirm({ select = true }),
|
|
||||||
["<S-CR>"] = LazyVim.cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
|
|
||||||
["<C-CR>"] = function(fallback)
|
|
||||||
cmp.abort()
|
|
||||||
fallback()
|
|
||||||
end,
|
|
||||||
["<tab>"] = function(fallback)
|
|
||||||
return LazyVim.cmp.map({ "snippet_forward", "ai_accept" }, fallback)()
|
|
||||||
end,
|
|
||||||
}),
|
|
||||||
sources = cmp.config.sources({
|
|
||||||
{ name = "nvim_lsp" },
|
|
||||||
{ name = "path" },
|
|
||||||
}, {
|
|
||||||
{ name = "buffer" },
|
|
||||||
}),
|
|
||||||
formatting = {
|
|
||||||
format = function(entry, item)
|
|
||||||
local icons = LazyVim.config.icons.kinds
|
|
||||||
if icons[item.kind] then
|
|
||||||
item.kind = icons[item.kind] .. item.kind
|
|
||||||
end
|
|
||||||
|
|
||||||
local widths = {
|
|
||||||
abbr = vim.g.cmp_widths and vim.g.cmp_widths.abbr or 40,
|
|
||||||
menu = vim.g.cmp_widths and vim.g.cmp_widths.menu or 30,
|
|
||||||
}
|
|
||||||
|
|
||||||
for key, width in pairs(widths) do
|
|
||||||
if item[key] and vim.fn.strdisplaywidth(item[key]) > width then
|
|
||||||
item[key] = vim.fn.strcharpart(item[key], 0, width - 1) .. "…"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
return item
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
experimental = {
|
|
||||||
-- only show ghost text when we show ai completions
|
|
||||||
ghost_text = vim.g.ai_cmp and {
|
|
||||||
hl_group = "CmpGhostText",
|
|
||||||
} or false,
|
|
||||||
},
|
|
||||||
sorting = defaults.sorting,
|
|
||||||
}
|
|
||||||
end,
|
end,
|
||||||
main = "lazyvim.util.cmp",
|
|
||||||
},
|
},
|
||||||
|
|
||||||
-- snippets
|
|
||||||
{
|
{
|
||||||
"nvim-cmp",
|
import = "lazyvim.plugins.extras.coding.blink",
|
||||||
optional = true,
|
enabled = function()
|
||||||
dependencies = {
|
return LazyVim.cmp_engine() == "blink.cmp"
|
||||||
{
|
|
||||||
"garymjr/nvim-snippets",
|
|
||||||
opts = {
|
|
||||||
friendly_snippets = true,
|
|
||||||
},
|
|
||||||
dependencies = { "rafamadriz/friendly-snippets" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
opts = function(_, opts)
|
|
||||||
opts.snippet = {
|
|
||||||
expand = function(item)
|
|
||||||
return LazyVim.cmp.expand(item.body)
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
if LazyVim.has("nvim-snippets") then
|
|
||||||
table.insert(opts.sources, { name = "snippets" })
|
|
||||||
end
|
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -160,7 +61,6 @@ return {
|
||||||
{ "%u[%l%d]+%f[^%l%d]", "%f[%S][%l%d]+%f[^%l%d]", "%f[%P][%l%d]+%f[^%l%d]", "^[%l%d]+%f[^%l%d]" },
|
{ "%u[%l%d]+%f[^%l%d]", "%f[%S][%l%d]+%f[^%l%d]", "%f[%P][%l%d]+%f[^%l%d]", "^[%l%d]+%f[^%l%d]" },
|
||||||
"^().*()$",
|
"^().*()$",
|
||||||
},
|
},
|
||||||
i = LazyVim.mini.ai_indent, -- indent
|
|
||||||
g = LazyVim.mini.ai_buffer, -- buffer
|
g = LazyVim.mini.ai_buffer, -- buffer
|
||||||
u = ai.gen_spec.function_call(), -- u for "Usage"
|
u = ai.gen_spec.function_call(), -- u for "Usage"
|
||||||
U = ai.gen_spec.function_call({ name_pattern = "[%w_]" }), -- without dot in function name
|
U = ai.gen_spec.function_call({ name_pattern = "[%w_]" }), -- without dot in function name
|
||||||
|
@ -190,12 +90,4 @@ return {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
-- Add lazydev source to cmp
|
|
||||||
{
|
|
||||||
"hrsh7th/nvim-cmp",
|
|
||||||
optional = true,
|
|
||||||
opts = function(_, opts)
|
|
||||||
table.insert(opts.sources, { name = "lazydev", group_index = 0 })
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,6 +19,7 @@ return {
|
||||||
cmp = true,
|
cmp = true,
|
||||||
dashboard = true,
|
dashboard = true,
|
||||||
flash = true,
|
flash = true,
|
||||||
|
fzf = true,
|
||||||
grug_far = true,
|
grug_far = true,
|
||||||
gitsigns = true,
|
gitsigns = true,
|
||||||
headlines = true,
|
headlines = true,
|
||||||
|
|
|
@ -4,6 +4,9 @@ return {
|
||||||
{ "garymjr/nvim-snippets", enabled = false },
|
{ "garymjr/nvim-snippets", enabled = false },
|
||||||
{ import = "lazyvim.plugins.extras.coding.luasnip" },
|
{ import = "lazyvim.plugins.extras.coding.luasnip" },
|
||||||
|
|
||||||
|
-- Use nvim-cmp instead of blink.cmp
|
||||||
|
{ import = "lazyvim.plugins.extras.coding.nvim-cmp" },
|
||||||
|
|
||||||
-- Use mini.comment instead of ts-comments
|
-- Use mini.comment instead of ts-comments
|
||||||
{ "folke/ts-comments.nvim", enabled = false },
|
{ "folke/ts-comments.nvim", enabled = false },
|
||||||
{ import = "lazyvim.plugins.extras.coding.mini-comment" },
|
{ import = "lazyvim.plugins.extras.coding.mini-comment" },
|
||||||
|
|
|
@ -176,12 +176,15 @@ return {
|
||||||
event = "VeryLazy",
|
event = "VeryLazy",
|
||||||
opts_extend = { "spec" },
|
opts_extend = { "spec" },
|
||||||
opts = {
|
opts = {
|
||||||
|
preset = "helix",
|
||||||
defaults = {},
|
defaults = {},
|
||||||
spec = {
|
spec = {
|
||||||
{
|
{
|
||||||
mode = { "n", "v" },
|
mode = { "n", "v" },
|
||||||
{ "<leader><tab>", group = "tabs" },
|
{ "<leader><tab>", group = "tabs" },
|
||||||
{ "<leader>c", group = "code" },
|
{ "<leader>c", group = "code" },
|
||||||
|
{ "<leader>d", group = "debug" },
|
||||||
|
{ "<leader>dp", group = "profiler" },
|
||||||
{ "<leader>f", group = "file/find" },
|
{ "<leader>f", group = "file/find" },
|
||||||
{ "<leader>g", group = "git" },
|
{ "<leader>g", group = "git" },
|
||||||
{ "<leader>gh", group = "hunks" },
|
{ "<leader>gh", group = "hunks" },
|
||||||
|
@ -300,6 +303,20 @@ return {
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"gitsigns.nvim",
|
||||||
|
opts = function()
|
||||||
|
Snacks.toggle({
|
||||||
|
name = "Git Signs",
|
||||||
|
get = function()
|
||||||
|
return require("gitsigns.config").config.signcolumn
|
||||||
|
end,
|
||||||
|
set = function(state)
|
||||||
|
require("gitsigns").toggle_signs(state)
|
||||||
|
end,
|
||||||
|
}):map("<leader>uG")
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
|
||||||
-- better diagnostics list and others
|
-- better diagnostics list and others
|
||||||
{
|
{
|
||||||
|
@ -380,4 +397,10 @@ return {
|
||||||
return LazyVim.pick.want() == "telescope"
|
return LazyVim.pick.want() == "telescope"
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
import = "lazyvim.plugins.extras.editor.snacks_picker",
|
||||||
|
enabled = function()
|
||||||
|
return LazyVim.pick.want() == "snacks"
|
||||||
|
end,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,7 @@ return {
|
||||||
{
|
{
|
||||||
"Exafunction/codeium.nvim",
|
"Exafunction/codeium.nvim",
|
||||||
cmd = "Codeium",
|
cmd = "Codeium",
|
||||||
|
event = "InsertEnter",
|
||||||
build = ":Codeium Auth",
|
build = ":Codeium Auth",
|
||||||
opts = {
|
opts = {
|
||||||
enable_cmp_source = vim.g.ai_cmp,
|
enable_cmp_source = vim.g.ai_cmp,
|
||||||
|
@ -34,7 +35,7 @@ return {
|
||||||
|
|
||||||
-- codeium cmp source
|
-- codeium cmp source
|
||||||
{
|
{
|
||||||
"nvim-cmp",
|
"hrsh7th/nvim-cmp",
|
||||||
optional = true,
|
optional = true,
|
||||||
dependencies = { "codeium.nvim" },
|
dependencies = { "codeium.nvim" },
|
||||||
opts = function(_, opts)
|
opts = function(_, opts)
|
||||||
|
@ -55,17 +56,21 @@ return {
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
vim.g.ai_cmp and {
|
||||||
"saghen/blink.cmp",
|
"saghen/blink.cmp",
|
||||||
optional = true,
|
optional = true,
|
||||||
|
dependencies = { "codeium.nvim", "saghen/blink.compat" },
|
||||||
opts = {
|
opts = {
|
||||||
sources = {
|
sources = {
|
||||||
compat = vim.g.ai_cmp and { "codeium" } or nil,
|
compat = { "codeium" },
|
||||||
|
providers = {
|
||||||
|
codeium = {
|
||||||
|
kind = "Codeium",
|
||||||
|
score_offset = 100,
|
||||||
|
async = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
dependencies = {
|
} or nil,
|
||||||
"codeium.nvim",
|
|
||||||
vim.g.ai_cmp and "saghen/blink.compat" or nil,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ end
|
||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"CopilotC-Nvim/CopilotChat.nvim",
|
"CopilotC-Nvim/CopilotChat.nvim",
|
||||||
branch = "canary",
|
branch = "main",
|
||||||
cmd = "CopilotChat",
|
cmd = "CopilotChat",
|
||||||
opts = function()
|
opts = function()
|
||||||
local user = vim.env.USER or "User"
|
local user = vim.env.USER or "User"
|
||||||
|
|
|
@ -58,67 +58,61 @@ return {
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
-- copilot cmp source
|
vim.g.ai_cmp
|
||||||
{
|
and {
|
||||||
"nvim-cmp",
|
-- copilot cmp source
|
||||||
optional = true,
|
{
|
||||||
dependencies = { -- this will only be evaluated if nvim-cmp is enabled
|
"hrsh7th/nvim-cmp",
|
||||||
{
|
optional = true,
|
||||||
"zbirenbaum/copilot-cmp",
|
dependencies = { -- this will only be evaluated if nvim-cmp is enabled
|
||||||
enabled = vim.g.ai_cmp, -- only enable if wanted
|
{
|
||||||
opts = {},
|
"zbirenbaum/copilot-cmp",
|
||||||
config = function(_, opts)
|
opts = {},
|
||||||
local copilot_cmp = require("copilot_cmp")
|
config = function(_, opts)
|
||||||
copilot_cmp.setup(opts)
|
local copilot_cmp = require("copilot_cmp")
|
||||||
-- attach cmp source whenever copilot attaches
|
copilot_cmp.setup(opts)
|
||||||
-- fixes lazy-loading issues with the copilot cmp source
|
-- attach cmp source whenever copilot attaches
|
||||||
LazyVim.lsp.on_attach(function()
|
-- fixes lazy-loading issues with the copilot cmp source
|
||||||
copilot_cmp._on_insert_enter({})
|
LazyVim.lsp.on_attach(function()
|
||||||
end, "copilot")
|
copilot_cmp._on_insert_enter({})
|
||||||
end,
|
end, "copilot")
|
||||||
specs = {
|
end,
|
||||||
{
|
specs = {
|
||||||
"nvim-cmp",
|
{
|
||||||
optional = true,
|
"hrsh7th/nvim-cmp",
|
||||||
---@param opts cmp.ConfigSchema
|
optional = true,
|
||||||
opts = function(_, opts)
|
---@param opts cmp.ConfigSchema
|
||||||
table.insert(opts.sources, 1, {
|
opts = function(_, opts)
|
||||||
name = "copilot",
|
table.insert(opts.sources, 1, {
|
||||||
group_index = 1,
|
name = "copilot",
|
||||||
priority = 100,
|
group_index = 1,
|
||||||
})
|
priority = 100,
|
||||||
end,
|
})
|
||||||
},
|
end,
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
-- blink.cmp
|
|
||||||
{
|
|
||||||
"saghen/blink.cmp",
|
|
||||||
optional = true,
|
|
||||||
dependencies = {
|
|
||||||
{
|
|
||||||
"giuxtaposition/blink-cmp-copilot",
|
|
||||||
enabled = vim.g.ai_cmp, -- only enable if needed
|
|
||||||
specs = {
|
|
||||||
{
|
|
||||||
"blink.cmp",
|
|
||||||
optional = true,
|
|
||||||
opts = {
|
|
||||||
sources = {
|
|
||||||
providers = {
|
|
||||||
copilot = { name = "copilot", module = "blink-cmp-copilot" },
|
|
||||||
},
|
|
||||||
completion = {
|
|
||||||
enabled_providers = { "copilot" },
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
{
|
||||||
},
|
"saghen/blink.cmp",
|
||||||
},
|
optional = true,
|
||||||
|
dependencies = { "giuxtaposition/blink-cmp-copilot" },
|
||||||
|
opts = {
|
||||||
|
sources = {
|
||||||
|
default = { "copilot" },
|
||||||
|
providers = {
|
||||||
|
copilot = {
|
||||||
|
name = "copilot",
|
||||||
|
module = "blink-cmp-copilot",
|
||||||
|
kind = "Copilot",
|
||||||
|
score_offset = 100,
|
||||||
|
async = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
or nil,
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,17 @@
|
||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"supermaven-inc/supermaven-nvim",
|
"supermaven-inc/supermaven-nvim",
|
||||||
|
event = "InsertEnter",
|
||||||
|
cmd = {
|
||||||
|
"SupermavenUseFree",
|
||||||
|
"SupermavenUsePro",
|
||||||
|
},
|
||||||
opts = {
|
opts = {
|
||||||
keymaps = {
|
keymaps = {
|
||||||
accept_suggestion = nil, -- handled by nvim-cmp / blink.cmp
|
accept_suggestion = nil, -- handled by nvim-cmp / blink.cmp
|
||||||
},
|
},
|
||||||
disable_inline_completion = vim.g.ai_cmp,
|
disable_inline_completion = vim.g.ai_cmp,
|
||||||
|
ignore_filetypes = { "bigfile", "snacks_input", "snacks_notif" },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -43,41 +49,23 @@ return {
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
-- blink.cmp integration
|
vim.g.ai_cmp and {
|
||||||
--
|
|
||||||
-- FIXME: this currently doesn't work properly
|
|
||||||
-- {
|
|
||||||
-- "saghen/blink.cmp",
|
|
||||||
-- optional = true,
|
|
||||||
-- opts = {
|
|
||||||
-- sources = {
|
|
||||||
-- compat = vim.g.ai_cmp and { "supermaven" } or nil,
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
-- dependencies = {
|
|
||||||
-- "supermaven-nvim",
|
|
||||||
-- vim.g.ai_cmp and "saghen/blink.compat" or nil,
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
--
|
|
||||||
-- Disabble cmp integration for now
|
|
||||||
{
|
|
||||||
"saghen/blink.cmp",
|
"saghen/blink.cmp",
|
||||||
optional = true,
|
optional = true,
|
||||||
---@module 'blink.cmp'
|
dependencies = { "supermaven-nvim", "saghen/blink.compat" },
|
||||||
---@type blink.cmp.Config
|
|
||||||
opts = {
|
opts = {
|
||||||
completion = { ghost_text = { enabled = false } },
|
sources = {
|
||||||
},
|
compat = { "supermaven" },
|
||||||
dependencies = {
|
providers = {
|
||||||
{
|
supermaven = {
|
||||||
"supermaven-nvim",
|
kind = "Supermaven",
|
||||||
opts = {
|
score_offset = 100,
|
||||||
disable_inline_completion = false,
|
async = true,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
} or nil,
|
||||||
|
|
||||||
{
|
{
|
||||||
"nvim-lualine/lualine.nvim",
|
"nvim-lualine/lualine.nvim",
|
||||||
|
|
|
@ -1,25 +1,22 @@
|
||||||
return {
|
return {
|
||||||
-- Tabnine cmp source
|
-- Tabnine cmp source
|
||||||
{
|
{
|
||||||
"nvim-cmp",
|
"tzachar/cmp-tabnine",
|
||||||
optional = true,
|
build = LazyVim.is_win() and "pwsh -noni .\\install.ps1" or "./install.sh",
|
||||||
dependencies = {
|
opts = {
|
||||||
{
|
max_lines = 1000,
|
||||||
"tzachar/cmp-tabnine",
|
max_num_results = 3,
|
||||||
build = {
|
sort = true,
|
||||||
LazyVim.is_win() and "pwsh -noni .\\install.ps1" or "./install.sh",
|
|
||||||
},
|
|
||||||
dependencies = "hrsh7th/nvim-cmp",
|
|
||||||
opts = {
|
|
||||||
max_lines = 1000,
|
|
||||||
max_num_results = 3,
|
|
||||||
sort = true,
|
|
||||||
},
|
|
||||||
config = function(_, opts)
|
|
||||||
require("cmp_tabnine.config"):setup(opts)
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
config = function(_, opts)
|
||||||
|
require("cmp_tabnine.config"):setup(opts)
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"hrsh7th/nvim-cmp",
|
||||||
|
optional = true,
|
||||||
|
dependencies = { "tzachar/cmp-tabnine" },
|
||||||
---@param opts cmp.ConfigSchema
|
---@param opts cmp.ConfigSchema
|
||||||
opts = function(_, opts)
|
opts = function(_, opts)
|
||||||
table.insert(opts.sources, 1, {
|
table.insert(opts.sources, 1, {
|
||||||
|
@ -36,6 +33,25 @@ return {
|
||||||
end)
|
end)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"saghen/blink.cmp",
|
||||||
|
optional = true,
|
||||||
|
dependencies = { "tzachar/cmp-tabnine", "saghen/blink.compat" },
|
||||||
|
opts = {
|
||||||
|
sources = {
|
||||||
|
compat = { "cmp_tabnine" },
|
||||||
|
providers = {
|
||||||
|
cmp_tabnine = {
|
||||||
|
kind = "TabNine",
|
||||||
|
score_offset = 100,
|
||||||
|
async = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
-- Show TabNine status in lualine
|
-- Show TabNine status in lualine
|
||||||
{
|
{
|
||||||
"nvim-lualine/lualine.nvim",
|
"nvim-lualine/lualine.nvim",
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
---@diagnostic disable: missing-fields
|
||||||
if lazyvim_docs then
|
if lazyvim_docs then
|
||||||
-- set to `true` to follow the main branch
|
-- set to `true` to follow the main branch
|
||||||
-- you need to have a working rust toolchain to build the plugin
|
-- you need to have a working rust toolchain to build the plugin
|
||||||
|
@ -8,6 +9,7 @@ end
|
||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"hrsh7th/nvim-cmp",
|
"hrsh7th/nvim-cmp",
|
||||||
|
optional = true,
|
||||||
enabled = false,
|
enabled = false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -17,6 +19,7 @@ return {
|
||||||
opts_extend = {
|
opts_extend = {
|
||||||
"sources.completion.enabled_providers",
|
"sources.completion.enabled_providers",
|
||||||
"sources.compat",
|
"sources.compat",
|
||||||
|
"sources.default",
|
||||||
},
|
},
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"rafamadriz/friendly-snippets",
|
"rafamadriz/friendly-snippets",
|
||||||
|
@ -33,18 +36,31 @@ return {
|
||||||
---@module 'blink.cmp'
|
---@module 'blink.cmp'
|
||||||
---@type blink.cmp.Config
|
---@type blink.cmp.Config
|
||||||
opts = {
|
opts = {
|
||||||
highlight = {
|
snippets = {
|
||||||
|
expand = function(snippet, _)
|
||||||
|
return LazyVim.cmp.expand(snippet)
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
appearance = {
|
||||||
-- sets the fallback highlight groups to nvim-cmp's highlight groups
|
-- sets the fallback highlight groups to nvim-cmp's highlight groups
|
||||||
-- useful for when your theme doesn't support blink.cmp
|
-- useful for when your theme doesn't support blink.cmp
|
||||||
-- will be removed in a future release, assuming themes add support
|
-- will be removed in a future release, assuming themes add support
|
||||||
use_nvim_cmp_as_default = false,
|
use_nvim_cmp_as_default = false,
|
||||||
|
-- set to 'mono' for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
|
||||||
|
-- adjusts spacing to ensure icons are aligned
|
||||||
|
nerd_font_variant = "mono",
|
||||||
},
|
},
|
||||||
-- set to 'mono' for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
|
|
||||||
-- adjusts spacing to ensure icons are aligned
|
|
||||||
nerd_font_variant = "mono",
|
|
||||||
completion = {
|
completion = {
|
||||||
|
accept = {
|
||||||
|
-- experimental auto-brackets support
|
||||||
|
auto_brackets = {
|
||||||
|
enabled = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
menu = {
|
menu = {
|
||||||
winblend = vim.o.pumblend,
|
draw = {
|
||||||
|
treesitter = { "lsp" },
|
||||||
|
},
|
||||||
},
|
},
|
||||||
documentation = {
|
documentation = {
|
||||||
auto_show = true,
|
auto_show = true,
|
||||||
|
@ -55,33 +71,26 @@ return {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
-- experimental auto-brackets support
|
|
||||||
accept = { auto_brackets = { enabled = true } },
|
|
||||||
|
|
||||||
-- experimental signature help support
|
-- experimental signature help support
|
||||||
-- trigger = { signature_help = { enabled = true } }
|
-- signature = { enabled = true },
|
||||||
|
|
||||||
sources = {
|
sources = {
|
||||||
-- adding any nvim-cmp sources here will enable them
|
-- adding any nvim-cmp sources here will enable them
|
||||||
-- with blink.compat
|
-- with blink.compat
|
||||||
compat = {},
|
compat = {},
|
||||||
completion = {
|
default = { "lsp", "path", "snippets", "buffer" },
|
||||||
-- remember to enable your providers here
|
cmdline = {},
|
||||||
enabled_providers = { "lsp", "path", "snippets", "buffer" },
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
keymap = {
|
keymap = {
|
||||||
preset = "enter",
|
preset = "enter",
|
||||||
["<Tab>"] = {
|
["<C-y>"] = { "select_and_accept" },
|
||||||
LazyVim.cmp.map({ "snippet_forward", "ai_accept" }),
|
|
||||||
"fallback",
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
---@param opts blink.cmp.Config | { sources: { compat: string[] } }
|
---@param opts blink.cmp.Config | { sources: { compat: string[] } }
|
||||||
config = function(_, opts)
|
config = function(_, opts)
|
||||||
-- setup compat sources
|
-- setup compat sources
|
||||||
local enabled = opts.sources.completion.enabled_providers
|
local enabled = opts.sources.default
|
||||||
for _, source in ipairs(opts.sources.compat or {}) do
|
for _, source in ipairs(opts.sources.compat or {}) do
|
||||||
opts.sources.providers[source] = vim.tbl_deep_extend(
|
opts.sources.providers[source] = vim.tbl_deep_extend(
|
||||||
"force",
|
"force",
|
||||||
|
@ -92,6 +101,54 @@ return {
|
||||||
table.insert(enabled, source)
|
table.insert(enabled, source)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- add ai_accept to <Tab> key
|
||||||
|
if not opts.keymap["<Tab>"] then
|
||||||
|
if opts.keymap.preset == "super-tab" then -- super-tab
|
||||||
|
opts.keymap["<Tab>"] = {
|
||||||
|
require("blink.cmp.keymap.presets")["super-tab"]["<Tab>"][1],
|
||||||
|
LazyVim.cmp.map({ "snippet_forward", "ai_accept" }),
|
||||||
|
"fallback",
|
||||||
|
}
|
||||||
|
else -- other presets
|
||||||
|
opts.keymap["<Tab>"] = {
|
||||||
|
LazyVim.cmp.map({ "snippet_forward", "ai_accept" }),
|
||||||
|
"fallback",
|
||||||
|
}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Unset custom prop to pass blink.cmp validation
|
||||||
|
opts.sources.compat = nil
|
||||||
|
|
||||||
|
-- check if we need to override symbol kinds
|
||||||
|
for _, provider in pairs(opts.sources.providers or {}) do
|
||||||
|
---@cast provider blink.cmp.SourceProviderConfig|{kind?:string}
|
||||||
|
if provider.kind then
|
||||||
|
local CompletionItemKind = require("blink.cmp.types").CompletionItemKind
|
||||||
|
local kind_idx = #CompletionItemKind + 1
|
||||||
|
|
||||||
|
CompletionItemKind[kind_idx] = provider.kind
|
||||||
|
---@diagnostic disable-next-line: no-unknown
|
||||||
|
CompletionItemKind[provider.kind] = kind_idx
|
||||||
|
|
||||||
|
---@type fun(ctx: blink.cmp.Context, items: blink.cmp.CompletionItem[]): blink.cmp.CompletionItem[]
|
||||||
|
local transform_items = provider.transform_items
|
||||||
|
---@param ctx blink.cmp.Context
|
||||||
|
---@param items blink.cmp.CompletionItem[]
|
||||||
|
provider.transform_items = function(ctx, items)
|
||||||
|
items = transform_items and transform_items(ctx, items) or items
|
||||||
|
for _, item in ipairs(items) do
|
||||||
|
item.kind = kind_idx or item.kind
|
||||||
|
end
|
||||||
|
return items
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Unset custom prop to pass blink.cmp validation
|
||||||
|
provider.kind = nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
require("blink.cmp").setup(opts)
|
require("blink.cmp").setup(opts)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
@ -101,7 +158,7 @@ return {
|
||||||
"saghen/blink.cmp",
|
"saghen/blink.cmp",
|
||||||
opts = function(_, opts)
|
opts = function(_, opts)
|
||||||
opts.appearance = opts.appearance or {}
|
opts.appearance = opts.appearance or {}
|
||||||
opts.appearance.kind_icons = LazyVim.config.icons.kinds
|
opts.appearance.kind_icons = vim.tbl_extend("force", opts.appearance.kind_icons or {}, LazyVim.config.icons.kinds)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -110,18 +167,13 @@ return {
|
||||||
"saghen/blink.cmp",
|
"saghen/blink.cmp",
|
||||||
opts = {
|
opts = {
|
||||||
sources = {
|
sources = {
|
||||||
completion = {
|
-- add lazydev to your completion providers
|
||||||
-- add lazydev to your completion providers
|
default = { "lazydev" },
|
||||||
enabled_providers = { "lazydev" },
|
|
||||||
},
|
|
||||||
providers = {
|
providers = {
|
||||||
lsp = {
|
|
||||||
-- dont show LuaLS require statements when lazydev has items
|
|
||||||
fallback_for = { "lazydev" },
|
|
||||||
},
|
|
||||||
lazydev = {
|
lazydev = {
|
||||||
name = "LazyDev",
|
name = "LazyDev",
|
||||||
module = "lazydev.integrations.blink",
|
module = "lazydev.integrations.blink",
|
||||||
|
score_offset = 100, -- show at a higher priority than lsp
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -14,6 +14,7 @@ return {
|
||||||
"rafamadriz/friendly-snippets",
|
"rafamadriz/friendly-snippets",
|
||||||
config = function()
|
config = function()
|
||||||
require("luasnip.loaders.from_vscode").lazy_load()
|
require("luasnip.loaders.from_vscode").lazy_load()
|
||||||
|
require("luasnip.loaders.from_vscode").lazy_load({ paths = { vim.fn.stdpath("config") .. "/snippets" } })
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -33,12 +34,18 @@ return {
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
LazyVim.cmp.actions.snippet_stop = function()
|
||||||
|
if require("luasnip").expand_or_jumpable() then -- or just jumpable(1) is fine?
|
||||||
|
require("luasnip").unlink_current()
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
-- nvim-cmp integration
|
-- nvim-cmp integration
|
||||||
{
|
{
|
||||||
"nvim-cmp",
|
"hrsh7th/nvim-cmp",
|
||||||
optional = true,
|
optional = true,
|
||||||
dependencies = { "saadparwaiz1/cmp_luasnip" },
|
dependencies = { "saadparwaiz1/cmp_luasnip" },
|
||||||
opts = function(_, opts)
|
opts = function(_, opts)
|
||||||
|
@ -60,25 +67,9 @@ return {
|
||||||
{
|
{
|
||||||
"saghen/blink.cmp",
|
"saghen/blink.cmp",
|
||||||
optional = true,
|
optional = true,
|
||||||
dependencies = {
|
|
||||||
{ "saghen/blink.compat", opts = { impersonate_nvim_cmp = true } },
|
|
||||||
{ "saadparwaiz1/cmp_luasnip" },
|
|
||||||
},
|
|
||||||
opts = {
|
opts = {
|
||||||
sources = { compat = { "luasnip" } },
|
|
||||||
snippets = {
|
snippets = {
|
||||||
expand = function(snippet)
|
preset = "luasnip",
|
||||||
require("luasnip").lsp_expand(snippet)
|
|
||||||
end,
|
|
||||||
active = function(filter)
|
|
||||||
if filter and filter.direction then
|
|
||||||
return require("luasnip").jumpable(filter.direction)
|
|
||||||
end
|
|
||||||
return require("luasnip").in_snippet()
|
|
||||||
end,
|
|
||||||
jump = function(direction)
|
|
||||||
require("luasnip").jump(direction)
|
|
||||||
end,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
167
lua/lazyvim/plugins/extras/coding/mini-snippets.lua
Normal file
167
lua/lazyvim/plugins/extras/coding/mini-snippets.lua
Normal file
|
@ -0,0 +1,167 @@
|
||||||
|
if lazyvim_docs then
|
||||||
|
-- Set to `false` to prevent "non-lsp snippets"" from appearing inside completion windows
|
||||||
|
-- Motivation: Less clutter in completion windows and a more direct usage of snippits
|
||||||
|
vim.g.lazyvim_mini_snippets_in_completion = true
|
||||||
|
|
||||||
|
-- NOTE: Please also read:
|
||||||
|
-- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-snippets.md#expand
|
||||||
|
-- :h MiniSnippets-session
|
||||||
|
|
||||||
|
-- Example override for your own config:
|
||||||
|
--[[
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
"echasnovski/mini.snippets",
|
||||||
|
opts = function(_, opts)
|
||||||
|
-- By default, for opts.snippets, the extra for mini.snippets only adds gen_loader.from_lang()
|
||||||
|
-- This provides a sensible quickstart, integrating with friendly-snippets
|
||||||
|
-- and your own language-specific snippets
|
||||||
|
--
|
||||||
|
-- In order to change opts.snippets, replace the entire table inside your own opts
|
||||||
|
|
||||||
|
local snippets, config_path = require("mini.snippets"), vim.fn.stdpath("config")
|
||||||
|
|
||||||
|
opts.snippets = { -- override opts.snippets provided by extra...
|
||||||
|
-- Load custom file with global snippets first (order matters)
|
||||||
|
snippets.gen_loader.from_file(config_path .. "/snippets/global.json"),
|
||||||
|
|
||||||
|
-- Load snippets based on current language by reading files from
|
||||||
|
-- "snippets/" subdirectories from 'runtimepath' directories.
|
||||||
|
snippets.gen_loader.from_lang(), -- this is the default in the extra...
|
||||||
|
}
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
--]]
|
||||||
|
end
|
||||||
|
|
||||||
|
local include_in_completion = vim.g.lazyvim_mini_snippets_in_completion == nil
|
||||||
|
or vim.g.lazyvim_mini_snippets_in_completion
|
||||||
|
|
||||||
|
local function expand_from_lsp(snippet)
|
||||||
|
local insert = MiniSnippets.config.expand.insert or MiniSnippets.default_insert
|
||||||
|
insert({ body = snippet })
|
||||||
|
end
|
||||||
|
|
||||||
|
local function jump(direction)
|
||||||
|
local is_active = MiniSnippets.session.get(false) ~= nil
|
||||||
|
if is_active then
|
||||||
|
MiniSnippets.session.jump(direction)
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
---@type fun(snippets, insert) | nil
|
||||||
|
local expand_select_override = nil
|
||||||
|
|
||||||
|
return {
|
||||||
|
-- disable builtin snippet support:
|
||||||
|
{ "garymjr/nvim-snippets", optional = true, enabled = false },
|
||||||
|
-- disable luasnip:
|
||||||
|
{ "L3MON4D3/LuaSnip", optional = true, enabled = false },
|
||||||
|
|
||||||
|
-- add mini.snippets
|
||||||
|
desc = "mini.snippets(beta), a plugin to manage and expand snippets (alternative for luasnip)",
|
||||||
|
{
|
||||||
|
"echasnovski/mini.snippets",
|
||||||
|
event = "InsertEnter", -- don't depend on other plugins to load...
|
||||||
|
dependencies = "rafamadriz/friendly-snippets",
|
||||||
|
opts = function()
|
||||||
|
---@diagnostic disable-next-line: duplicate-set-field
|
||||||
|
LazyVim.cmp.actions.snippet_stop = function() end -- by design, <esc> should not stop the session!
|
||||||
|
---@diagnostic disable-next-line: duplicate-set-field
|
||||||
|
LazyVim.cmp.actions.snippet_forward = function()
|
||||||
|
return jump("next")
|
||||||
|
end
|
||||||
|
|
||||||
|
local mini_snippets = require("mini.snippets")
|
||||||
|
return {
|
||||||
|
snippets = { mini_snippets.gen_loader.from_lang() },
|
||||||
|
|
||||||
|
-- Following the behavior of vim.snippets,
|
||||||
|
-- the intended usage of <esc> is to be able to temporarily exit into normal mode for quick edits.
|
||||||
|
--
|
||||||
|
-- If you'd rather stop the snippet on <esc>, activate the line below in your own config:
|
||||||
|
-- mappings = { stop = "<esc>" }, -- <c-c> by default, see :h MiniSnippets-session
|
||||||
|
|
||||||
|
expand = {
|
||||||
|
select = function(snippets, insert)
|
||||||
|
-- Close completion window on snippet select - vim.ui.select
|
||||||
|
-- Needed to remove virtual text for fzf-lua and telescope, but not for mini.pick...
|
||||||
|
local select = expand_select_override or MiniSnippets.default_select
|
||||||
|
select(snippets, insert)
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
|
||||||
|
-- nvim-cmp integration
|
||||||
|
{
|
||||||
|
"hrsh7th/nvim-cmp",
|
||||||
|
optional = true,
|
||||||
|
dependencies = include_in_completion and { "abeldekat/cmp-mini-snippets" } or nil,
|
||||||
|
opts = function(_, opts)
|
||||||
|
local cmp = require("cmp")
|
||||||
|
local cmp_config = require("cmp.config")
|
||||||
|
|
||||||
|
opts.snippet = {
|
||||||
|
expand = function(args)
|
||||||
|
expand_from_lsp(args.body)
|
||||||
|
cmp.resubscribe({ "TextChangedI", "TextChangedP" })
|
||||||
|
cmp_config.set_onetime({ sources = {} })
|
||||||
|
end,
|
||||||
|
}
|
||||||
|
|
||||||
|
if include_in_completion then
|
||||||
|
table.insert(opts.sources, { name = "mini_snippets" })
|
||||||
|
else
|
||||||
|
expand_select_override = function(snippets, insert)
|
||||||
|
-- stylua: ignore
|
||||||
|
if cmp.visible() then cmp.close() end
|
||||||
|
MiniSnippets.default_select(snippets, insert)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
-- stylua: ignore
|
||||||
|
-- counterpart to <tab> defined in cmp.mappings
|
||||||
|
keys = include_in_completion and { { "<s-tab>", function() jump("prev") end, mode = "i" } } or nil,
|
||||||
|
},
|
||||||
|
|
||||||
|
-- blink.cmp integration
|
||||||
|
{
|
||||||
|
"saghen/blink.cmp",
|
||||||
|
optional = true,
|
||||||
|
opts = function(_, opts)
|
||||||
|
-- Return early
|
||||||
|
if include_in_completion then
|
||||||
|
opts.snippets = { preset = "mini_snippets" }
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Standalone --
|
||||||
|
expand_select_override = function(snippets, insert)
|
||||||
|
-- Schedule, otherwise blink's virtual text is not removed on vim.ui.select
|
||||||
|
require("blink.cmp").cancel()
|
||||||
|
vim.schedule(function()
|
||||||
|
MiniSnippets.default_select(snippets, insert)
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
--
|
||||||
|
-- Blink performs a require on blink.cmp.sources.snippets.default
|
||||||
|
-- By removing the source, the default engine will not be used
|
||||||
|
opts.sources.default = vim.tbl_filter(function(source)
|
||||||
|
return source ~= "snippets"
|
||||||
|
end, opts.sources.default)
|
||||||
|
opts.snippets = { -- need to repeat blink's preset here
|
||||||
|
expand = expand_from_lsp,
|
||||||
|
active = function()
|
||||||
|
return MiniSnippets.session.get(false) ~= nil
|
||||||
|
end,
|
||||||
|
jump = function(direction)
|
||||||
|
jump(direction == -1 and "prev" or "next")
|
||||||
|
end,
|
||||||
|
}
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
}
|
118
lua/lazyvim/plugins/extras/coding/nvim-cmp.lua
Normal file
118
lua/lazyvim/plugins/extras/coding/nvim-cmp.lua
Normal file
|
@ -0,0 +1,118 @@
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
"saghen/blink.cmp",
|
||||||
|
enabled = false,
|
||||||
|
optional = true,
|
||||||
|
},
|
||||||
|
|
||||||
|
-- Setup nvim-cmp
|
||||||
|
{
|
||||||
|
"hrsh7th/nvim-cmp",
|
||||||
|
version = false, -- last release is way too old
|
||||||
|
event = "InsertEnter",
|
||||||
|
dependencies = {
|
||||||
|
"hrsh7th/cmp-nvim-lsp",
|
||||||
|
"hrsh7th/cmp-buffer",
|
||||||
|
"hrsh7th/cmp-path",
|
||||||
|
},
|
||||||
|
-- Not all LSP servers add brackets when completing a function.
|
||||||
|
-- To better deal with this, LazyVim adds a custom option to cmp,
|
||||||
|
-- that you can configure. For example:
|
||||||
|
--
|
||||||
|
-- ```lua
|
||||||
|
-- opts = {
|
||||||
|
-- auto_brackets = { "python" }
|
||||||
|
-- }
|
||||||
|
-- ```
|
||||||
|
opts = function()
|
||||||
|
vim.api.nvim_set_hl(0, "CmpGhostText", { link = "Comment", default = true })
|
||||||
|
local cmp = require("cmp")
|
||||||
|
local defaults = require("cmp.config.default")()
|
||||||
|
local auto_select = true
|
||||||
|
return {
|
||||||
|
auto_brackets = {}, -- configure any filetype to auto add brackets
|
||||||
|
completion = {
|
||||||
|
completeopt = "menu,menuone,noinsert" .. (auto_select and "" or ",noselect"),
|
||||||
|
},
|
||||||
|
preselect = auto_select and cmp.PreselectMode.Item or cmp.PreselectMode.None,
|
||||||
|
mapping = cmp.mapping.preset.insert({
|
||||||
|
["<C-b>"] = cmp.mapping.scroll_docs(-4),
|
||||||
|
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||||
|
["<C-n>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
|
||||||
|
["<C-p>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
|
||||||
|
["<C-Space>"] = cmp.mapping.complete(),
|
||||||
|
["<CR>"] = LazyVim.cmp.confirm({ select = auto_select }),
|
||||||
|
["<C-y>"] = LazyVim.cmp.confirm({ select = true }),
|
||||||
|
["<S-CR>"] = LazyVim.cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
|
||||||
|
["<C-CR>"] = function(fallback)
|
||||||
|
cmp.abort()
|
||||||
|
fallback()
|
||||||
|
end,
|
||||||
|
["<tab>"] = function(fallback)
|
||||||
|
return LazyVim.cmp.map({ "snippet_forward", "ai_accept" }, fallback)()
|
||||||
|
end,
|
||||||
|
}),
|
||||||
|
sources = cmp.config.sources({
|
||||||
|
{ name = "lazydev" },
|
||||||
|
{ name = "nvim_lsp" },
|
||||||
|
{ name = "path" },
|
||||||
|
}, {
|
||||||
|
{ name = "buffer" },
|
||||||
|
}),
|
||||||
|
formatting = {
|
||||||
|
format = function(entry, item)
|
||||||
|
local icons = LazyVim.config.icons.kinds
|
||||||
|
if icons[item.kind] then
|
||||||
|
item.kind = icons[item.kind] .. item.kind
|
||||||
|
end
|
||||||
|
|
||||||
|
local widths = {
|
||||||
|
abbr = vim.g.cmp_widths and vim.g.cmp_widths.abbr or 40,
|
||||||
|
menu = vim.g.cmp_widths and vim.g.cmp_widths.menu or 30,
|
||||||
|
}
|
||||||
|
|
||||||
|
for key, width in pairs(widths) do
|
||||||
|
if item[key] and vim.fn.strdisplaywidth(item[key]) > width then
|
||||||
|
item[key] = vim.fn.strcharpart(item[key], 0, width - 1) .. "…"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
return item
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
experimental = {
|
||||||
|
-- only show ghost text when we show ai completions
|
||||||
|
ghost_text = vim.g.ai_cmp and {
|
||||||
|
hl_group = "CmpGhostText",
|
||||||
|
} or false,
|
||||||
|
},
|
||||||
|
sorting = defaults.sorting,
|
||||||
|
}
|
||||||
|
end,
|
||||||
|
main = "lazyvim.util.cmp",
|
||||||
|
},
|
||||||
|
|
||||||
|
-- snippets
|
||||||
|
{
|
||||||
|
"hrsh7th/nvim-cmp",
|
||||||
|
dependencies = {
|
||||||
|
{
|
||||||
|
"garymjr/nvim-snippets",
|
||||||
|
opts = {
|
||||||
|
friendly_snippets = true,
|
||||||
|
},
|
||||||
|
dependencies = { "rafamadriz/friendly-snippets" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
opts = function(_, opts)
|
||||||
|
opts.snippet = {
|
||||||
|
expand = function(item)
|
||||||
|
return LazyVim.cmp.expand(item.body)
|
||||||
|
end,
|
||||||
|
}
|
||||||
|
if LazyVim.has("nvim-snippets") then
|
||||||
|
table.insert(opts.sources, { name = "snippets" })
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
}
|
|
@ -33,7 +33,6 @@ return {
|
||||||
|
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
keys = {
|
keys = {
|
||||||
{ "<leader>d", "", desc = "+debug", mode = {"n", "v"} },
|
|
||||||
{ "<leader>dB", function() require("dap").set_breakpoint(vim.fn.input('Breakpoint condition: ')) end, desc = "Breakpoint Condition" },
|
{ "<leader>dB", function() require("dap").set_breakpoint(vim.fn.input('Breakpoint condition: ')) end, desc = "Breakpoint Condition" },
|
||||||
{ "<leader>db", function() require("dap").toggle_breakpoint() end, desc = "Toggle Breakpoint" },
|
{ "<leader>db", function() require("dap").toggle_breakpoint() end, desc = "Toggle Breakpoint" },
|
||||||
{ "<leader>dc", function() require("dap").continue() end, desc = "Run/Continue" },
|
{ "<leader>dc", function() require("dap").continue() end, desc = "Run/Continue" },
|
||||||
|
@ -46,7 +45,7 @@ return {
|
||||||
{ "<leader>dl", function() require("dap").run_last() end, desc = "Run Last" },
|
{ "<leader>dl", function() require("dap").run_last() end, desc = "Run Last" },
|
||||||
{ "<leader>do", function() require("dap").step_out() end, desc = "Step Out" },
|
{ "<leader>do", function() require("dap").step_out() end, desc = "Step Out" },
|
||||||
{ "<leader>dO", function() require("dap").step_over() end, desc = "Step Over" },
|
{ "<leader>dO", function() require("dap").step_over() end, desc = "Step Over" },
|
||||||
{ "<leader>dp", function() require("dap").pause() end, desc = "Pause" },
|
{ "<leader>dP", function() require("dap").pause() end, desc = "Pause" },
|
||||||
{ "<leader>dr", function() require("dap").repl.toggle() end, desc = "Toggle REPL" },
|
{ "<leader>dr", function() require("dap").repl.toggle() end, desc = "Toggle REPL" },
|
||||||
{ "<leader>ds", function() require("dap").session() end, desc = "Session" },
|
{ "<leader>ds", function() require("dap").session() end, desc = "Session" },
|
||||||
{ "<leader>dt", function() require("dap").terminate() end, desc = "Terminate" },
|
{ "<leader>dt", function() require("dap").terminate() end, desc = "Terminate" },
|
||||||
|
|
|
@ -140,6 +140,11 @@ return {
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
markdown = {
|
markdown = {
|
||||||
|
augend.constant.new({
|
||||||
|
elements = { "[ ]", "[x]" },
|
||||||
|
word = false,
|
||||||
|
cyclic = true,
|
||||||
|
}),
|
||||||
augend.misc.alias.markdown_header,
|
augend.misc.alias.markdown_header,
|
||||||
},
|
},
|
||||||
json = {
|
json = {
|
||||||
|
|
|
@ -45,8 +45,9 @@ return {
|
||||||
"ibhagwan/fzf-lua",
|
"ibhagwan/fzf-lua",
|
||||||
cmd = "FzfLua",
|
cmd = "FzfLua",
|
||||||
opts = function(_, opts)
|
opts = function(_, opts)
|
||||||
local config = require("fzf-lua.config")
|
local fzf = require("fzf-lua")
|
||||||
local actions = require("fzf-lua.actions")
|
local config = fzf.config
|
||||||
|
local actions = fzf.actions
|
||||||
|
|
||||||
-- Quickfix
|
-- Quickfix
|
||||||
config.defaults.keymap.fzf["ctrl-q"] = "select-all+accept"
|
config.defaults.keymap.fzf["ctrl-q"] = "select-all+accept"
|
||||||
|
@ -285,6 +286,9 @@ return {
|
||||||
{
|
{
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
opts = function()
|
opts = function()
|
||||||
|
if LazyVim.pick.want() ~= "fzf" then
|
||||||
|
return
|
||||||
|
end
|
||||||
local Keys = require("lazyvim.plugins.lsp.keymaps").get()
|
local Keys = require("lazyvim.plugins.lsp.keymaps").get()
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
vim.list_extend(Keys, {
|
vim.list_extend(Keys, {
|
||||||
|
|
|
@ -2,6 +2,9 @@
|
||||||
-- This works with LSP, Treesitter, and regexp matching to find the other
|
-- This works with LSP, Treesitter, and regexp matching to find the other
|
||||||
-- instances.
|
-- instances.
|
||||||
return {
|
return {
|
||||||
|
-- disable snacks words
|
||||||
|
{ "snacks.nvim", opts = { words = { enabled = false } } },
|
||||||
|
|
||||||
{
|
{
|
||||||
"RRethy/vim-illuminate",
|
"RRethy/vim-illuminate",
|
||||||
event = "LazyFile",
|
event = "LazyFile",
|
||||||
|
@ -53,8 +56,4 @@ return {
|
||||||
{ "[[", desc = "Prev Reference" },
|
{ "[[", desc = "Prev Reference" },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"neovim/nvim-lspconfig",
|
|
||||||
opts = { document_highlight = { enabled = false } },
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,6 +29,29 @@ return {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"mini.diff",
|
||||||
|
opts = function()
|
||||||
|
Snacks.toggle({
|
||||||
|
name = "Mini Diff Signs",
|
||||||
|
get = function()
|
||||||
|
return vim.g.minidiff_disable ~= true
|
||||||
|
end,
|
||||||
|
set = function(state)
|
||||||
|
vim.g.minidiff_disable = not state
|
||||||
|
if state then
|
||||||
|
require("mini.diff").enable(0)
|
||||||
|
else
|
||||||
|
require("mini.diff").disable(0)
|
||||||
|
end
|
||||||
|
-- HACK: redraw to update the signs
|
||||||
|
vim.defer_fn(function()
|
||||||
|
vim.cmd([[redraw!]])
|
||||||
|
end, 200)
|
||||||
|
end,
|
||||||
|
}):map("<leader>uG")
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
|
||||||
-- lualine integration
|
-- lualine integration
|
||||||
{
|
{
|
||||||
|
|
155
lua/lazyvim/plugins/extras/editor/snacks_picker.lua
Normal file
155
lua/lazyvim/plugins/extras/editor/snacks_picker.lua
Normal file
|
@ -0,0 +1,155 @@
|
||||||
|
if lazyvim_docs then
|
||||||
|
-- In case you don't want to use `:LazyExtras`,
|
||||||
|
-- then you need to set the option below.
|
||||||
|
vim.g.lazyvim_picker = "snacks"
|
||||||
|
end
|
||||||
|
|
||||||
|
---@module 'snacks'
|
||||||
|
|
||||||
|
---@type LazyPicker
|
||||||
|
local picker = {
|
||||||
|
name = "snacks",
|
||||||
|
commands = {
|
||||||
|
files = "files",
|
||||||
|
live_grep = "grep",
|
||||||
|
oldfiles = "recent",
|
||||||
|
},
|
||||||
|
|
||||||
|
---@param source string
|
||||||
|
---@param opts? snacks.picker.Config
|
||||||
|
open = function(source, opts)
|
||||||
|
return Snacks.picker.pick(source, opts)
|
||||||
|
end,
|
||||||
|
}
|
||||||
|
if not LazyVim.pick.register(picker) then
|
||||||
|
return {}
|
||||||
|
end
|
||||||
|
|
||||||
|
return {
|
||||||
|
desc = "Fast and modern file picker",
|
||||||
|
recommended = true,
|
||||||
|
{
|
||||||
|
"folke/snacks.nvim",
|
||||||
|
opts = {
|
||||||
|
picker = {
|
||||||
|
win = {
|
||||||
|
input = {
|
||||||
|
keys = {
|
||||||
|
["<a-c>"] = {
|
||||||
|
"toggle_cwd",
|
||||||
|
mode = { "n", "i" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
actions = {
|
||||||
|
---@param p snacks.Picker
|
||||||
|
toggle_cwd = function(p)
|
||||||
|
local root = LazyVim.root({ buf = p.input.filter.current_buf, normalize = true })
|
||||||
|
local cwd = vim.fs.normalize((vim.uv or vim.loop).cwd() or ".")
|
||||||
|
local current = p:cwd()
|
||||||
|
p:set_cwd(current == root and cwd or root)
|
||||||
|
p:find()
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
-- stylua: ignore
|
||||||
|
keys = {
|
||||||
|
{ "<leader>,", function() Snacks.picker.buffers() end, desc = "Buffers" },
|
||||||
|
{ "<leader>/", LazyVim.pick("grep"), desc = "Grep (Root Dir)" },
|
||||||
|
{ "<leader>:", function() Snacks.picker.command_history() end, desc = "Command History" },
|
||||||
|
{ "<leader><space>", LazyVim.pick("files"), desc = "Find Files (Root Dir)" },
|
||||||
|
-- find
|
||||||
|
{ "<leader>fb", function() Snacks.picker.buffers() end, desc = "Buffers" },
|
||||||
|
{ "<leader>fB", function() Snacks.picker.buffers({ hidden = true, nofile = true }) end, desc = "Buffers (all)" },
|
||||||
|
{ "<leader>fc", LazyVim.pick.config_files(), desc = "Find Config File" },
|
||||||
|
{ "<leader>ff", LazyVim.pick("files"), desc = "Find Files (Root Dir)" },
|
||||||
|
{ "<leader>fF", LazyVim.pick("files", { root = false }), desc = "Find Files (cwd)" },
|
||||||
|
{ "<leader>fg", function() Snacks.picker.git_files() end, desc = "Find Files (git-files)" },
|
||||||
|
{ "<leader>fr", LazyVim.pick("oldfiles"), desc = "Recent" },
|
||||||
|
{ "<leader>fR", LazyVim.pick("oldfiles", { filter = { cwd = true }}), desc = "Recent (cwd)" },
|
||||||
|
{ "<leader>fp", function() Snacks.picker.projects() end, desc = "Projects" },
|
||||||
|
-- git
|
||||||
|
{ "<leader>gc", function() Snacks.picker.git_log() end, desc = "Git Log" },
|
||||||
|
{ "<leader>gd", function() Snacks.picker.git_diff() end, desc = "Git Diff (hunks)" },
|
||||||
|
{ "<leader>gs", function() Snacks.picker.git_status() end, desc = "Git Status" },
|
||||||
|
-- Grep
|
||||||
|
{ "<leader>sb", function() Snacks.picker.lines() end, desc = "Buffer Lines" },
|
||||||
|
{ "<leader>sB", function() Snacks.picker.grep_buffers() end, desc = "Grep Open Buffers" },
|
||||||
|
{ "<leader>sg", LazyVim.pick("live_grep"), desc = "Grep (Root Dir)" },
|
||||||
|
{ "<leader>sG", LazyVim.pick("live_grep", { root = false }), desc = "Grep (cwd)" },
|
||||||
|
{ "<leader>sp", function() Snacks.picker.lazy() end, desc = "Search for Plugin Spec" },
|
||||||
|
{ "<leader>sw", LazyVim.pick("grep_word"), desc = "Visual selection or word (Root Dir)", mode = { "n", "x" } },
|
||||||
|
{ "<leader>sW", LazyVim.pick("grep_word", { root = false }), desc = "Visual selection or word (cwd)", mode = { "n", "x" } },
|
||||||
|
-- search
|
||||||
|
{ '<leader>s"', function() Snacks.picker.registers() end, desc = "Registers" },
|
||||||
|
{ "<leader>sa", function() Snacks.picker.autocmds() end, desc = "Autocmds" },
|
||||||
|
{ "<leader>sc", function() Snacks.picker.command_history() end, desc = "Command History" },
|
||||||
|
{ "<leader>sC", function() Snacks.picker.commands() end, desc = "Commands" },
|
||||||
|
{ "<leader>sd", function() Snacks.picker.diagnostics() end, desc = "Diagnostics" },
|
||||||
|
{ "<leader>sh", function() Snacks.picker.help() end, desc = "Help Pages" },
|
||||||
|
{ "<leader>sH", function() Snacks.picker.highlights() end, desc = "Highlights" },
|
||||||
|
{ "<leader>si", function() Snacks.picker.icons() end, desc = "Icons" },
|
||||||
|
{ "<leader>sj", function() Snacks.picker.jumps() end, desc = "Jumps" },
|
||||||
|
{ "<leader>sk", function() Snacks.picker.keymaps() end, desc = "Keymaps" },
|
||||||
|
{ "<leader>sl", function() Snacks.picker.loclist() end, desc = "Location List" },
|
||||||
|
{ "<leader>sM", function() Snacks.picker.man() end, desc = "Man Pages" },
|
||||||
|
{ "<leader>sm", function() Snacks.picker.marks() end, desc = "Marks" },
|
||||||
|
{ "<leader>sR", function() Snacks.picker.resume() end, desc = "Resume" },
|
||||||
|
{ "<leader>sq", function() Snacks.picker.qflist() end, desc = "Quickfix List" },
|
||||||
|
{ "<leader>su", function() Snacks.picker.undo() end, desc = "Undotree" },
|
||||||
|
-- ui
|
||||||
|
{ "<leader>uC", function() Snacks.picker.colorschemes() end, desc = "Colorschemes" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"folke/snacks.nvim",
|
||||||
|
opts = function(_, opts)
|
||||||
|
if LazyVim.has("trouble.nvim") then
|
||||||
|
return vim.tbl_deep_extend("force", opts or {}, {
|
||||||
|
picker = {
|
||||||
|
actions = require("trouble.sources.snacks").actions,
|
||||||
|
win = {
|
||||||
|
input = {
|
||||||
|
keys = {
|
||||||
|
["<c-t>"] = {
|
||||||
|
"trouble_open",
|
||||||
|
mode = { "n", "i" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"neovim/nvim-lspconfig",
|
||||||
|
opts = function()
|
||||||
|
if LazyVim.pick.want() ~= "snacks" then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
local Keys = require("lazyvim.plugins.lsp.keymaps").get()
|
||||||
|
-- stylua: ignore
|
||||||
|
vim.list_extend(Keys, {
|
||||||
|
{ "gd", function() Snacks.picker.lsp_definitions() end, desc = "Goto Definition", has = "definition" },
|
||||||
|
{ "gr", function() Snacks.picker.lsp_references() end, nowait = true, desc = "References" },
|
||||||
|
{ "gI", function() Snacks.picker.lsp_implementations() end, desc = "Goto Implementation" },
|
||||||
|
{ "gy", function() Snacks.picker.lsp_type_definitions() end, desc = "Goto T[y]pe Definition" },
|
||||||
|
{ "<leader>ss", function() Snacks.picker.lsp_symbols({ filter = LazyVim.config.kind_filter }) end, desc = "LSP Symbols", has = "documentSymbol" },
|
||||||
|
{ "<leader>sS", function() Snacks.picker.lsp_workspace_symbols({ filter = LazyVim.config.kind_filter }) end, desc = "LSP Workspace Symbols", has = "workspace/symbols" },
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"folke/todo-comments.nvim",
|
||||||
|
optional = true,
|
||||||
|
-- stylua: ignore
|
||||||
|
keys = {
|
||||||
|
{ "<leader>st", function() Snacks.picker.todo_comments() end, desc = "Todo" },
|
||||||
|
{ "<leader>sT", function () Snacks.picker.todo_comments({ keywords = { "TODO", "FIX", "FIXME" } }) end, desc = "Todo/Fix/Fixme" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
|
@ -103,8 +103,11 @@ return {
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"nvim-cmp",
|
"hrsh7th/nvim-cmp",
|
||||||
|
optional = true,
|
||||||
opts = function(_, opts)
|
opts = function(_, opts)
|
||||||
|
opts.sorting = opts.sorting or {}
|
||||||
|
opts.sorting.comparators = opts.sorting.comparators or {}
|
||||||
table.insert(opts.sorting.comparators, 1, require("clangd_extensions.cmp_scores"))
|
table.insert(opts.sorting.comparators, 1, require("clangd_extensions.cmp_scores"))
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
|
@ -9,7 +9,8 @@ return {
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"nvim-cmp",
|
"hrsh7th/nvim-cmp",
|
||||||
|
optional = true,
|
||||||
dependencies = {
|
dependencies = {
|
||||||
{ "petertriho/cmp-git", opts = {} },
|
{ "petertriho/cmp-git", opts = {} },
|
||||||
},
|
},
|
||||||
|
|
|
@ -85,8 +85,12 @@ return {
|
||||||
dependencies = { "folke/which-key.nvim" },
|
dependencies = { "folke/which-key.nvim" },
|
||||||
ft = java_filetypes,
|
ft = java_filetypes,
|
||||||
opts = function()
|
opts = function()
|
||||||
local mason_registry = require("mason-registry")
|
local cmd = { vim.fn.exepath("jdtls") }
|
||||||
local lombok_jar = mason_registry.get_package("jdtls"):get_install_path() .. "/lombok.jar"
|
if LazyVim.has("mason.nvim") then
|
||||||
|
local mason_registry = require("mason-registry")
|
||||||
|
local lombok_jar = mason_registry.get_package("jdtls"):get_install_path() .. "/lombok.jar"
|
||||||
|
table.insert(cmd, string.format("--jvm-arg=-javaagent:%s", lombok_jar))
|
||||||
|
end
|
||||||
return {
|
return {
|
||||||
-- How to find the root dir for a given filename. The default comes from
|
-- How to find the root dir for a given filename. The default comes from
|
||||||
-- lspconfig which provides a function specifically for java projects.
|
-- lspconfig which provides a function specifically for java projects.
|
||||||
|
@ -107,10 +111,7 @@ return {
|
||||||
|
|
||||||
-- How to run jdtls. This can be overridden to a full java command-line
|
-- How to run jdtls. This can be overridden to a full java command-line
|
||||||
-- if the Python wrapper script doesn't suffice.
|
-- if the Python wrapper script doesn't suffice.
|
||||||
cmd = {
|
cmd = cmd,
|
||||||
vim.fn.exepath("jdtls"),
|
|
||||||
string.format("--jvm-arg=-javaagent:%s", lombok_jar),
|
|
||||||
},
|
|
||||||
full_cmd = function(opts)
|
full_cmd = function(opts)
|
||||||
local fname = vim.api.nvim_buf_get_name(0)
|
local fname = vim.api.nvim_buf_get_name(0)
|
||||||
local root_dir = opts.root_dir(fname)
|
local root_dir = opts.root_dir(fname)
|
||||||
|
@ -129,6 +130,7 @@ return {
|
||||||
|
|
||||||
-- These depend on nvim-dap, but can additionally be disabled by setting false here.
|
-- These depend on nvim-dap, but can additionally be disabled by setting false here.
|
||||||
dap = { hotcodereplace = "auto", config_overrides = {} },
|
dap = { hotcodereplace = "auto", config_overrides = {} },
|
||||||
|
-- Can set this to false to disable main class scan, which is a performance killer for large project
|
||||||
dap_main = {},
|
dap_main = {},
|
||||||
test = true,
|
test = true,
|
||||||
settings = {
|
settings = {
|
||||||
|
@ -145,29 +147,30 @@ return {
|
||||||
config = function(_, opts)
|
config = function(_, opts)
|
||||||
-- Find the extra bundles that should be passed on the jdtls command-line
|
-- Find the extra bundles that should be passed on the jdtls command-line
|
||||||
-- if nvim-dap is enabled with java debug/test.
|
-- if nvim-dap is enabled with java debug/test.
|
||||||
local mason_registry = require("mason-registry")
|
|
||||||
local bundles = {} ---@type string[]
|
local bundles = {} ---@type string[]
|
||||||
if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
|
if LazyVim.has("mason.nvim") then
|
||||||
local java_dbg_pkg = mason_registry.get_package("java-debug-adapter")
|
local mason_registry = require("mason-registry")
|
||||||
local java_dbg_path = java_dbg_pkg:get_install_path()
|
if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
|
||||||
local jar_patterns = {
|
local java_dbg_pkg = mason_registry.get_package("java-debug-adapter")
|
||||||
java_dbg_path .. "/extension/server/com.microsoft.java.debug.plugin-*.jar",
|
local java_dbg_path = java_dbg_pkg:get_install_path()
|
||||||
}
|
local jar_patterns = {
|
||||||
-- java-test also depends on java-debug-adapter.
|
java_dbg_path .. "/extension/server/com.microsoft.java.debug.plugin-*.jar",
|
||||||
if opts.test and mason_registry.is_installed("java-test") then
|
}
|
||||||
local java_test_pkg = mason_registry.get_package("java-test")
|
-- java-test also depends on java-debug-adapter.
|
||||||
local java_test_path = java_test_pkg:get_install_path()
|
if opts.test and mason_registry.is_installed("java-test") then
|
||||||
vim.list_extend(jar_patterns, {
|
local java_test_pkg = mason_registry.get_package("java-test")
|
||||||
java_test_path .. "/extension/server/*.jar",
|
local java_test_path = java_test_pkg:get_install_path()
|
||||||
})
|
vim.list_extend(jar_patterns, {
|
||||||
end
|
java_test_path .. "/extension/server/*.jar",
|
||||||
for _, jar_pattern in ipairs(jar_patterns) do
|
})
|
||||||
for _, bundle in ipairs(vim.split(vim.fn.glob(jar_pattern), "\n")) do
|
end
|
||||||
table.insert(bundles, bundle)
|
for _, jar_pattern in ipairs(jar_patterns) do
|
||||||
|
for _, bundle in ipairs(vim.split(vim.fn.glob(jar_pattern), "\n")) do
|
||||||
|
table.insert(bundles, bundle)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local function attach_jdtls()
|
local function attach_jdtls()
|
||||||
local fname = vim.api.nvim_buf_get_name(0)
|
local fname = vim.api.nvim_buf_get_name(0)
|
||||||
|
|
||||||
|
@ -239,40 +242,45 @@ return {
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
|
if LazyVim.has("mason.nvim") then
|
||||||
-- custom init for Java debugger
|
local mason_registry = require("mason-registry")
|
||||||
require("jdtls").setup_dap(opts.dap)
|
if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
|
||||||
require("jdtls.dap").setup_dap_main_class_configs(opts.dap_main)
|
-- custom init for Java debugger
|
||||||
|
require("jdtls").setup_dap(opts.dap)
|
||||||
|
if opts.dap_main then
|
||||||
|
require("jdtls.dap").setup_dap_main_class_configs(opts.dap_main)
|
||||||
|
end
|
||||||
|
|
||||||
-- Java Test require Java debugger to work
|
-- Java Test require Java debugger to work
|
||||||
if opts.test and mason_registry.is_installed("java-test") then
|
if opts.test and mason_registry.is_installed("java-test") then
|
||||||
-- custom keymaps for Java test runner (not yet compatible with neotest)
|
-- custom keymaps for Java test runner (not yet compatible with neotest)
|
||||||
wk.add({
|
wk.add({
|
||||||
{
|
|
||||||
mode = "n",
|
|
||||||
buffer = args.buf,
|
|
||||||
{ "<leader>t", group = "test" },
|
|
||||||
{
|
{
|
||||||
"<leader>tt",
|
mode = "n",
|
||||||
function()
|
buffer = args.buf,
|
||||||
require("jdtls.dap").test_class({
|
{ "<leader>t", group = "test" },
|
||||||
config_overrides = type(opts.test) ~= "boolean" and opts.test.config_overrides or nil,
|
{
|
||||||
})
|
"<leader>tt",
|
||||||
end,
|
function()
|
||||||
desc = "Run All Test",
|
require("jdtls.dap").test_class({
|
||||||
|
config_overrides = type(opts.test) ~= "boolean" and opts.test.config_overrides or nil,
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
desc = "Run All Test",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>tr",
|
||||||
|
function()
|
||||||
|
require("jdtls.dap").test_nearest_method({
|
||||||
|
config_overrides = type(opts.test) ~= "boolean" and opts.test.config_overrides or nil,
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
desc = "Run Nearest Test",
|
||||||
|
},
|
||||||
|
{ "<leader>tT", require("jdtls.dap").pick_test, desc = "Run Test" },
|
||||||
},
|
},
|
||||||
{
|
})
|
||||||
"<leader>tr",
|
end
|
||||||
function()
|
|
||||||
require("jdtls.dap").test_nearest_method({
|
|
||||||
config_overrides = type(opts.test) ~= "boolean" and opts.test.config_overrides or nil,
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
desc = "Run Nearest Test",
|
|
||||||
},
|
|
||||||
{ "<leader>tT", require("jdtls.dap").pick_test, desc = "Run Test" },
|
|
||||||
},
|
|
||||||
})
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -104,6 +104,9 @@ return {
|
||||||
sign = false,
|
sign = false,
|
||||||
icons = {},
|
icons = {},
|
||||||
},
|
},
|
||||||
|
checkbox = {
|
||||||
|
enabled = false,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
ft = { "markdown", "norg", "rmd", "org" },
|
ft = { "markdown", "norg", "rmd", "org" },
|
||||||
config = function(_, opts)
|
config = function(_, opts)
|
||||||
|
|
|
@ -1,3 +1,13 @@
|
||||||
|
if lazyvim_docs then
|
||||||
|
-- LSP Server to use for Rust.
|
||||||
|
-- Set to "bacon-ls" to use bacon-ls instead of rust-analyzer.
|
||||||
|
-- only for diagnostics. The rest of LSP support will still be
|
||||||
|
-- provided by rust-analyzer.
|
||||||
|
vim.g.lazyvim_rust_diagnostics = "rust-analyzer"
|
||||||
|
end
|
||||||
|
|
||||||
|
local diagnostics = vim.g.lazyvim_rust_diagnostics or "rust-analyzer"
|
||||||
|
|
||||||
return {
|
return {
|
||||||
recommended = function()
|
recommended = function()
|
||||||
return LazyVim.extras.wants({
|
return LazyVim.extras.wants({
|
||||||
|
@ -35,7 +45,13 @@ return {
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"williamboman/mason.nvim",
|
||||||
optional = true,
|
optional = true,
|
||||||
opts = { ensure_installed = { "codelldb" } },
|
opts = function(_, opts)
|
||||||
|
opts.ensure_installed = opts.ensure_installed or {}
|
||||||
|
vim.list_extend(opts.ensure_installed, { "codelldb" })
|
||||||
|
if diagnostics == "bacon-ls" then
|
||||||
|
vim.list_extend(opts.ensure_installed, { "bacon" })
|
||||||
|
end
|
||||||
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@ -62,8 +78,12 @@ return {
|
||||||
enable = true,
|
enable = true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
-- Add clippy lints for Rust.
|
-- Add clippy lints for Rust if using rust-analyzer
|
||||||
checkOnSave = true,
|
checkOnSave = diagnostics == "rust-analyzer",
|
||||||
|
-- Enable diagnostics if using rust-analyzer
|
||||||
|
diagnostics = {
|
||||||
|
enable = diagnostics == "rust-analyzer",
|
||||||
|
},
|
||||||
procMacro = {
|
procMacro = {
|
||||||
enable = true,
|
enable = true,
|
||||||
ignored = {
|
ignored = {
|
||||||
|
@ -72,11 +92,36 @@ return {
|
||||||
["async-recursion"] = { "async_recursion" },
|
["async-recursion"] = { "async_recursion" },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
files = {
|
||||||
|
excludeDirs = {
|
||||||
|
".direnv",
|
||||||
|
".git",
|
||||||
|
".github",
|
||||||
|
".gitlab",
|
||||||
|
"bin",
|
||||||
|
"node_modules",
|
||||||
|
"target",
|
||||||
|
"venv",
|
||||||
|
".venv",
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
config = function(_, opts)
|
config = function(_, opts)
|
||||||
|
if LazyVim.has("mason.nvim") then
|
||||||
|
local package_path = require("mason-registry").get_package("codelldb"):get_install_path()
|
||||||
|
local codelldb = package_path .. "/extension/adapter/codelldb"
|
||||||
|
local library_path = package_path .. "/extension/lldb/lib/liblldb.dylib"
|
||||||
|
local uname = io.popen("uname"):read("*l")
|
||||||
|
if uname == "Linux" then
|
||||||
|
library_path = package_path .. "/extension/lldb/lib/liblldb.so"
|
||||||
|
end
|
||||||
|
opts.dap = {
|
||||||
|
adapter = require("rustaceanvim.config").get_codelldb_adapter(codelldb, library_path),
|
||||||
|
}
|
||||||
|
end
|
||||||
vim.g.rustaceanvim = vim.tbl_deep_extend("keep", vim.g.rustaceanvim or {}, opts or {})
|
vim.g.rustaceanvim = vim.tbl_deep_extend("keep", vim.g.rustaceanvim or {}, opts or {})
|
||||||
if vim.fn.executable("rust-analyzer") == 0 then
|
if vim.fn.executable("rust-analyzer") == 0 then
|
||||||
LazyVim.error(
|
LazyVim.error(
|
||||||
|
@ -92,6 +137,9 @@ return {
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
opts = {
|
opts = {
|
||||||
servers = {
|
servers = {
|
||||||
|
bacon_ls = {
|
||||||
|
enabled = diagnostics == "bacon-ls",
|
||||||
|
},
|
||||||
rust_analyzer = { enabled = false },
|
rust_analyzer = { enabled = false },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -48,7 +48,7 @@ return {
|
||||||
vim.api.nvim_create_autocmd("FileType", {
|
vim.api.nvim_create_autocmd("FileType", {
|
||||||
pattern = sql_ft,
|
pattern = sql_ft,
|
||||||
callback = function()
|
callback = function()
|
||||||
if LazyVim.has("nvim-cmp") then
|
if LazyVim.cmp_engine() == "nvim-cmp" then
|
||||||
local cmp = require("cmp")
|
local cmp = require("cmp")
|
||||||
|
|
||||||
-- global sources
|
-- global sources
|
||||||
|
@ -130,9 +130,7 @@ return {
|
||||||
optional = true,
|
optional = true,
|
||||||
opts = {
|
opts = {
|
||||||
sources = {
|
sources = {
|
||||||
completion = {
|
default = { "dadbod" },
|
||||||
enabled_providers = { "dadbod" },
|
|
||||||
},
|
|
||||||
providers = {
|
providers = {
|
||||||
dadbod = { name = "Dadbod", module = "vim_dadbod_completion.blink" },
|
dadbod = { name = "Dadbod", module = "vim_dadbod_completion.blink" },
|
||||||
},
|
},
|
||||||
|
|
|
@ -30,7 +30,7 @@ return {
|
||||||
vim.g.vimtex_quickfix_method = vim.fn.executable("pplatex") == 1 and "pplatex" or "latexlog"
|
vim.g.vimtex_quickfix_method = vim.fn.executable("pplatex") == 1 and "pplatex" or "latexlog"
|
||||||
end,
|
end,
|
||||||
keys = {
|
keys = {
|
||||||
{ "<localLeader>l", "", desc = "+vimtex" },
|
{ "<localLeader>l", "", desc = "+vimtex", ft = "tex" },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
51
lua/lazyvim/plugins/extras/ui/indent-blankline.lua
Normal file
51
lua/lazyvim/plugins/extras/ui/indent-blankline.lua
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
return {
|
||||||
|
-- disable snacks indent when indent-blankline is enabled
|
||||||
|
{
|
||||||
|
"snacks.nvim",
|
||||||
|
opts = {
|
||||||
|
indent = { enabled = false },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"lukas-reineke/indent-blankline.nvim",
|
||||||
|
event = "LazyFile",
|
||||||
|
opts = function()
|
||||||
|
Snacks.toggle({
|
||||||
|
name = "Indention Guides",
|
||||||
|
get = function()
|
||||||
|
return require("ibl.config").get_config(0).enabled
|
||||||
|
end,
|
||||||
|
set = function(state)
|
||||||
|
require("ibl").setup_buffer(0, { enabled = state })
|
||||||
|
end,
|
||||||
|
}):map("<leader>ug")
|
||||||
|
|
||||||
|
return {
|
||||||
|
indent = {
|
||||||
|
char = "│",
|
||||||
|
tab_char = "│",
|
||||||
|
},
|
||||||
|
scope = { show_start = false, show_end = false },
|
||||||
|
exclude = {
|
||||||
|
filetypes = {
|
||||||
|
"Trouble",
|
||||||
|
"alpha",
|
||||||
|
"dashboard",
|
||||||
|
"help",
|
||||||
|
"lazy",
|
||||||
|
"mason",
|
||||||
|
"neo-tree",
|
||||||
|
"notify",
|
||||||
|
"snacks_dashboard",
|
||||||
|
"snacks_notif",
|
||||||
|
"snacks_terminal",
|
||||||
|
"snacks_win",
|
||||||
|
"toggleterm",
|
||||||
|
"trouble",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
end,
|
||||||
|
main = "ibl",
|
||||||
|
},
|
||||||
|
}
|
|
@ -1,54 +1,64 @@
|
||||||
-- animations
|
-- animations
|
||||||
return {
|
return {
|
||||||
"echasnovski/mini.animate",
|
-- disable snacks scroll when animate is enabled
|
||||||
recommended = true,
|
{
|
||||||
event = "VeryLazy",
|
"snacks.nvim",
|
||||||
cond = vim.g.neovide == nil,
|
opts = {
|
||||||
opts = function(_, opts)
|
scroll = { enabled = false },
|
||||||
-- don't use animate when scrolling with the mouse
|
},
|
||||||
local mouse_scrolled = false
|
},
|
||||||
for _, scroll in ipairs({ "Up", "Down" }) do
|
|
||||||
local key = "<ScrollWheel" .. scroll .. ">"
|
|
||||||
vim.keymap.set({ "", "i" }, key, function()
|
|
||||||
mouse_scrolled = true
|
|
||||||
return key
|
|
||||||
end, { expr = true })
|
|
||||||
end
|
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd("FileType", {
|
-- setup animate
|
||||||
pattern = "grug-far",
|
{
|
||||||
callback = function()
|
"echasnovski/mini.animate",
|
||||||
vim.b.minianimate_disable = true
|
event = "VeryLazy",
|
||||||
end,
|
cond = vim.g.neovide == nil,
|
||||||
})
|
opts = function(_, opts)
|
||||||
|
-- don't use animate when scrolling with the mouse
|
||||||
|
local mouse_scrolled = false
|
||||||
|
for _, scroll in ipairs({ "Up", "Down" }) do
|
||||||
|
local key = "<ScrollWheel" .. scroll .. ">"
|
||||||
|
vim.keymap.set({ "", "i" }, key, function()
|
||||||
|
mouse_scrolled = true
|
||||||
|
return key
|
||||||
|
end, { expr = true })
|
||||||
|
end
|
||||||
|
|
||||||
Snacks.toggle({
|
vim.api.nvim_create_autocmd("FileType", {
|
||||||
name = "Mini Animate",
|
pattern = "grug-far",
|
||||||
get = function()
|
callback = function()
|
||||||
return not vim.g.minianimate_disable
|
vim.b.minianimate_disable = true
|
||||||
end,
|
end,
|
||||||
set = function(state)
|
})
|
||||||
vim.g.minianimate_disable = not state
|
|
||||||
end,
|
|
||||||
}):map("<leader>ua")
|
|
||||||
|
|
||||||
local animate = require("mini.animate")
|
Snacks.toggle({
|
||||||
return vim.tbl_deep_extend("force", opts, {
|
name = "Mini Animate",
|
||||||
resize = {
|
get = function()
|
||||||
timing = animate.gen_timing.linear({ duration = 50, unit = "total" }),
|
return not vim.g.minianimate_disable
|
||||||
},
|
end,
|
||||||
scroll = {
|
set = function(state)
|
||||||
timing = animate.gen_timing.linear({ duration = 150, unit = "total" }),
|
vim.g.minianimate_disable = not state
|
||||||
subscroll = animate.gen_subscroll.equal({
|
end,
|
||||||
predicate = function(total_scroll)
|
}):map("<leader>ua")
|
||||||
if mouse_scrolled then
|
|
||||||
mouse_scrolled = false
|
local animate = require("mini.animate")
|
||||||
return false
|
return vim.tbl_deep_extend("force", opts, {
|
||||||
end
|
resize = {
|
||||||
return total_scroll > 1
|
timing = animate.gen_timing.linear({ duration = 50, unit = "total" }),
|
||||||
end,
|
},
|
||||||
}),
|
scroll = {
|
||||||
},
|
timing = animate.gen_timing.linear({ duration = 150, unit = "total" }),
|
||||||
})
|
subscroll = animate.gen_subscroll.equal({
|
||||||
end,
|
predicate = function(total_scroll)
|
||||||
|
if mouse_scrolled then
|
||||||
|
mouse_scrolled = false
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
return total_scroll > 1
|
||||||
|
end,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,6 +23,7 @@ return {
|
||||||
"mason",
|
"mason",
|
||||||
"neo-tree",
|
"neo-tree",
|
||||||
"notify",
|
"notify",
|
||||||
|
"snacks_dashboard",
|
||||||
"snacks_notif",
|
"snacks_notif",
|
||||||
"snacks_terminal",
|
"snacks_terminal",
|
||||||
"snacks_win",
|
"snacks_win",
|
||||||
|
@ -33,13 +34,33 @@ return {
|
||||||
vim.b.miniindentscope_disable = true
|
vim.b.miniindentscope_disable = true
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd("User", {
|
||||||
|
pattern = "SnacksDashboardOpened",
|
||||||
|
callback = function(data)
|
||||||
|
vim.b[data.buf].miniindentscope_disable = true
|
||||||
|
end,
|
||||||
|
})
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
-- disable inent-blankline scope when mini-indentscope is enabled
|
||||||
{
|
{
|
||||||
"lukas-reineke/indent-blankline.nvim",
|
"lukas-reineke/indent-blankline.nvim",
|
||||||
|
optional = true,
|
||||||
event = "LazyFile",
|
event = "LazyFile",
|
||||||
opts = {
|
opts = {
|
||||||
scope = { enabled = false },
|
scope = { enabled = false },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
-- disable snacks scroll when mini-indentscope is enabled
|
||||||
|
{
|
||||||
|
"snacks.nvim",
|
||||||
|
opts = {
|
||||||
|
indent = {
|
||||||
|
scope = { enabled = false },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
-- Show context of the current function
|
-- Show context of the current function
|
||||||
return {
|
return {
|
||||||
"nvim-treesitter/nvim-treesitter-context",
|
"nvim-treesitter/nvim-treesitter-context",
|
||||||
event = "VeryLazy",
|
event = "LazyFile",
|
||||||
opts = function()
|
opts = function()
|
||||||
local tsc = require("treesitter-context")
|
local tsc = require("treesitter-context")
|
||||||
Snacks.toggle({
|
Snacks.toggle({
|
||||||
|
|
|
@ -19,6 +19,38 @@ local pick_chezmoi = function()
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
fzf_lua.fzf_exec(results, opts)
|
fzf_lua.fzf_exec(results, opts)
|
||||||
|
elseif LazyVim.pick.picker.name == "snacks" then
|
||||||
|
local results = require("chezmoi.commands").list({
|
||||||
|
args = {
|
||||||
|
"--path-style",
|
||||||
|
"absolute",
|
||||||
|
"--include",
|
||||||
|
"files",
|
||||||
|
"--exclude",
|
||||||
|
"externals",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
local items = {}
|
||||||
|
|
||||||
|
for _, czFile in ipairs(results) do
|
||||||
|
table.insert(items, {
|
||||||
|
text = czFile,
|
||||||
|
file = czFile,
|
||||||
|
})
|
||||||
|
end
|
||||||
|
|
||||||
|
---@type snacks.picker.Config
|
||||||
|
local opts = {
|
||||||
|
items = items,
|
||||||
|
confirm = function(picker, item)
|
||||||
|
picker:close()
|
||||||
|
require("chezmoi.commands").edit({
|
||||||
|
targets = { item.text },
|
||||||
|
args = { "--watch" },
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
}
|
||||||
|
Snacks.picker.pick(opts)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -39,11 +39,12 @@ return {
|
||||||
pattern = {
|
pattern = {
|
||||||
[".*/waybar/config"] = "jsonc",
|
[".*/waybar/config"] = "jsonc",
|
||||||
[".*/mako/config"] = "dosini",
|
[".*/mako/config"] = "dosini",
|
||||||
[".*/kitty/.+%.conf"] = "bash",
|
[".*/kitty/.+%.conf"] = "kitty",
|
||||||
[".*/hypr/.+%.conf"] = "hyprlang",
|
[".*/hypr/.+%.conf"] = "hyprlang",
|
||||||
["%.env%.[%w_.-]+"] = "sh",
|
["%.env%.[%w_.-]+"] = "sh",
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
vim.treesitter.language.register("bash", "kitty")
|
||||||
|
|
||||||
add("git_config")
|
add("git_config")
|
||||||
|
|
||||||
|
|
|
@ -28,14 +28,24 @@ Config.options.change_detection.enabled = false
|
||||||
Config.options.defaults.cond = function(plugin)
|
Config.options.defaults.cond = function(plugin)
|
||||||
return vim.tbl_contains(enabled, plugin.name) or plugin.vscode
|
return vim.tbl_contains(enabled, plugin.name) or plugin.vscode
|
||||||
end
|
end
|
||||||
|
vim.g.snacks_animate = false
|
||||||
|
|
||||||
-- Add some vscode specific keymaps
|
-- Add some vscode specific keymaps
|
||||||
vim.api.nvim_create_autocmd("User", {
|
vim.api.nvim_create_autocmd("User", {
|
||||||
pattern = "LazyVimKeymapsDefaults",
|
pattern = "LazyVimKeymapsDefaults",
|
||||||
callback = function()
|
callback = function()
|
||||||
|
-- VSCode-specific keymaps for search and navigation
|
||||||
vim.keymap.set("n", "<leader><space>", "<cmd>Find<cr>")
|
vim.keymap.set("n", "<leader><space>", "<cmd>Find<cr>")
|
||||||
vim.keymap.set("n", "<leader>/", [[<cmd>lua require('vscode').action('workbench.action.findInFiles')<cr>]])
|
vim.keymap.set("n", "<leader>/", [[<cmd>lua require('vscode').action('workbench.action.findInFiles')<cr>]])
|
||||||
vim.keymap.set("n", "<leader>ss", [[<cmd>lua require('vscode').action('workbench.action.gotoSymbol')<cr>]])
|
vim.keymap.set("n", "<leader>ss", [[<cmd>lua require('vscode').action('workbench.action.gotoSymbol')<cr>]])
|
||||||
|
|
||||||
|
-- Keep undo/redo lists in sync with VsCode
|
||||||
|
vim.keymap.set("n", "u", "<Cmd>call VSCodeNotify('undo')<CR>")
|
||||||
|
vim.keymap.set("n", "<C-r>", "<Cmd>call VSCodeNotify('redo')<CR>")
|
||||||
|
|
||||||
|
-- Navigate VSCode tabs like lazyvim buffers
|
||||||
|
vim.keymap.set("n", "<S-h>", "<Cmd>call VSCodeNotify('workbench.action.previousEditor')<CR>")
|
||||||
|
vim.keymap.set("n", "<S-l>", "<Cmd>call VSCodeNotify('workbench.action.nextEditor')<CR>")
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -44,6 +54,20 @@ function LazyVim.terminal()
|
||||||
end
|
end
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
{
|
||||||
|
"snacks.nvim",
|
||||||
|
opts = {
|
||||||
|
bigfile = { enabled = false },
|
||||||
|
dashboard = { enabled = false },
|
||||||
|
indent = { enabled = false },
|
||||||
|
input = { enabled = false },
|
||||||
|
notifier = { enabled = false },
|
||||||
|
picker = { enabled = false },
|
||||||
|
quickfile = { enabled = false },
|
||||||
|
scroll = { enabled = false },
|
||||||
|
statuscolumn = { enabled = false },
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"LazyVim/LazyVim",
|
"LazyVim/LazyVim",
|
||||||
config = function(_, opts)
|
config = function(_, opts)
|
||||||
|
|
|
@ -10,16 +10,6 @@ end
|
||||||
|
|
||||||
require("lazyvim.config").init()
|
require("lazyvim.config").init()
|
||||||
|
|
||||||
-- Terminal Mappings
|
|
||||||
local function term_nav(dir)
|
|
||||||
---@param self snacks.terminal
|
|
||||||
return function(self)
|
|
||||||
return self:is_floating() and "<c-" .. dir .. ">" or vim.schedule(function()
|
|
||||||
vim.cmd.wincmd(dir)
|
|
||||||
end)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
{ "folke/lazy.nvim", version = "*" },
|
{ "folke/lazy.nvim", version = "*" },
|
||||||
{ "LazyVim/LazyVim", priority = 10000, lazy = false, opts = {}, cond = true, version = "*" },
|
{ "LazyVim/LazyVim", priority = 10000, lazy = false, opts = {}, cond = true, version = "*" },
|
||||||
|
@ -27,36 +17,7 @@ return {
|
||||||
"folke/snacks.nvim",
|
"folke/snacks.nvim",
|
||||||
priority = 1000,
|
priority = 1000,
|
||||||
lazy = false,
|
lazy = false,
|
||||||
opts = function()
|
opts = {},
|
||||||
---@type snacks.Config
|
|
||||||
return {
|
|
||||||
bigfile = { enabled = true },
|
|
||||||
notifier = { enabled = true },
|
|
||||||
quickfile = { enabled = true },
|
|
||||||
statuscolumn = { enabled = false }, -- we set this in options.lua
|
|
||||||
terminal = {
|
|
||||||
win = {
|
|
||||||
keys = {
|
|
||||||
nav_h = { "<C-h>", term_nav("h"), desc = "Go to Left Window", expr = true, mode = "t" },
|
|
||||||
nav_j = { "<C-j>", term_nav("j"), desc = "Go to Lower Window", expr = true, mode = "t" },
|
|
||||||
nav_k = { "<C-k>", term_nav("k"), desc = "Go to Upper Window", expr = true, mode = "t" },
|
|
||||||
nav_l = { "<C-l>", term_nav("l"), desc = "Go to Right Window", expr = true, mode = "t" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
toggle = { map = LazyVim.safe_keymap_set },
|
|
||||||
words = { enabled = true },
|
|
||||||
}
|
|
||||||
end,
|
|
||||||
keys = {
|
|
||||||
{
|
|
||||||
"<leader>un",
|
|
||||||
function()
|
|
||||||
Snacks.notifier.hide()
|
|
||||||
end,
|
|
||||||
desc = "Dismiss All Notifications",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
config = function(_, opts)
|
config = function(_, opts)
|
||||||
local notify = vim.notify
|
local notify = vim.notify
|
||||||
require("snacks").setup(opts)
|
require("snacks").setup(opts)
|
||||||
|
|
|
@ -46,10 +46,6 @@ return {
|
||||||
codelens = {
|
codelens = {
|
||||||
enabled = false,
|
enabled = false,
|
||||||
},
|
},
|
||||||
-- Enable lsp cursor word highlighting
|
|
||||||
document_highlight = {
|
|
||||||
enabled = true,
|
|
||||||
},
|
|
||||||
-- add any global capabilities here
|
-- add any global capabilities here
|
||||||
capabilities = {
|
capabilities = {
|
||||||
workspace = {
|
workspace = {
|
||||||
|
|
|
@ -105,29 +105,30 @@ return {
|
||||||
{ LazyVim.lualine.pretty_path() },
|
{ LazyVim.lualine.pretty_path() },
|
||||||
},
|
},
|
||||||
lualine_x = {
|
lualine_x = {
|
||||||
|
Snacks.profiler.status(),
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
{
|
{
|
||||||
function() return require("noice").api.status.command.get() end,
|
function() return require("noice").api.status.command.get() end,
|
||||||
cond = function() return package.loaded["noice"] and require("noice").api.status.command.has() end,
|
cond = function() return package.loaded["noice"] and require("noice").api.status.command.has() end,
|
||||||
color = function() return LazyVim.ui.fg("Statement") end,
|
color = function() return { fg = Snacks.util.color("Statement") } end,
|
||||||
},
|
},
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
{
|
{
|
||||||
function() return require("noice").api.status.mode.get() end,
|
function() return require("noice").api.status.mode.get() end,
|
||||||
cond = function() return package.loaded["noice"] and require("noice").api.status.mode.has() end,
|
cond = function() return package.loaded["noice"] and require("noice").api.status.mode.has() end,
|
||||||
color = function() return LazyVim.ui.fg("Constant") end,
|
color = function() return { fg = Snacks.util.color("Constant") } end,
|
||||||
},
|
},
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
{
|
{
|
||||||
function() return " " .. require("dap").status() end,
|
function() return " " .. require("dap").status() end,
|
||||||
cond = function() return package.loaded["dap"] and require("dap").status() ~= "" end,
|
cond = function() return package.loaded["dap"] and require("dap").status() ~= "" end,
|
||||||
color = function() return LazyVim.ui.fg("Debug") end,
|
color = function() return { fg = Snacks.util.color("Debug") } end,
|
||||||
},
|
},
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
{
|
{
|
||||||
require("lazy.status").updates,
|
require("lazy.status").updates,
|
||||||
cond = require("lazy.status").has_updates,
|
cond = require("lazy.status").has_updates,
|
||||||
color = function() return LazyVim.ui.fg("Special") end,
|
color = function() return { fg = Snacks.util.color("Special") } end,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"diff",
|
"diff",
|
||||||
|
@ -158,7 +159,7 @@ return {
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
extensions = { "neo-tree", "lazy" },
|
extensions = { "neo-tree", "lazy", "fzf" },
|
||||||
}
|
}
|
||||||
|
|
||||||
-- do not add trouble symbols if aerial is enabled
|
-- do not add trouble symbols if aerial is enabled
|
||||||
|
@ -185,50 +186,6 @@ return {
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
-- indent guides for Neovim
|
|
||||||
{
|
|
||||||
"lukas-reineke/indent-blankline.nvim",
|
|
||||||
event = "LazyFile",
|
|
||||||
opts = function()
|
|
||||||
Snacks.toggle({
|
|
||||||
name = "Indention Guides",
|
|
||||||
get = function()
|
|
||||||
return require("ibl.config").get_config(0).enabled
|
|
||||||
end,
|
|
||||||
set = function(state)
|
|
||||||
require("ibl").setup_buffer(0, { enabled = state })
|
|
||||||
end,
|
|
||||||
}):map("<leader>ug")
|
|
||||||
|
|
||||||
return {
|
|
||||||
indent = {
|
|
||||||
char = "│",
|
|
||||||
tab_char = "│",
|
|
||||||
},
|
|
||||||
scope = { show_start = false, show_end = false },
|
|
||||||
exclude = {
|
|
||||||
filetypes = {
|
|
||||||
"Trouble",
|
|
||||||
"alpha",
|
|
||||||
"dashboard",
|
|
||||||
"help",
|
|
||||||
"lazy",
|
|
||||||
"mason",
|
|
||||||
"neo-tree",
|
|
||||||
"notify",
|
|
||||||
"snacks_dashboard",
|
|
||||||
"snacks_notif",
|
|
||||||
"snacks_terminal",
|
|
||||||
"snacks_win",
|
|
||||||
"toggleterm",
|
|
||||||
"trouble",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
end,
|
|
||||||
main = "ibl",
|
|
||||||
},
|
|
||||||
|
|
||||||
-- Highly experimental plugin that completely replaces the UI for messages, cmdline and the popupmenu.
|
-- Highly experimental plugin that completely replaces the UI for messages, cmdline and the popupmenu.
|
||||||
{
|
{
|
||||||
"folke/noice.nvim",
|
"folke/noice.nvim",
|
||||||
|
@ -308,10 +265,32 @@ return {
|
||||||
{ "MunifTanjim/nui.nvim", lazy = true },
|
{ "MunifTanjim/nui.nvim", lazy = true },
|
||||||
|
|
||||||
{
|
{
|
||||||
"folke/snacks.nvim",
|
"snacks.nvim",
|
||||||
|
opts = {
|
||||||
|
indent = { enabled = true },
|
||||||
|
input = { enabled = true },
|
||||||
|
notifier = { enabled = true },
|
||||||
|
scope = { enabled = true },
|
||||||
|
scroll = { enabled = true },
|
||||||
|
statuscolumn = { enabled = false }, -- we set this in options.lua
|
||||||
|
toggle = { map = LazyVim.safe_keymap_set },
|
||||||
|
words = { enabled = true },
|
||||||
|
},
|
||||||
|
-- stylua: ignore
|
||||||
|
keys = {
|
||||||
|
{ "<leader>n", function() Snacks.notifier.show_history() end, desc = "Notification History" },
|
||||||
|
{ "<leader>un", function() Snacks.notifier.hide() end, desc = "Dismiss All Notifications" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"snacks.nvim",
|
||||||
opts = {
|
opts = {
|
||||||
dashboard = {
|
dashboard = {
|
||||||
preset = {
|
preset = {
|
||||||
|
pick = function(cmd, opts)
|
||||||
|
return LazyVim.pick(cmd, opts)()
|
||||||
|
end,
|
||||||
header = [[
|
header = [[
|
||||||
██╗ █████╗ ███████╗██╗ ██╗██╗ ██╗██╗███╗ ███╗ Z
|
██╗ █████╗ ███████╗██╗ ██╗██╗ ██╗██╗███╗ ███╗ Z
|
||||||
██║ ██╔══██╗╚══███╔╝╚██╗ ██╔╝██║ ██║██║████╗ ████║ Z
|
██║ ██╔══██╗╚══███╔╝╚██╗ ██╔╝██║ ██║██║████╗ ████║ Z
|
||||||
|
|
|
@ -1,5 +1,40 @@
|
||||||
|
-- Terminal Mappings
|
||||||
|
local function term_nav(dir)
|
||||||
|
---@param self snacks.terminal
|
||||||
|
return function(self)
|
||||||
|
return self:is_floating() and "<c-" .. dir .. ">" or vim.schedule(function()
|
||||||
|
vim.cmd.wincmd(dir)
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|
||||||
|
-- Snacks utils
|
||||||
|
{
|
||||||
|
"snacks.nvim",
|
||||||
|
opts = {
|
||||||
|
bigfile = { enabled = true },
|
||||||
|
quickfile = { enabled = true },
|
||||||
|
terminal = {
|
||||||
|
win = {
|
||||||
|
keys = {
|
||||||
|
nav_h = { "<C-h>", term_nav("h"), desc = "Go to Left Window", expr = true, mode = "t" },
|
||||||
|
nav_j = { "<C-j>", term_nav("j"), desc = "Go to Lower Window", expr = true, mode = "t" },
|
||||||
|
nav_k = { "<C-k>", term_nav("k"), desc = "Go to Upper Window", expr = true, mode = "t" },
|
||||||
|
nav_l = { "<C-l>", term_nav("l"), desc = "Go to Right Window", expr = true, mode = "t" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
-- stylua: ignore
|
||||||
|
keys = {
|
||||||
|
{ "<leader>.", function() Snacks.scratch() end, desc = "Toggle Scratch Buffer" },
|
||||||
|
{ "<leader>S", function() Snacks.scratch.select() end, desc = "Select Scratch Buffer" },
|
||||||
|
{ "<leader>dps", function() Snacks.profiler.scratch() end, desc = "Profiler Scratch Buffer" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
-- Session management. This saves your session in the background,
|
-- Session management. This saves your session in the background,
|
||||||
-- keeping track of open buffers, window arrangement, and more.
|
-- keeping track of open buffers, window arrangement, and more.
|
||||||
-- You can restore sessions when returning through the dashboard.
|
-- You can restore sessions when returning through the dashboard.
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
local prios = {
|
local prios = {
|
||||||
["lazyvim.plugins.extras.test.core"] = 1,
|
["lazyvim.plugins.extras.test.core"] = 1,
|
||||||
["lazyvim.plugins.extras.dap.core"] = 1,
|
["lazyvim.plugins.extras.dap.core"] = 1,
|
||||||
|
["lazyvim.plugins.extras.coding.nvim-cmp"] = 2,
|
||||||
["lazyvim.plugins.extras.ui.edgy"] = 2,
|
["lazyvim.plugins.extras.ui.edgy"] = 2,
|
||||||
["lazyvim.plugins.extras.lang.typescript"] = 5,
|
["lazyvim.plugins.extras.lang.typescript"] = 5,
|
||||||
["lazyvim.plugins.extras.coding.blink"] = 5,
|
["lazyvim.plugins.extras.coding.blink"] = 5,
|
||||||
|
|
|
@ -13,6 +13,11 @@ M.actions = {
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
|
snippet_stop = function()
|
||||||
|
if vim.snippet then
|
||||||
|
vim.snippet.stop()
|
||||||
|
end
|
||||||
|
end,
|
||||||
}
|
}
|
||||||
|
|
||||||
---@param actions string[]
|
---@param actions string[]
|
||||||
|
@ -100,20 +105,6 @@ function M.add_missing_snippet_docs(window)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function M.visible()
|
|
||||||
---@module 'blink.cmp'
|
|
||||||
local blink = package.loaded["blink.cmp"]
|
|
||||||
if blink then
|
|
||||||
return blink.windows and blink.windows.autocomplete.win:is_open()
|
|
||||||
end
|
|
||||||
---@module 'cmp'
|
|
||||||
local cmp = package.loaded["cmp"]
|
|
||||||
if cmp then
|
|
||||||
return cmp.core.view:visible()
|
|
||||||
end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
-- This is a better implementation of `cmp.confirm`:
|
-- This is a better implementation of `cmp.confirm`:
|
||||||
-- * check if the completion menu is visible without waiting for running sources
|
-- * check if the completion menu is visible without waiting for running sources
|
||||||
-- * create an undo point before confirming
|
-- * create an undo point before confirming
|
||||||
|
|
|
@ -13,6 +13,12 @@ M.moved = {
|
||||||
ui = {
|
ui = {
|
||||||
statuscolumn = { "Snacks.statuscolumn" },
|
statuscolumn = { "Snacks.statuscolumn" },
|
||||||
bufremove = { "Snacks.bufdelete" },
|
bufremove = { "Snacks.bufdelete" },
|
||||||
|
fg = {
|
||||||
|
"{ fg = Snacks.util.color(...) }",
|
||||||
|
fn = function(...)
|
||||||
|
return { fg = Snacks.util.color(...) }
|
||||||
|
end,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -33,6 +39,9 @@ function M.decorate(name, mod)
|
||||||
if M.moved[name][k] then
|
if M.moved[name][k] then
|
||||||
local to = M.moved[name][k][1]
|
local to = M.moved[name][k][1]
|
||||||
LazyVim.deprecate("LazyVim." .. name .. "." .. k, to)
|
LazyVim.deprecate("LazyVim." .. name .. "." .. k, to)
|
||||||
|
if M.moved[name][k].fn then
|
||||||
|
return M.moved[name][k].fn
|
||||||
|
end
|
||||||
local ret = vim.tbl_get(_G, unpack(vim.split(to, ".", { plain = true })))
|
local ret = vim.tbl_get(_G, unpack(vim.split(to, ".", { plain = true })))
|
||||||
return ret
|
return ret
|
||||||
end
|
end
|
||||||
|
|
|
@ -265,4 +265,13 @@ function M.memoize(fn)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---@return "nvim-cmp" | "blink.cmp"
|
||||||
|
function M.cmp_engine()
|
||||||
|
vim.g.lazyvim_cmp = vim.g.lazyvim_cmp or "auto"
|
||||||
|
if vim.g.lazyvim_cmp == "auto" then
|
||||||
|
return LazyVim.has_extra("coding.nvim-cmp") and "nvim-cmp" or "blink.cmp"
|
||||||
|
end
|
||||||
|
return vim.g.lazyvim_cmp
|
||||||
|
end
|
||||||
|
|
||||||
return M
|
return M
|
||||||
|
|
|
@ -17,7 +17,7 @@ function M.status(icon, status)
|
||||||
return status() ~= nil
|
return status() ~= nil
|
||||||
end,
|
end,
|
||||||
color = function()
|
color = function()
|
||||||
return LazyVim.ui.fg(colors[status()] or colors.ok)
|
return { fg = Snacks.util.color(colors[status()] or colors.ok) }
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
@ -157,7 +157,7 @@ function M.root_dir(opts)
|
||||||
other = true,
|
other = true,
|
||||||
icon = " ",
|
icon = " ",
|
||||||
color = function()
|
color = function()
|
||||||
return LazyVim.ui.fg("Special")
|
return { fg = Snacks.util.color("Special") }
|
||||||
end,
|
end,
|
||||||
}, opts or {})
|
}, opts or {})
|
||||||
|
|
||||||
|
|
|
@ -1,47 +1,6 @@
|
||||||
---@class lazyvim.util.mini
|
---@class lazyvim.util.mini
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
---@alias Mini.ai.loc {line:number, col:number}
|
|
||||||
---@alias Mini.ai.region {from:Mini.ai.loc, to:Mini.ai.loc}
|
|
||||||
|
|
||||||
-- Mini.ai indent text object
|
|
||||||
-- For "a", it will include the non-whitespace line surrounding the indent block.
|
|
||||||
-- "a" is line-wise, "i" is character-wise.
|
|
||||||
function M.ai_indent(ai_type)
|
|
||||||
local spaces = (" "):rep(vim.o.tabstop)
|
|
||||||
local lines = vim.api.nvim_buf_get_lines(0, 0, -1, false)
|
|
||||||
local indents = {} ---@type {line: number, indent: number, text: string}[]
|
|
||||||
|
|
||||||
for l, line in ipairs(lines) do
|
|
||||||
if not line:find("^%s*$") then
|
|
||||||
indents[#indents + 1] = { line = l, indent = #line:gsub("\t", spaces):match("^%s*"), text = line }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
local ret = {} ---@type (Mini.ai.region | {indent: number})[]
|
|
||||||
|
|
||||||
for i = 1, #indents do
|
|
||||||
if i == 1 or indents[i - 1].indent < indents[i].indent then
|
|
||||||
local from, to = i, i
|
|
||||||
for j = i + 1, #indents do
|
|
||||||
if indents[j].indent < indents[i].indent then
|
|
||||||
break
|
|
||||||
end
|
|
||||||
to = j
|
|
||||||
end
|
|
||||||
from = ai_type == "a" and from > 1 and from - 1 or from
|
|
||||||
to = ai_type == "a" and to < #indents and to + 1 or to
|
|
||||||
ret[#ret + 1] = {
|
|
||||||
indent = indents[i].indent,
|
|
||||||
from = { line = indents[from].line, col = ai_type == "a" and 1 or indents[from].indent + 1 },
|
|
||||||
to = { line = indents[to].line, col = #indents[to].text },
|
|
||||||
}
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
return ret
|
|
||||||
end
|
|
||||||
|
|
||||||
-- taken from MiniExtra.gen_ai_spec.buffer
|
-- taken from MiniExtra.gen_ai_spec.buffer
|
||||||
function M.ai_buffer(ai_type)
|
function M.ai_buffer(ai_type)
|
||||||
local start_line, end_line = 1, vim.fn.line("$")
|
local start_line, end_line = 1, vim.fn.line("$")
|
||||||
|
@ -92,6 +51,7 @@ function M.ai_whichkey(opts)
|
||||||
{ "}", desc = "{} with ws" },
|
{ "}", desc = "{} with ws" },
|
||||||
}
|
}
|
||||||
|
|
||||||
|
---@type wk.Spec[]
|
||||||
local ret = { mode = { "o", "x" } }
|
local ret = { mode = { "o", "x" } }
|
||||||
---@type table<string, string>
|
---@type table<string, string>
|
||||||
local mappings = vim.tbl_extend("force", {}, {
|
local mappings = vim.tbl_extend("force", {}, {
|
||||||
|
|
|
@ -42,10 +42,13 @@ function M.register(picker)
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---@return "telescope" | "fzf" | "snacks"
|
||||||
function M.want()
|
function M.want()
|
||||||
vim.g.lazyvim_picker = vim.g.lazyvim_picker or "auto"
|
vim.g.lazyvim_picker = vim.g.lazyvim_picker or "auto"
|
||||||
if vim.g.lazyvim_picker == "auto" then
|
if vim.g.lazyvim_picker == "auto" then
|
||||||
return LazyVim.has_extra("editor.fzf") and "fzf" or "telescope"
|
return LazyVim.has_extra("editor.snacks_picker") and "snacks"
|
||||||
|
or LazyVim.has_extra("editor.telescope") and "telescope"
|
||||||
|
or "fzf"
|
||||||
end
|
end
|
||||||
return vim.g.lazyvim_picker
|
return vim.g.lazyvim_picker
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
---@class lazyvim.util.root
|
---@class lazyvim.util.root
|
||||||
---@overload fun(): string
|
---@overload fun(): string
|
||||||
local M = setmetatable({}, {
|
local M = setmetatable({}, {
|
||||||
__call = function(m)
|
__call = function(m, ...)
|
||||||
return m.get()
|
return m.get(...)
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -24,52 +24,4 @@ function M.foldexpr()
|
||||||
return vim.b[buf].ts_folds and vim.treesitter.foldexpr() or "0"
|
return vim.b[buf].ts_folds and vim.treesitter.foldexpr() or "0"
|
||||||
end
|
end
|
||||||
|
|
||||||
---@return {fg?:string}?
|
|
||||||
function M.fg(name)
|
|
||||||
local hl = vim.api.nvim_get_hl(0, { name = name, link = false })
|
|
||||||
local fg = hl and hl.fg or hl.foreground
|
|
||||||
return fg and { fg = string.format("#%06x", fg) } or nil
|
|
||||||
end
|
|
||||||
|
|
||||||
function M.maximize()
|
|
||||||
---@type {k:string, v:any}[]?
|
|
||||||
local maximized = nil
|
|
||||||
return Snacks.toggle({
|
|
||||||
name = "Maximize",
|
|
||||||
get = function()
|
|
||||||
return maximized ~= nil
|
|
||||||
end,
|
|
||||||
set = function(state)
|
|
||||||
if state then
|
|
||||||
maximized = {}
|
|
||||||
local function set(k, v)
|
|
||||||
table.insert(maximized, 1, { k = k, v = vim.o[k] })
|
|
||||||
vim.o[k] = v
|
|
||||||
end
|
|
||||||
set("winwidth", 999)
|
|
||||||
set("winheight", 999)
|
|
||||||
set("winminwidth", 10)
|
|
||||||
set("winminheight", 4)
|
|
||||||
vim.cmd("wincmd =")
|
|
||||||
-- `QuitPre` seems to be executed even if we quit a normal window, so we don't want that
|
|
||||||
-- `VimLeavePre` might be another consideration? Not sure about differences between the 2
|
|
||||||
vim.api.nvim_create_autocmd("ExitPre", {
|
|
||||||
once = true,
|
|
||||||
group = vim.api.nvim_create_augroup("lazyvim_restore_max_exit_pre", { clear = true }),
|
|
||||||
desc = "Restore width/height when close Neovim while maximized",
|
|
||||||
callback = function()
|
|
||||||
M.maximize.set(false)
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
else
|
|
||||||
for _, opt in ipairs(maximized) do
|
|
||||||
vim.o[opt.k] = opt.v
|
|
||||||
end
|
|
||||||
maximized = nil
|
|
||||||
vim.cmd("wincmd =")
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
end
|
|
||||||
|
|
||||||
return M
|
return M
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue