Merge branch 'main' into add-solidity-support

This commit is contained in:
Folke Lemaitre 2025-10-20 02:17:55 -07:00 committed by GitHub
commit 13875c79ff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
57 changed files with 1264 additions and 249 deletions

View file

@ -1,3 +1,3 @@
{ {
".": "15.7.1" ".": "15.9.0"
} }

View file

@ -1,5 +1,73 @@
# Changelog # Changelog
## [15.9.0](https://github.com/LazyVim/LazyVim/compare/v15.8.1...v15.9.0) (2025-10-19)
### Features
* **docker:** associate 'Containerfile' with 'dockerfile' filetype ([#5974](https://github.com/LazyVim/LazyVim/issues/5974)) ([97af4a2](https://github.com/LazyVim/LazyVim/commit/97af4a23bccac85eb02e489f573db68863d6ed33))
* **extras.rest:** add keymap for changing environment ([#5678](https://github.com/LazyVim/LazyVim/issues/5678)) ([1da659d](https://github.com/LazyVim/LazyVim/commit/1da659db4a3fbcd6d171f3b38d0092ced0887e61))
* **java:** enable `blink.cmp` capabilities to show signature documentation ([#5218](https://github.com/LazyVim/LazyVim/issues/5218)) ([9618e32](https://github.com/LazyVim/LazyVim/commit/9618e327edfb79d9cbb037a2039c4315a95df63f))
* **lang/omnisharp:** switch neotest adapter to vstest ([#6540](https://github.com/LazyVim/LazyVim/issues/6540)) ([4086d44](https://github.com/LazyVim/LazyVim/commit/4086d44a0b5c576630c603c7b71c6be5198d9eaf))
* **neotest:** extra keymap to attach to a test ([#6198](https://github.com/LazyVim/LazyVim/issues/6198)) ([66e927f](https://github.com/LazyVim/LazyVim/commit/66e927fd9d0b0ff2886b9fe1465d9396461a2665))
### Bug Fixes
* **blink:** remove snippet expand override (no longer needed). Closes [#6044](https://github.com/LazyVim/LazyVim/issues/6044) ([336e2c3](https://github.com/LazyVim/LazyVim/commit/336e2c3ea67636c4eea3cf8f7538feb86b5a0610))
* **chezmoi:** add `hidden=false` to fzf picker ([#6095](https://github.com/LazyVim/LazyVim/issues/6095)) ([1aa1b59](https://github.com/LazyVim/LazyVim/commit/1aa1b59a7ec7cab61fa7b096db53df15ec5008e7))
* **copilot-chat:** use up to date config for chat headers ([#6543](https://github.com/LazyVim/LazyVim/issues/6543)) ([2c5eef7](https://github.com/LazyVim/LazyVim/commit/2c5eef7df7520fbc6fe0d90150cd26ac9e4f325b))
* **extras/rust:** fix config key for files.exclude ([#5664](https://github.com/LazyVim/LazyVim/issues/5664)) ([762a34d](https://github.com/LazyVim/LazyVim/commit/762a34d5ad95447b241287e8d540b657a699d141))
* **extras:** adjust switch source/header shortcut ([#6567](https://github.com/LazyVim/LazyVim/issues/6567)) ([b36b858](https://github.com/LazyVim/LazyVim/commit/b36b8589b62f55b181367afe954606c73233c0a1))
* **extras:** remove procMacro ignored ([#6117](https://github.com/LazyVim/LazyVim/issues/6117)) ([4a3702e](https://github.com/LazyVim/LazyVim/commit/4a3702e050881fea262ccae980ae1ff9e849d275))
* **lang.omnisharp:** update CSharpier command and arguments for Mason compatibility ([#6156](https://github.com/LazyVim/LazyVim/issues/6156)) ([dfebe70](https://github.com/LazyVim/LazyVim/commit/dfebe70b8d09514dd3ee85e12463f266f93c5dd7))
* **lang.rust:** rust-analyzer hanging on root scanned ([#6178](https://github.com/LazyVim/LazyVim/issues/6178)) ([7bf8c22](https://github.com/LazyVim/LazyVim/commit/7bf8c22c56283fa6d5d35246dcd0f49d37a5c709))
* **latex:** ensure tex extra installs latex tree-sitter parser ([#6357](https://github.com/LazyVim/LazyVim/issues/6357)) ([ae74622](https://github.com/LazyVim/LazyVim/commit/ae74622e6666ea4c3e6c58c4ef2d3f313d8e8f20))
* **mini.animate:** schedule the toggle mapping to correctly take effect ([#6483](https://github.com/LazyVim/LazyVim/issues/6483)) ([bd23357](https://github.com/LazyVim/LazyVim/commit/bd233579a66018f526b6b0970e33afde4cde399e))
* **sql:** fix autocomplete when `omni` is used as a `blink.cmp` source ([#5652](https://github.com/LazyVim/LazyVim/issues/5652)) ([f6f72b9](https://github.com/LazyVim/LazyVim/commit/f6f72b90d41d9347b93a07d0b680195541f64c55))
* **treesitter:** attach textobject keymaps to existing buffers on load. Closes [#6642](https://github.com/LazyVim/LazyVim/issues/6642). Closes [#6639](https://github.com/LazyVim/LazyVim/issues/6639) ([92a7728](https://github.com/LazyVim/LazyVim/commit/92a77287321236f52ff38648a38cf314ab223137))
* **typescript:** make_position_params with offset encoding. ([#6277](https://github.com/LazyVim/LazyVim/issues/6277)) ([22152e9](https://github.com/LazyVim/LazyVim/commit/22152e958f3f7c2b732cb6429ccc90541e0ad17f))
* **ui:** ignore sidekick_terminal in mini-indentscope ([#6619](https://github.com/LazyVim/LazyVim/issues/6619)) ([f0b32b5](https://github.com/LazyVim/LazyVim/commit/f0b32b5955889d4d2d3636a52d2ddf5d113646df))
* **util:** add some kulala keymaps back to global ([#5960](https://github.com/LazyVim/LazyVim/issues/5960)) ([a16739e](https://github.com/LazyVim/LazyVim/commit/a16739e3328c2687d96f868839c575765c49baad))
* **vscode:** don't sync undo/redo with vscode ([#5957](https://github.com/LazyVim/LazyVim/issues/5957)) ([706ec44](https://github.com/LazyVim/LazyVim/commit/706ec4443a33ec474f2329b5b806e9cdb85cce43))
## [15.8.1](https://github.com/LazyVim/LazyVim/compare/v15.8.0...v15.8.1) (2025-10-18)
### Bug Fixes
* **treesitter:** reload lazyvim.tresitter.util to prevent issues with stale modules when upgrading ([62ce8a2](https://github.com/LazyVim/LazyVim/commit/62ce8a23d89fa766956447a3df01d9f3448e9a66))
## [15.8.0](https://github.com/LazyVim/LazyVim/compare/v15.7.1...v15.8.0) (2025-10-17)
### Features
* **gleam:** add conform ([#5640](https://github.com/LazyVim/LazyVim/issues/5640)) ([02b8dd3](https://github.com/LazyVim/LazyVim/commit/02b8dd3f4bd55f06be133471fad027f3131238f4))
* **sidekick:** added `<leader>ad` to close/detach a terminal/session ([f8b062b](https://github.com/LazyVim/LazyVim/commit/f8b062b130177f07d3c1c13b642402d42e980df5))
* **sidekick:** changed default keymaps for sidekick. Please check updated docs at sidekick.nvim ([a3e52dd](https://github.com/LazyVim/LazyVim/commit/a3e52dd346ea35db5521b66e46dca95d32f00cb4))
* **sidekick:** use `<a-a>` in any snacks picker to send the (selected) results to an AI tool ([26c43a9](https://github.com/LazyVim/LazyVim/commit/26c43a9b931f3ab04a8c449671250182ac9ddca6))
* **treesitter:** add installation instructions to get a C compiler on windows ([37032da](https://github.com/LazyVim/LazyVim/commit/37032dabd657ae567011e7ab4f881ecbf476eb76))
* **treesitter:** added support for `disable` langs to indent/highlight/folds. Closes [#6608](https://github.com/LazyVim/LazyVim/issues/6608) ([0e8069c](https://github.com/LazyVim/LazyVim/commit/0e8069c78ee92279055236388df8c2019476767a))
* **treesitter:** better health checks for treesitter requirements ([413b9d5](https://github.com/LazyVim/LazyVim/commit/413b9d5fa91c5bd5088b28c6d1764caa88542cb1))
* **treesitter:** on windows, use `gcc` if available and `cl.exe` is not available for building parsers ([2a1f3c3](https://github.com/LazyVim/LazyVim/commit/2a1f3c370145c3465c0142deade3e3b2660ce829))
### Bug Fixes
* **blink:** disable blink left/right key in the cmdline ([94c4603](https://github.com/LazyVim/LazyVim/commit/94c4603b6838fbe75343b6e3342b4343744157dc))
* **keymaps:** update deprecated diagnostic keymap to latest api change ([#6574](https://github.com/LazyVim/LazyVim/issues/6574)) ([b9d38f6](https://github.com/LazyVim/LazyVim/commit/b9d38f692015fecaa72d55282b74a3d601e4c9fa))
* **sidekick:** only add copilot to lspconfig when `opts.nes.enabled ~= false` ([049db39](https://github.com/LazyVim/LazyVim/commit/049db39de0f272e8368a4b3881ac5a13f0d04b09))
* **terminal:** term toggle keymaps now only work for snacks terminals. Closes [#6573](https://github.com/LazyVim/LazyVim/issues/6573) ([4efd0e2](https://github.com/LazyVim/LazyVim/commit/4efd0e2bea2a387d6fcdea8cf36a62049e8bafed))
* **treesiter:** check that `disable` options are tables ([e8c5fa7](https://github.com/LazyVim/LazyVim/commit/e8c5fa7eae06539c883699507caeadb46d74f401))
* **treesitter:** better check on windows if microsoft build tools is installed ([5effc77](https://github.com/LazyVim/LazyVim/commit/5effc77185f94f557809375b5650d427e7171c32))
* **xtras:** load `copilot-native` before `blink` ([#6588](https://github.com/LazyVim/LazyVim/issues/6588)) ([aa2c436](https://github.com/LazyVim/LazyVim/commit/aa2c43633adee0f80faf8d743d6476ea4f8ba5ca))
### Performance Improvements
* **ansible:** load on ft=yaml and run should only be mapped on ft=yaml.ansible ([ebdcf1b](https://github.com/LazyVim/LazyVim/commit/ebdcf1ba7ef18daa8c897c8922a5ef770e8bcffb))
## [15.7.1](https://github.com/LazyVim/LazyVim/compare/v15.7.0...v15.7.1) (2025-10-02) ## [15.7.1](https://github.com/LazyVim/LazyVim/compare/v15.7.0...v15.7.1) (2025-10-02)

151
README-FR.md Normal file
View file

@ -0,0 +1,151 @@
<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">Install</a>
·
<a href="https://lazyvim.github.io/configuration">Configure</a>
·
<a href="https://lazyvim.github.io">Docs</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 est une configuration Neovim basée sur [💤 lazy.nvim](https://github.com/folke/lazy.nvim)
facilitant la personnalisation et l'ajout d'extensions.
Plutôt que d'imposer le choix entre partir de rien et utiliser
une distribution toute faite, LazyVim offre le meilleur des deux mondes
: la flexibilité d'une config ajustable selon vos besoins, et le confort
d'une configuration pensée et peaufinée à l'avance.
![image](https://user-images.githubusercontent.com/292349/211285846-0b7bb3bf-0462-4029-b64c-4ee1d037fc1c.png)
![image](https://user-images.githubusercontent.com/292349/213447056-92290767-ea16-430c-8727-ce994c93e9cc.png)
## ✨ Fonctionnalités
- 🔥 Transforme Neovim en un environnement de développement complet
- 💤 Customise et étends ta config sans effort grâce à [lazy.nvim](https://github.com/folke/lazy.nvim)
- 🚀 Rapide comme l'éclair !
- 🧹 Configuration par défaut propre et intuitive pour les options, les autocmds, et les keymaps
- 📦 Livré avec une variété de plugins pre-configurés et prêts à être utilisés
## ⚡️ Pré-requis
- Neovim >= **0.9.0** (doit être compilé avec **LuaJIT**)
- Git >= **2.19.0** (pour supporter le clonage partiel)
- Un [Nerd Font](https://www.nerdfonts.com/) **_(optionel)_**
- Un compileur **C** pour `nvim-treesitter`. Voir [ici](https://github.com/nvim-treesitter/nvim-treesitter#requirements)
## 🚀 Comment commencer
Un template pour **LazyVim** peut être trouvé [ici](https://github.com/LazyVim/starter)
<details><summary>Essayer avec 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>Installer le <a href="https://github.com/LazyVim/starter">LazyVim Starter</a></summary>
- Sauvegardez votre configuration Neovim :
```sh
mv ~/.config/nvim ~/.config/nvim.bak
mv ~/.local/share/nvim ~/.local/share/nvim.bak
```
- Clonez le starter
```sh
git clone https://github.com/LazyVim/starter ~/.config/nvim
```
- Supprimez le dossier `.git`, afin que vous puissiez l'ajouter à votre repo plus tard
```sh
rm -rf ~/.config/nvim/.git
```
- Lancez Neovim !
```sh
nvim
```
Consultez les commentaires dans les fichiers pour savoir comment personnaliser **LazyVim**.
</details>
---
Il y a une superbe vidéo (en anglais) de [@elijahmanor](https://github.com/elijahmanor)
qui vous guide pas-à-pas pour commencer.
[![Watch the video](https://img.youtube.com/vi/N93cTbtLCIM/hqdefault.jpg)](https://www.youtube.com/watch?v=N93cTbtLCIM)
[@dusty-phillips](https://github.com/dusty-phillips) a écrit un livre exhaustif
sur LazyVim, nommé [LazyVim for Ambitious Developers](https://lazyvim-ambitious-devs.phillips.codes)
disponible gratuitement en ligne.
## 📂 Structure de fichier
Les fichiers dans le dossier config vont être chargés automatiquement en temps voulu,
donc pas besoin de `require` ces fichiers manuellement.
**LazyVim** vient avec un ensemble de fichiers de configuration par défaut qui seront chargés
**_avant_** les vôtres. Voir [ici](https://github.com/LazyVim/LazyVim/tree/main/lua/lazyvim/config)
Vous pouvez ajouter vos configurations de plugins sous `lua/plugins/`.
Ici, tous les fichiers seront automatiquement chargés par [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>
## ⚙️ Configuration
Veuillez vous référer à la [documentation](https://lazyvim.github.io)

147
README-PL.md Normal file
View file

@ -0,0 +1,147 @@
<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">Install</a>
·
<a href="https://lazyvim.github.io/configuration">Configure</a>
·
<a href="https://lazyvim.github.io">Docs</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 to konfiguracja Neovim oparta na [💤 lazy.nvim](https://github.com/folke/lazy.nvim)
która ułatwia dostosowywanie i rozszerzanie konfiguracji.
Zamiast wybierać między rozpoczynaniem od zera a używaniem gotowej dystrybucji, LazyVim oferuje najlepsze z obu światów elastyczność pozwalającą na dostosowanie konfiguracji do własnych potrzeb oraz wygodę wstępnie skonfigurowanego środowiska.
![image](https://user-images.githubusercontent.com/292349/211285846-0b7bb3bf-0462-4029-b64c-4ee1d037fc1c.png)
![image](https://user-images.githubusercontent.com/292349/213447056-92290767-ea16-430c-8727-ce994c93e9cc.png)
## ✨ Funkcje
- 🔥 Przekształć Neovim w pełnoprawne IDE
- 💤 Łatwo dostosowuj i rozszerzaj swoją konfigurację dzięki [lazy.nvim](https://github.com/folke/lazy.nvim)
- 🚀 Niezwykle szybkie działanie
- 🧹 Przemyślane domyślne ustawienia opcji, autocmd i skrótów klawiszowych
- 📦 Zawiera bogaty zestaw wstępnie skonfigurowanych wtyczek gotowych do użycia
## ⚡️ Wymagania
- Neovim >= **0.9.0** (musi być skompilowany z **LuaJIT**)
- Git >= **2.19.0** (dla obsługi częściowego klonowania repozytoriów)
- [Nerd Font](https://www.nerdfonts.com/) **_(opcjonalnie)_**
- Kompilator **C** wymagany dla `nvim-treesitter`. Szczegóły [tutaj](https://github.com/nvim-treesitter/nvim-treesitter#requirements)
## 🚀 Pierwsze kroki
Szablon startowy dla **LazyVim** znajdziesz [tutaj](https://github.com/LazyVim/starter)
<details><summary>Wypróbuj z Dockerem</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>Zainstaluj <a href="https://github.com/LazyVim/starter">Starter LazyVim</a></summary>
- Wykonaj kopię zapasową swoich obecnych plików Neovim:
```sh
mv ~/.config/nvim ~/.config/nvim.bak
mv ~/.local/share/nvim ~/.local/share/nvim.bak
```
- Sklonuj repozytorium startowe:
```sh
git clone https://github.com/LazyVim/starter ~/.config/nvim
```
- Usuń folder `.git`, aby później móc dodać własne repozytorium:
```sh
rm -rf ~/.config/nvim/.git
```
- Uruchom Neovim!
```sh
nvim
```
W plikach znajdziesz komentarze, które pomogą Ci dostosować **LazyVim**.
</details>
---
[@elijahmanor](https://github.com/elijahmanor) stworzył świetne wideo z przewodnikiem, jak zacząć.
[![Obejrzyj wideo](https://img.youtube.com/vi/N93cTbtLCIM/hqdefault.jpg)](https://www.youtube.com/watch?v=N93cTbtLCIM)
[@dusty-phillips](https://github.com/dusty-phillips) napisał obszerną książkę
[LazyVim for Ambitious Developers](https://lazyvim-ambitious-devs.phillips.codes),
która jest dostępna za darmo online.
## 📂 Struktura plików
Pliki w katalogu `config` są automatycznie ładowane w odpowiednim momencie,
więc nie musisz ich ręcznie dołączać.
**LazyVim** zawiera zestaw domyślnych plików konfiguracyjnych,
które zostaną załadowane **_przed_** Twoimi własnymi. Szczegóły znajdziesz [tutaj](https://github.com/LazyVim/LazyVim/tree/main/lua/lazyvim/config).
Możesz dodać własne specyfikacje wtyczek w katalogu `lua/plugins/`.
Wszystkie pliki w tym folderze zostaną automatycznie załadowane przez [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>
## ⚙️ Konfiguracja
Zapoznaj się z [dokumentacją](https://lazyvim.github.io).

View file

@ -1,4 +1,4 @@
*LazyVim.txt* For Neovim Last change: 2025 October 11 *LazyVim.txt* For Neovim Last change: 2025 October 20
============================================================================== ==============================================================================
Table of Contents *LazyVim-table-of-contents* Table of Contents *LazyVim-table-of-contents*

View file

@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
---@class LazyVimConfig: LazyVimOptions ---@class LazyVimConfig: LazyVimOptions
local M = {} local M = {}
M.version = "15.7.1" -- x-release-please-version M.version = "15.9.0" -- x-release-please-version
LazyVim.config = M LazyVim.config = M
---@class LazyVimOptions ---@class LazyVimOptions

View file

@ -81,8 +81,8 @@ map({ "i", "x", "n", "s" }, "<C-s>", "<cmd>w<cr><esc>", { desc = "Save File" })
map("n", "<leader>K", "<cmd>norm! K<cr>", { desc = "Keywordprg" }) map("n", "<leader>K", "<cmd>norm! K<cr>", { desc = "Keywordprg" })
-- better indenting -- better indenting
map("v", "<", "<gv") map("x", "<", "<gv")
map("v", ">", ">gv") map("x", ">", ">gv")
-- commenting -- commenting
map("n", "gco", "o<esc>Vcx<esc><cmd>normal gcc<cr>fxa<bs>", { desc = "Add Comment Below" }) map("n", "gco", "o<esc>Vcx<esc><cmd>normal gcc<cr>fxa<bs>", { desc = "Add Comment Below" })
@ -114,7 +114,7 @@ map("n", "[q", vim.cmd.cprev, { desc = "Previous Quickfix" })
map("n", "]q", vim.cmd.cnext, { desc = "Next Quickfix" }) map("n", "]q", vim.cmd.cnext, { desc = "Next Quickfix" })
-- formatting -- formatting
map({ "n", "v" }, "<leader>cf", function() map({ "n", "x" }, "<leader>cf", function()
LazyVim.format({ force = true }) LazyVim.format({ force = true })
end, { desc = "Format" }) end, { desc = "Format" })

View file

@ -4,6 +4,7 @@ local start = vim.health.start or vim.health.report_start
local ok = vim.health.ok or vim.health.report_ok local ok = vim.health.ok or vim.health.report_ok
local warn = vim.health.warn or vim.health.report_warn local warn = vim.health.warn or vim.health.report_warn
local error = vim.health.error or vim.health.report_error local error = vim.health.error or vim.health.report_error
local info = vim.health.info or vim.health.report_info
function M.check() function M.check()
start("LazyVim") start("LazyVim")
@ -33,6 +34,23 @@ function M.check()
warn(("`%s` is not installed"):format(name)) warn(("`%s` is not installed"):format(name))
end end
end end
start("LazyVim nvim-treesitter")
local tsok, health = LazyVim.treesitter.check()
local keys = vim.tbl_keys(health) ---@type string[]
table.sort(keys)
for _, k in pairs(keys) do
(health[k] and ok or error)(("`%s` is %s"):format(k, health[k] and "installed" or "not installed"))
end
if not tsok then
info(
"See the requirements at [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter/tree/main?tab=readme-ov-file#requirements)"
)
info("Run `:checkhealth nvim-treesitter` for more information.")
if vim.fn.has("win32") == 1 and not health["C compiler"] then
info("Install a C compiler with `winget install --id=BrechtSanders.WinLibs.POSIX.UCRT -e`")
end
end
end end
return M return M

View file

@ -18,7 +18,7 @@ return {
}, },
}) })
end, end,
mode = { "n", "v" }, mode = { "n", "x" },
desc = "Search and Replace", desc = "Search and Replace",
}, },
}, },
@ -64,7 +64,7 @@ return {
defaults = {}, defaults = {},
spec = { spec = {
{ {
mode = { "n", "v" }, mode = { "n", "x" },
{ "<leader><tab>", group = "tabs" }, { "<leader><tab>", group = "tabs" },
{ "<leader>c", group = "code" }, { "<leader>c", group = "code" },
{ "<leader>d", group = "debug" }, { "<leader>d", group = "debug" },
@ -173,8 +173,8 @@ return {
end, "Prev Hunk") end, "Prev Hunk")
map("n", "]H", function() gs.nav_hunk("last") end, "Last Hunk") map("n", "]H", function() gs.nav_hunk("last") end, "Last Hunk")
map("n", "[H", function() gs.nav_hunk("first") end, "First Hunk") map("n", "[H", function() gs.nav_hunk("first") end, "First Hunk")
map({ "n", "v" }, "<leader>ghs", ":Gitsigns stage_hunk<CR>", "Stage Hunk") map({ "n", "x" }, "<leader>ghs", ":Gitsigns stage_hunk<CR>", "Stage Hunk")
map({ "n", "v" }, "<leader>ghr", ":Gitsigns reset_hunk<CR>", "Reset Hunk") map({ "n", "x" }, "<leader>ghr", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
map("n", "<leader>ghS", gs.stage_buffer, "Stage Buffer") map("n", "<leader>ghS", gs.stage_buffer, "Stage Buffer")
map("n", "<leader>ghu", gs.undo_stage_hunk, "Undo Stage Hunk") map("n", "<leader>ghu", gs.undo_stage_hunk, "Undo Stage Hunk")
map("n", "<leader>ghR", gs.reset_buffer, "Reset Buffer") map("n", "<leader>ghR", gs.reset_buffer, "Reset Buffer")

View file

@ -0,0 +1,86 @@
return {
{ "MunifTanjim/nui.nvim", lazy = true },
{
"yetone/avante.nvim",
build = vim.fn.has("win32") ~= 0 and "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false"
or "make",
event = "VeryLazy",
opts = {
provider = "copilot",
selection = {
hint_display = "none",
},
},
cmd = {
"AvanteAsk",
"AvanteBuild",
"AvanteChat",
"AvanteClear",
"AvanteEdit",
"AvanteFocus",
"AvanteHistory",
"AvanteModels",
"AvanteRefresh",
"AvanteShowRepoMap",
"AvanteStop",
"AvanteSwitchProvider",
"AvanteToggle",
},
keys = {
{ "n", "<leader>aa", "<cmd>AvanteAsk<CR>", desc = "Ask Avante" },
{ "n", "<leader>ac", "<cmd>AvanteChat<CR>", desc = "Chat with Avante" },
{ "n", "<leader>ae", "<cmd>AvanteEdit<CR>", desc = "Edit Avante" },
{ "n", "<leader>af", "<cmd>AvanteFocus<CR>", desc = "Focus Avante" },
{ "n", "<leader>ah", "<cmd>AvanteHistory<CR>", desc = "Avante History" },
{ "n", "<leader>am", "<cmd>AvanteModels<CR>", desc = "Select Avante Model" },
{ "n", "<leader>an", "<cmd>AvanteChatNew<CR>", desc = "New Avante Chat" },
{ "n", "<leader>ap", "<cmd>AvanteSwitchProvider<CR>", desc = "Switch Avante Provider" },
{ "n", "<leader>ar", "<cmd>AvanteRefresh<CR>", desc = "Refresh Avante" },
{ "n", "<leader>as", "<cmd>AvanteStop<CR>", desc = "Stop Avante" },
{ "n", "<leader>at", "<cmd>AvanteToggle<CR>", desc = "Toggle Avante" },
},
},
-- support for image pasting
{
"HakonHarnes/img-clip.nvim",
event = "VeryLazy",
optional = true,
opts = {
-- recommended settings
default = {
embed_image_as_base64 = false,
prompt_for_file_name = false,
drag_and_drop = {
insert_mode = true,
},
-- required for Windows users
use_absolute_path = true,
},
},
},
-- Make sure to set this up properly if you have lazy=true
{
"MeanderingProgrammer/render-markdown.nvim",
optional = true,
opts = {
file_types = { "markdown", "Avante" },
},
ft = { "markdown", "Avante" },
},
-- blink.cmp source for avante.nvim
{
"saghen/blink.cmp",
optional = true,
specs = { "Kaiser-Yang/blink-cmp-avante" },
opts = {
sources = {
default = { "avante" },
providers = { avante = { module = "blink-cmp-avante", name = "Avante" } },
},
},
},
}

View file

@ -8,8 +8,11 @@ return {
user = user:sub(1, 1):upper() .. user:sub(2) user = user:sub(1, 1):upper() .. user:sub(2)
return { return {
auto_insert_mode = true, auto_insert_mode = true,
question_header = "" .. user .. " ", headers = {
answer_header = " Copilot ", user = "" .. user .. " ",
assistant = " Copilot ",
tool = "󰊳 Tool ",
},
window = { window = {
width = 0.4, width = 0.4,
}, },
@ -17,14 +20,14 @@ return {
end, end,
keys = { keys = {
{ "<c-s>", "<CR>", ft = "copilot-chat", desc = "Submit Prompt", remap = true }, { "<c-s>", "<CR>", ft = "copilot-chat", desc = "Submit Prompt", remap = true },
{ "<leader>a", "", desc = "+ai", mode = { "n", "v" } }, { "<leader>a", "", desc = "+ai", mode = { "n", "x" } },
{ {
"<leader>aa", "<leader>aa",
function() function()
return require("CopilotChat").toggle() return require("CopilotChat").toggle()
end, end,
desc = "Toggle (CopilotChat)", desc = "Toggle (CopilotChat)",
mode = { "n", "v" }, mode = { "n", "x" },
}, },
{ {
"<leader>ax", "<leader>ax",
@ -32,7 +35,7 @@ return {
return require("CopilotChat").reset() return require("CopilotChat").reset()
end, end,
desc = "Clear (CopilotChat)", desc = "Clear (CopilotChat)",
mode = { "n", "v" }, mode = { "n", "x" },
}, },
{ {
"<leader>aq", "<leader>aq",
@ -46,7 +49,7 @@ return {
end) end)
end, end,
desc = "Quick Chat (CopilotChat)", desc = "Quick Chat (CopilotChat)",
mode = { "n", "v" }, mode = { "n", "x" },
}, },
{ {
"<leader>ap", "<leader>ap",
@ -54,7 +57,7 @@ return {
require("CopilotChat").select_prompt() require("CopilotChat").select_prompt()
end, end,
desc = "Prompt Actions (CopilotChat)", desc = "Prompt Actions (CopilotChat)",
mode = { "n", "v" }, mode = { "n", "x" },
}, },
}, },
config = function(_, opts) config = function(_, opts)

View file

@ -39,6 +39,19 @@ return {
return { fg = Snacks.util.color(hl) } return { fg = Snacks.util.color(hl) }
end, end,
}) })
table.insert(opts.sections.lualine_x, 2, {
function()
local status = require("sidekick.status").cli()
return "" .. (#status > 1 and #status or "")
end,
cond = function()
return #require("sidekick.status").cli() > 0
end,
color = function()
return { fg = Snacks.util.color("Special") }
end,
})
end, end,
}, },
@ -106,4 +119,28 @@ return {
}, },
}, },
}, },
{
"folke/snacks.nvim",
optional = true,
opts = {
picker = {
actions = {
sidekick_send = function(...)
return require("sidekick.cli.picker.snacks").send(...)
end,
},
win = {
input = {
keys = {
["<a-a>"] = {
"sidekick_send",
mode = { "n", "i" },
},
},
},
},
},
},
},
} }

View file

@ -37,9 +37,7 @@ return {
---@type blink.cmp.Config ---@type blink.cmp.Config
opts = { opts = {
snippets = { snippets = {
expand = function(snippet, _) preset = "default",
return LazyVim.cmp.expand(snippet)
end,
}, },
appearance = { appearance = {

View file

@ -1,6 +1,6 @@
if lazyvim_docs then if lazyvim_docs then
-- Set to `false` to prevent "non-lsp snippets"" from appearing inside completion windows -- 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 -- Motivation: Less clutter in completion windows and a more direct usage of snippets
vim.g.lazyvim_mini_snippets_in_completion = true vim.g.lazyvim_mini_snippets_in_completion = true
-- NOTE: Please also read: -- NOTE: Please also read:

View file

@ -8,7 +8,7 @@ return {
-- Populate the keys based on the user's options -- Populate the keys based on the user's options
local opts = LazyVim.opts("mini.surround") local opts = LazyVim.opts("mini.surround")
local mappings = { local mappings = {
{ opts.mappings.add, desc = "Add Surrounding", mode = { "n", "v" } }, { opts.mappings.add, desc = "Add Surrounding", mode = { "n", "x" } },
{ opts.mappings.delete, desc = "Delete Surrounding" }, { opts.mappings.delete, desc = "Delete Surrounding" },
{ opts.mappings.find, desc = "Find Right Surrounding" }, { opts.mappings.find, desc = "Find Right Surrounding" },
{ opts.mappings.find_left, desc = "Find Left Surrounding" }, { opts.mappings.find_left, desc = "Find Left Surrounding" },

View file

@ -84,7 +84,7 @@ return {
-- stylua: ignore -- stylua: ignore
keys = { keys = {
{ "<leader>du", function() require("dapui").toggle({ }) end, desc = "Dap UI" }, { "<leader>du", function() require("dapui").toggle({ }) end, desc = "Dap UI" },
{ "<leader>de", function() require("dapui").eval() end, desc = "Eval", mode = {"n", "v"} }, { "<leader>de", function() require("dapui").eval() end, desc = "Eval", mode = {"n", "x"} },
}, },
opts = {}, opts = {},
config = function(_, opts) config = function(_, opts)

View file

@ -19,8 +19,8 @@ return {
keys = { keys = {
{ "<C-a>", function() return M.dial(true) end, expr = true, desc = "Increment", mode = {"n", "v"} }, { "<C-a>", function() return M.dial(true) end, expr = true, desc = "Increment", mode = {"n", "v"} },
{ "<C-x>", function() return M.dial(false) end, expr = true, desc = "Decrement", mode = {"n", "v"} }, { "<C-x>", function() return M.dial(false) end, expr = true, desc = "Decrement", mode = {"n", "v"} },
{ "g<C-a>", function() return M.dial(true, true) end, expr = true, desc = "Increment", mode = {"n", "v"} }, { "g<C-a>", function() return M.dial(true, true) end, expr = true, desc = "Increment", mode = {"n", "x"} },
{ "g<C-x>", function() return M.dial(false, true) end, expr = true, desc = "Decrement", mode = {"n", "v"} }, { "g<C-x>", function() return M.dial(false, true) end, expr = true, desc = "Decrement", mode = {"n", "x"} },
}, },
opts = function() opts = function()
local augend = require("dial.augend") local augend = require("dial.augend")

View file

@ -218,6 +218,7 @@ return {
{ "<leader><space>", LazyVim.pick("files"), desc = "Find Files (Root Dir)" }, { "<leader><space>", LazyVim.pick("files"), desc = "Find Files (Root Dir)" },
-- find -- find
{ "<leader>fb", "<cmd>FzfLua buffers sort_mru=true sort_lastused=true<cr>", desc = "Buffers" }, { "<leader>fb", "<cmd>FzfLua buffers sort_mru=true sort_lastused=true<cr>", desc = "Buffers" },
{ "<leader>fB", "<cmd>FzfLua buffers<cr>", desc = "Buffers (all)" },
{ "<leader>fc", LazyVim.pick.config_files(), desc = "Find Config File" }, { "<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"), desc = "Find Files (Root Dir)" },
{ "<leader>fF", LazyVim.pick("files", { root = false }), desc = "Find Files (cwd)" }, { "<leader>fF", LazyVim.pick("files", { root = false }), desc = "Find Files (cwd)" },
@ -226,15 +227,19 @@ return {
{ "<leader>fR", LazyVim.pick("oldfiles", { cwd = vim.uv.cwd() }), desc = "Recent (cwd)" }, { "<leader>fR", LazyVim.pick("oldfiles", { cwd = vim.uv.cwd() }), desc = "Recent (cwd)" },
-- git -- git
{ "<leader>gc", "<cmd>FzfLua git_commits<CR>", desc = "Commits" }, { "<leader>gc", "<cmd>FzfLua git_commits<CR>", desc = "Commits" },
{ "<leader>gd", "<cmd>FzfLua git_diff<cr>", desc = "Git Diff (hunks)" },
{ "<leader>gl", "<cmd>FzfLua git_commits<CR>", desc = "Commits" },
{ "<leader>gs", "<cmd>FzfLua git_status<CR>", desc = "Status" }, { "<leader>gs", "<cmd>FzfLua git_status<CR>", desc = "Status" },
{ "<leader>gS", "<cmd>FzfLua git_stash<cr>", desc = "Git Stash" },
-- search -- search
{ '<leader>s"', "<cmd>FzfLua registers<cr>", desc = "Registers" }, { '<leader>s"', "<cmd>FzfLua registers<cr>", desc = "Registers" },
{ "<leader>s/", "<cmd>FzfLua search_history<cr>", desc = "Search History" },
{ "<leader>sa", "<cmd>FzfLua autocmds<cr>", desc = "Auto Commands" }, { "<leader>sa", "<cmd>FzfLua autocmds<cr>", desc = "Auto Commands" },
{ "<leader>sb", "<cmd>FzfLua grep_curbuf<cr>", desc = "Buffer" }, { "<leader>sb", "<cmd>FzfLua lines<cr>", desc = "Buffer Lines" },
{ "<leader>sc", "<cmd>FzfLua command_history<cr>", desc = "Command History" }, { "<leader>sc", "<cmd>FzfLua command_history<cr>", desc = "Command History" },
{ "<leader>sC", "<cmd>FzfLua commands<cr>", desc = "Commands" }, { "<leader>sC", "<cmd>FzfLua commands<cr>", desc = "Commands" },
{ "<leader>sd", "<cmd>FzfLua diagnostics_document<cr>", desc = "Document Diagnostics" }, { "<leader>sd", "<cmd>FzfLua diagnostics_workspace<cr>", desc = "Diagnostics" },
{ "<leader>sD", "<cmd>FzfLua diagnostics_workspace<cr>", desc = "Workspace Diagnostics" }, { "<leader>sD", "<cmd>FzfLua diagnostics_document<cr>", desc = "Buffer Diagnostics" },
{ "<leader>sg", LazyVim.pick("live_grep"), desc = "Grep (Root Dir)" }, { "<leader>sg", LazyVim.pick("live_grep"), desc = "Grep (Root Dir)" },
{ "<leader>sG", LazyVim.pick("live_grep", { root = false }), desc = "Grep (cwd)" }, { "<leader>sG", LazyVim.pick("live_grep", { root = false }), desc = "Grep (cwd)" },
{ "<leader>sh", "<cmd>FzfLua help_tags<cr>", desc = "Help Pages" }, { "<leader>sh", "<cmd>FzfLua help_tags<cr>", desc = "Help Pages" },
@ -248,8 +253,8 @@ return {
{ "<leader>sq", "<cmd>FzfLua quickfix<cr>", desc = "Quickfix List" }, { "<leader>sq", "<cmd>FzfLua quickfix<cr>", desc = "Quickfix List" },
{ "<leader>sw", LazyVim.pick("grep_cword"), desc = "Word (Root Dir)" }, { "<leader>sw", LazyVim.pick("grep_cword"), desc = "Word (Root Dir)" },
{ "<leader>sW", LazyVim.pick("grep_cword", { root = false }), desc = "Word (cwd)" }, { "<leader>sW", LazyVim.pick("grep_cword", { root = false }), desc = "Word (cwd)" },
{ "<leader>sw", LazyVim.pick("grep_visual"), mode = "v", desc = "Selection (Root Dir)" }, { "<leader>sw", LazyVim.pick("grep_visual"), mode = "x", desc = "Selection (Root Dir)" },
{ "<leader>sW", LazyVim.pick("grep_visual", { root = false }), mode = "v", desc = "Selection (cwd)" }, { "<leader>sW", LazyVim.pick("grep_visual", { root = false }), mode = "x", desc = "Selection (cwd)" },
{ "<leader>uC", LazyVim.pick("colorschemes"), desc = "Colorscheme with Preview" }, { "<leader>uC", LazyVim.pick("colorschemes"), desc = "Colorscheme with Preview" },
{ {
"<leader>ss", "<leader>ss",

View file

@ -101,6 +101,7 @@ return {
"<cmd>Telescope buffers sort_mru=true sort_lastused=true ignore_current_buffer=true<cr>", "<cmd>Telescope buffers sort_mru=true sort_lastused=true ignore_current_buffer=true<cr>",
desc = "Buffers", desc = "Buffers",
}, },
{ "<leader>fB", "<cmd>Telescope buffers<cr>", desc = "Buffers (all)" },
{ "<leader>fc", LazyVim.pick.config_files(), desc = "Find Config File" }, { "<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"), desc = "Find Files (Root Dir)" },
{ "<leader>fF", LazyVim.pick("files", { root = false }), desc = "Find Files (cwd)" }, { "<leader>fF", LazyVim.pick("files", { root = false }), desc = "Find Files (cwd)" },
@ -109,15 +110,18 @@ return {
{ "<leader>fR", LazyVim.pick("oldfiles", { cwd = vim.uv.cwd() }), desc = "Recent (cwd)" }, { "<leader>fR", LazyVim.pick("oldfiles", { cwd = vim.uv.cwd() }), desc = "Recent (cwd)" },
-- git -- git
{ "<leader>gc", "<cmd>Telescope git_commits<CR>", desc = "Commits" }, { "<leader>gc", "<cmd>Telescope git_commits<CR>", desc = "Commits" },
{ "<leader>gl", "<cmd>Telescope git_commits<CR>", desc = "Commits" },
{ "<leader>gs", "<cmd>Telescope git_status<CR>", desc = "Status" }, { "<leader>gs", "<cmd>Telescope git_status<CR>", desc = "Status" },
{ "<leader>gS", "<cmd>Telescope git_stash<cr>", desc = "Git Stash" },
-- search -- search
{ '<leader>s"', "<cmd>Telescope registers<cr>", desc = "Registers" }, { '<leader>s"', "<cmd>Telescope registers<cr>", desc = "Registers" },
{ "<leader>s/", "<cmd>Telescope search_history<cr>", desc = "Search History" },
{ "<leader>sa", "<cmd>Telescope autocommands<cr>", desc = "Auto Commands" }, { "<leader>sa", "<cmd>Telescope autocommands<cr>", desc = "Auto Commands" },
{ "<leader>sb", "<cmd>Telescope current_buffer_fuzzy_find<cr>", desc = "Buffer" }, { "<leader>sb", "<cmd>Telescope current_buffer_fuzzy_find<cr>", desc = "Buffer Lines" },
{ "<leader>sc", "<cmd>Telescope command_history<cr>", desc = "Command History" }, { "<leader>sc", "<cmd>Telescope command_history<cr>", desc = "Command History" },
{ "<leader>sC", "<cmd>Telescope commands<cr>", desc = "Commands" }, { "<leader>sC", "<cmd>Telescope commands<cr>", desc = "Commands" },
{ "<leader>sd", "<cmd>Telescope diagnostics bufnr=0<cr>", desc = "Document Diagnostics" }, { "<leader>sd", "<cmd>Telescope diagnostics<cr>", desc = "Diagnostics" },
{ "<leader>sD", "<cmd>Telescope diagnostics<cr>", desc = "Workspace Diagnostics" }, { "<leader>sD", "<cmd>Telescope diagnostics bufnr=0<cr>", desc = "Buffer Diagnostics" },
{ "<leader>sg", LazyVim.pick("live_grep"), desc = "Grep (Root Dir)" }, { "<leader>sg", LazyVim.pick("live_grep"), desc = "Grep (Root Dir)" },
{ "<leader>sG", LazyVim.pick("live_grep", { root = false }), desc = "Grep (cwd)" }, { "<leader>sG", LazyVim.pick("live_grep", { root = false }), desc = "Grep (cwd)" },
{ "<leader>sh", "<cmd>Telescope help_tags<cr>", desc = "Help Pages" }, { "<leader>sh", "<cmd>Telescope help_tags<cr>", desc = "Help Pages" },
@ -132,8 +136,8 @@ return {
{ "<leader>sq", "<cmd>Telescope quickfix<cr>", desc = "Quickfix List" }, { "<leader>sq", "<cmd>Telescope quickfix<cr>", desc = "Quickfix List" },
{ "<leader>sw", LazyVim.pick("grep_string", { word_match = "-w" }), desc = "Word (Root Dir)" }, { "<leader>sw", LazyVim.pick("grep_string", { word_match = "-w" }), desc = "Word (Root Dir)" },
{ "<leader>sW", LazyVim.pick("grep_string", { root = false, word_match = "-w" }), desc = "Word (cwd)" }, { "<leader>sW", LazyVim.pick("grep_string", { root = false, word_match = "-w" }), desc = "Word (cwd)" },
{ "<leader>sw", LazyVim.pick("grep_string"), mode = "v", desc = "Selection (Root Dir)" }, { "<leader>sw", LazyVim.pick("grep_string"), mode = "x", desc = "Selection (Root Dir)" },
{ "<leader>sW", LazyVim.pick("grep_string", { root = false }), mode = "v", desc = "Selection (cwd)" }, { "<leader>sW", LazyVim.pick("grep_string", { root = false }), mode = "x", desc = "Selection (cwd)" },
{ "<leader>uC", LazyVim.pick("colorscheme", { enable_preview = true }), desc = "Colorscheme with Preview" }, { "<leader>uC", LazyVim.pick("colorscheme", { enable_preview = true }), desc = "Colorscheme with Preview" },
{ {
"<leader>ss", "<leader>ss",

View file

@ -19,13 +19,14 @@ return {
}, },
{ {
"mfussenegger/nvim-ansible", "mfussenegger/nvim-ansible",
ft = {}, ft = { "yaml" },
keys = { keys = {
{ {
"<leader>ta", "<leader>ta",
function() function()
require("ansible").run() require("ansible").run()
end, end,
ft = "yaml.ansible",
desc = "Ansible Run Playbook/Role", desc = "Ansible Run Playbook/Role",
silent = true, silent = true,
}, },

View file

@ -60,7 +60,7 @@ return {
-- Ensure mason installs the server -- Ensure mason installs the server
clangd = { clangd = {
keys = { keys = {
{ "<leader>ch", "<cmd>ClangdSwitchSourceHeader<cr>", desc = "Switch Source/Header (C/C++)" }, { "<leader>ch", "<cmd>LspClangdSwitchSourceHeader<cr>", desc = "Switch Source/Header (C/C++)" },
}, },
root_markers = { root_markers = {
"compile_commands.json", "compile_commands.json",

View file

@ -76,13 +76,13 @@ return {
end end
vim.keymap.set( vim.keymap.set(
{ "n", "v" }, { "n", "x" },
"[c", "[c",
"<CMD>call search('^; -\\+$', 'bw')<CR>", "<CMD>call search('^; -\\+$', 'bw')<CR>",
{ silent = true, buffer = true, desc = "Jumps to the begining of previous evaluation output." } { silent = true, buffer = true, desc = "Jumps to the begining of previous evaluation output." }
) )
vim.keymap.set( vim.keymap.set(
{ "n", "v" }, { "n", "x" },
"]c", "]c",
"<CMD>call search('^; -\\+$', 'w')<CR>", "<CMD>call search('^; -\\+$', 'w')<CR>",
{ silent = true, buffer = true, desc = "Jumps to the begining of next evaluation output." } { silent = true, buffer = true, desc = "Jumps to the begining of next evaluation output." }

View file

@ -2,7 +2,14 @@ return {
recommended = function() recommended = function()
return LazyVim.extras.wants({ return LazyVim.extras.wants({
ft = "dockerfile", ft = "dockerfile",
root = { "Dockerfile", "docker-compose.yml", "compose.yml", "docker-compose.yaml", "compose.yaml" }, root = {
"Dockerfile",
"Containerfile",
"docker-compose.yml",
"compose.yml",
"docker-compose.yaml",
"compose.yaml",
},
}) })
end, end,
{ {

View file

@ -1,15 +1,15 @@
return { return {
recommended = function() recommended = function()
return LazyVim.extras.wants({ return LazyVim.extras.wants({
ft = { "cs", "vb" }, ft = { "cs", "vb", "fsharp" },
root = { "*.sln", "*.csproj", "omnisharp.json", "function.json" }, root = { "*.sln", "*.csproj", "*.fsproj", "omnisharp.json", "function.json", "paket.dependencies", "paket.lock" },
}) })
end, end,
{ "Hoffs/omnisharp-extended-lsp.nvim", lazy = true }, { "Hoffs/omnisharp-extended-lsp.nvim", lazy = true },
{ {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
opts = { ensure_installed = { "c_sharp" } }, opts = { ensure_installed = { "c_sharp", "fsharp" } },
}, },
{ {
"nvimtools/none-ls.nvim", "nvimtools/none-ls.nvim",
@ -18,6 +18,7 @@ return {
local nls = require("null-ls") local nls = require("null-ls")
opts.sources = opts.sources or {} opts.sources = opts.sources or {}
table.insert(opts.sources, nls.builtins.formatting.csharpier) table.insert(opts.sources, nls.builtins.formatting.csharpier)
table.insert(opts.sources, nls.builtins.formatting.fantomas)
end, end,
}, },
{ {
@ -26,23 +27,19 @@ return {
opts = { opts = {
formatters_by_ft = { formatters_by_ft = {
cs = { "csharpier" }, cs = { "csharpier" },
}, fsharp = { "fantomas" },
formatters = {
csharpier = {
command = "dotnet-csharpier",
args = { "--write-stdout" },
},
}, },
}, },
}, },
{ {
"mason-org/mason.nvim", "mason-org/mason.nvim",
opts = { ensure_installed = { "csharpier", "netcoredbg" } }, opts = { ensure_installed = { "csharpier", "netcoredbg", "fantomas" } },
}, },
{ {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
opts = { opts = {
servers = { servers = {
fsautocomplete = {},
omnisharp = { omnisharp = {
handlers = { handlers = {
["textDocument/definition"] = function(...) ["textDocument/definition"] = function(...)
@ -104,12 +101,12 @@ return {
"nvim-neotest/neotest", "nvim-neotest/neotest",
optional = true, optional = true,
dependencies = { dependencies = {
"Issafalcon/neotest-dotnet", "Nsidorenco/neotest-vstest",
}, },
opts = { opts = {
adapters = { adapters = {
["neotest-dotnet"] = { ["neotest-vstest"] = {
-- Here we can set options for neotest-dotnet -- Here we can set options for neotest-vstest
}, },
}, },
}, },

View file

@ -17,4 +17,13 @@ return {
}, },
}, },
}, },
{
"conform.nvim",
optional = true,
opts = {
formatters_by_ft = {
gleam = { "gleam" },
},
},
},
} }

View file

@ -97,6 +97,22 @@ return {
}) })
end, end,
}, },
-- Add linting
{
"mfussenegger/nvim-lint",
optional = true,
dependencies = {
{
"mason-org/mason.nvim",
opts = { ensure_installed = { "golangci-lint" } },
},
},
opts = {
linters_by_ft = {
go = { "golangcilint" },
},
},
},
{ {
"stevearc/conform.nvim", "stevearc/conform.nvim",
optional = true, optional = true,

View file

@ -14,17 +14,40 @@ return {
{ {
"mrcjkb/haskell-tools.nvim", "mrcjkb/haskell-tools.nvim",
version = "^3", version = false,
ft = { "haskell", "lhaskell", "cabal", "cabalproject" }, ft = { "haskell", "lhaskell", "cabal", "cabalproject" },
dependencies = { keys = {
{ "nvim-telescope/telescope.nvim", optional = true }, {
"<localleader>e",
"<cmd>HlsEvalAll<cr>",
ft = "haskell",
desc = "Evaluate All",
}, },
config = function() {
local ok, telescope = pcall(require, "telescope") "<localleader>h",
if ok then function()
telescope.load_extension("ht") require("haskell-tools").hoogle.hoogle_signature()
end
end, end,
ft = "haskell",
desc = "Hoogle Signature",
},
{
"<localleader>r",
function()
require("haskell-tools").repl.toggle()
end,
ft = "haskell",
desc = "REPL (Package)",
},
{
"<localleader>R",
function()
require("haskell-tools").repl.toggle(vim.api.nvim_buf_get_name(0))
end,
ft = "haskell",
desc = "REPL (Buffer)",
},
},
}, },
{ {
@ -66,18 +89,49 @@ return {
end, end,
}, },
{
"nvim-telescope/telescope.nvim",
optional = true,
specs = {
{ {
"luc-tielen/telescope_hoogle", "luc-tielen/telescope_hoogle",
ft = { "haskell", "lhaskell", "cabal", "cabalproject" }, ft = { "haskell", "lhaskell", "cabal", "cabalproject" },
dependencies = { opts = function()
{ "nvim-telescope/telescope.nvim", optional = true }, LazyVim.on_load("telescope.nvim", function()
}, require("telescope").load_extension("ht")
config = function() end)
local ok, telescope = pcall(require, "telescope")
if ok then
telescope.load_extension("hoogle")
end
end, end,
keys = {
{
"<localleader>H",
"<cmd>Telescope hoogle<cr>",
ft = "haskell",
desc = "Hoogle",
},
},
},
},
},
{
"stevearc/conform.nvim",
optional = true,
opts = {
formatters_by_ft = {
haskell = { "fourmolu" },
cabal = { "cabal_fmt" },
},
},
},
{
"mfussenegger/nvim-lint",
optional = true,
opts = {
linters_by_ft = {
haskell = { "hlint" },
},
},
}, },
-- Make sure lspconfig doesn't start hls, -- Make sure lspconfig doesn't start hls,

View file

@ -6,7 +6,8 @@ return {
}) })
end, end,
{ "towolf/vim-helm", ft = "helm" }, { "qvalentin/helm-ls.nvim", ft = "helm" },
{ {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
opts = { ensure_installed = { "helm" } }, opts = { ensure_installed = { "helm" } },
@ -18,17 +19,6 @@ return {
servers = { servers = {
helm_ls = {}, helm_ls = {},
}, },
setup = {
yamlls = function()
LazyVim.lsp.on_attach(function(client, buffer)
if vim.bo[buffer].filetype == "helm" then
vim.schedule(function()
vim.cmd("LspStop ++force yamlls")
end)
end
end, "yamlls")
end,
},
}, },
}, },
} }

View file

@ -169,7 +169,9 @@ return {
}, },
settings = opts.settings, settings = opts.settings,
-- enable CMP capabilities -- enable CMP capabilities
capabilities = LazyVim.has("cmp-nvim-lsp") and require("cmp_nvim_lsp").default_capabilities() or nil, capabilities = LazyVim.has("blink.cmp") and require("blink.cmp").get_lsp_capabilities() or LazyVim.has(
"cmp-nvim-lsp"
) and require("cmp_nvim_lsp").default_capabilities() or nil,
}, opts.jdtls) }, opts.jdtls)
-- Existing server will be reused if the root_dir matches. -- Existing server will be reused if the root_dir matches.
@ -207,7 +209,7 @@ return {
}) })
wk.add({ wk.add({
{ {
mode = "v", mode = "x",
buffer = args.buf, buffer = args.buf,
{ "<leader>cx", group = "extract" }, { "<leader>cx", group = "extract" },
{ {

View file

@ -0,0 +1,66 @@
return {
recommended = function()
return LazyVim.extras.wants({
ft = { "julia" },
root = { "Project.toml" },
})
end,
{
"nvim-treesitter/nvim-treesitter",
opts = { ensure_installed = { "julia" } },
},
{
"neovim/nvim-lspconfig",
opts = {
servers = {
julials = {
settings = {
-- use the same default settings as the Julia VS Code extension
julia = {
completionmode = "qualify",
lint = { missingrefs = "none" },
},
},
},
},
},
},
-- cmp integration
{
"hrsh7th/nvim-cmp",
optional = true,
dependencies = { "kdheepak/cmp-latex-symbols" },
opts = function(_, opts)
table.insert(opts.sources, {
name = "latex_symbols",
option = {
strategy = 0, -- mixed
},
})
end,
},
-- blink.cmp integration
{
"saghen/blink.cmp",
optional = true,
dependencies = { "kdheepak/cmp-latex-symbols", "saghen/blink.compat" },
opts = {
sources = {
compat = { "latex_symbols" },
providers = {
latex_symbols = {
kind = "LatexSymbols",
async = true,
opts = {
strategy = 0, -- mixed
},
},
},
},
},
},
}

View file

@ -108,7 +108,7 @@ return {
priority = 10, priority = 10,
}, },
-- Redirect Lean's stderr messages somehwere (to a buffer by default) -- Redirect Lean's stderr messages somewhere (to a buffer by default)
stderr = { stderr = {
enable = true, enable = true,
-- height of the window -- height of the window

View file

@ -24,4 +24,13 @@ return {
}, },
}, },
}, },
{
"mfussenegger/nvim-lint",
optional = true,
opts = {
linters_by_ft = {
nix = { "statix" },
},
},
},
} }

View file

@ -103,11 +103,7 @@ return {
{ "<leader>dPc", function() require('dap-python').test_class() end, desc = "Debug Class", ft = "python" }, { "<leader>dPc", function() require('dap-python').test_class() end, desc = "Debug Class", ft = "python" },
}, },
config = function() config = function()
if vim.fn.has("win32") == 1 then require("dap-python").setup("debugpy-adapter")
require("dap-python").setup(LazyVim.get_pkg_path("debugpy", "/venv/Scripts/pythonw.exe"))
else
require("dap-python").setup(LazyVim.get_pkg_path("debugpy", "/venv/bin/python"))
end
end, end,
}, },
}, },

View file

@ -17,12 +17,12 @@ return {
-- of files supported by R.nvim. This is an -- of files supported by R.nvim. This is an
-- opportunity to create mappings local to buffers. -- opportunity to create mappings local to buffers.
vim.keymap.set("n", "<Enter>", "<Plug>RDSendLine", { buffer = true }) vim.keymap.set("n", "<Enter>", "<Plug>RDSendLine", { buffer = true })
vim.keymap.set("v", "<Enter>", "<Plug>RSendSelection", { buffer = true }) vim.keymap.set("x", "<Enter>", "<Plug>RSendSelection", { buffer = true })
local wk = require("which-key") local wk = require("which-key")
wk.add({ wk.add({
buffer = true, buffer = true,
mode = { "n", "v" }, mode = { "n", "x" },
{ "<localleader>a", group = "all" }, { "<localleader>a", group = "all" },
{ "<localleader>b", group = "between marks" }, { "<localleader>b", group = "between marks" },
{ "<localleader>c", group = "chunks" }, { "<localleader>c", group = "chunks" },

View file

@ -85,16 +85,12 @@ return {
}, },
procMacro = { procMacro = {
enable = true, enable = true,
ignored = {
["async-trait"] = { "async_trait" },
["napi-derive"] = { "napi" },
["async-recursion"] = { "async_recursion" },
},
}, },
files = { files = {
excludeDirs = { exclude = {
".direnv", ".direnv",
".git", ".git",
".jj",
".github", ".github",
".gitlab", ".gitlab",
"bin", "bin",
@ -103,6 +99,8 @@ return {
"venv", "venv",
".venv", ".venv",
}, },
-- Avoid Roots Scanned hanging, see https://github.com/rust-lang/rust-analyzer/issues/12613#issuecomment-2096386344
watcher = "client",
}, },
}, },
}, },

View file

@ -11,14 +11,9 @@ return {
}, },
{ {
"scalameta/nvim-metals", "scalameta/nvim-metals",
ft = { "scala", "sbt" }, dependencies = {
config = function() end, "nvim-lua/plenary.nvim",
}, },
{
"neovim/nvim-lspconfig",
opts = {
servers = {
metals = {
keys = { keys = {
{ {
"<leader>me", "<leader>me",
@ -42,35 +37,44 @@ return {
desc = "Metals hover worksheet", desc = "Metals hover worksheet",
}, },
}, },
init_options = { ft = { "scala", "sbt", "java" },
statusBarProvider = "off", opts = function()
}, local metals_config = require("metals").bare_config()
settings = {
showImplicitArguments = true,
excludedPackages = { "akka.actor.typed.javadsl", "com.github.swagger.akka.javadsl" },
},
},
},
setup = {
metals = function(_, opts)
local metals = require("metals")
local metals_config = vim.tbl_deep_extend("force", metals.bare_config(), opts)
metals_config.on_attach = LazyVim.has("nvim-dap") and metals.setup_dap or nil
metals_config.init_options.statusBarProvider = "off"
metals_config.settings = {
verboseCompilation = true,
showImplicitArguments = true,
showImplicitConversionsAndClasses = true,
showInferredType = true,
superMethodLensesEnabled = true,
excludedPackages = {
"akka.actor.typed.javadsl",
"org.apache.pekko.actor.typed.javadsl",
"com.github.swagger.akka.javadsl",
},
testUserInterface = "Test Explorer",
}
metals_config.on_attach = function(client, bufnr)
-- your on_attach function
require("metals").setup_dap()
end
return metals_config
end,
config = function(self, metals_config)
local nvim_metals_group = vim.api.nvim_create_augroup("nvim-metals", { clear = true }) local nvim_metals_group = vim.api.nvim_create_augroup("nvim-metals", { clear = true })
vim.api.nvim_create_autocmd("FileType", { vim.api.nvim_create_autocmd("FileType", {
pattern = { "scala", "sbt" }, pattern = self.ft,
callback = function() callback = function()
metals.initialize_or_attach(metals_config) require("metals").initialize_or_attach(metals_config)
end, end,
group = nvim_metals_group, group = nvim_metals_group,
}) })
return true
end, end,
}, },
},
},
{ {
"mfussenegger/nvim-dap", "mfussenegger/nvim-dap",
optional = true, optional = true,

View file

@ -28,6 +28,11 @@ end
local sql_ft = { "sql", "mysql", "plsql" } local sql_ft = { "sql", "mysql", "plsql" }
-- disable nvim default `sql_completion` plugin to be compatible with blink.cmp's omni
-- while still showing some keywords from the syntax autocomplete sources
vim.g.omni_sql_default_compl_type = "syntax"
vim.g.loaded_sql_completion = true
return { return {
recommended = function() recommended = function()
return LazyVim.extras.wants({ return LazyVim.extras.wants({

View file

@ -24,6 +24,20 @@ return {
filetypes_include = {}, filetypes_include = {},
-- to fully override the default_config, change the below -- to fully override the default_config, change the below
-- filetypes = {} -- filetypes = {}
-- additional settings for the server, e.g:
-- tailwindCSS = { includeLanguages = { someLang = "html" } }
-- can be addeded to the settings table and will be merged with
-- this defaults for Phoenix projects
settings = {
tailwindCSS = {
includeLanguages = {
elixir = "html-eex",
eelixir = "html-eex",
heex = "html-eex",
},
},
},
}, },
}, },
setup = { setup = {
@ -39,17 +53,6 @@ return {
return not vim.tbl_contains(opts.filetypes_exclude or {}, ft) return not vim.tbl_contains(opts.filetypes_exclude or {}, ft)
end, opts.filetypes) end, opts.filetypes)
-- Additional settings for Phoenix projects
opts.settings = {
tailwindCSS = {
includeLanguages = {
elixir = "html-eex",
eelixir = "html-eex",
heex = "html-eex",
},
},
}
-- Add additional filetypes -- Add additional filetypes
vim.list_extend(opts.filetypes, opts.filetypes_include or {}) vim.list_extend(opts.filetypes, opts.filetypes_include or {})
end, end,

View file

@ -12,7 +12,7 @@ return {
opts = function(_, opts) opts = function(_, opts)
opts.highlight = opts.highlight or {} opts.highlight = opts.highlight or {}
if type(opts.ensure_installed) == "table" then if type(opts.ensure_installed) == "table" then
vim.list_extend(opts.ensure_installed, { "bibtex" }) vim.list_extend(opts.ensure_installed, { "bibtex", "latex" })
end end
if type(opts.highlight.disable) == "table" then if type(opts.highlight.disable) == "table" then
vim.list_extend(opts.highlight.disable, { "latex" }) vim.list_extend(opts.highlight.disable, { "latex" })

View file

@ -0,0 +1,58 @@
return {
recommended = function()
return LazyVim.extras.wants({
ft = "twig",
})
end,
{
"nvim-treesitter/nvim-treesitter",
opts = { ensure_installed = { "twig" } },
},
{
"mason-org/mason.nvim",
opts = {
ensure_installed = {
"twigcs",
"twig-cs-fixer",
},
},
},
{
"neovim/nvim-lspconfig",
opts = {
servers = {
twiggy_language_server = {
enabled = true,
},
},
},
},
{
"nvimtools/none-ls.nvim",
optional = true,
opts = function(_, opts)
local nls = require("null-ls")
opts.sources = opts.sources or {}
table.insert(opts.sources, nls.builtins.diagnostics.twigcs)
-- Twig-CS-Fixer builtin not available in none-ls
end,
},
{
"mfussenegger/nvim-lint",
optional = true,
opts = {
linters_by_ft = {
twig = { "twigcs" },
},
},
},
{
"stevearc/conform.nvim",
optional = true,
opts = {
formatters_by_ft = {
twig = { "twig-cs-fixer" },
},
},
},
}

View file

@ -69,7 +69,8 @@ return {
{ {
"gD", "gD",
function() function()
local params = vim.lsp.util.make_position_params() local win = vim.api.nvim_get_current_win()
local params = vim.lsp.util.make_position_params(win, "utf-16")
LazyVim.lsp.execute({ LazyVim.lsp.execute({
command = "typescript.goToSourceDefinition", command = "typescript.goToSourceDefinition",
arguments = { params.textDocument.uri, params.position }, arguments = { params.textDocument.uri, params.position },
@ -262,6 +263,10 @@ return {
for _, language in ipairs(js_filetypes) do for _, language in ipairs(js_filetypes) do
if not dap.configurations[language] then if not dap.configurations[language] then
local runtimeExecutable = nil
if language:find("typescript") then
runtimeExecutable = vim.fn.executable("tsx") == 1 and "tsx" or "ts-node"
end
dap.configurations[language] = { dap.configurations[language] = {
{ {
type = "pwa-node", type = "pwa-node",
@ -269,6 +274,16 @@ return {
name = "Launch file", name = "Launch file",
program = "${file}", program = "${file}",
cwd = "${workspaceFolder}", cwd = "${workspaceFolder}",
sourceMaps = true,
runtimeExecutable = runtimeExecutable,
skipFiles = {
"<node_internals>/**",
"node_modules/**",
},
resolveSourceMapLocations = {
"${workspaceFolder}/**",
"!**/node_modules/**",
},
}, },
{ {
type = "pwa-node", type = "pwa-node",
@ -276,6 +291,16 @@ return {
name = "Attach", name = "Attach",
processId = require("dap.utils").pick_process, processId = require("dap.utils").pick_process,
cwd = "${workspaceFolder}", cwd = "${workspaceFolder}",
sourceMaps = true,
runtimeExecutable = runtimeExecutable,
skipFiles = {
"<node_internals>/**",
"node_modules/**",
},
resolveSourceMapLocations = {
"${workspaceFolder}/**",
"!**/node_modules/**",
},
}, },
} }
end end

View file

@ -0,0 +1,80 @@
return {
recommended = function()
return LazyVim.extras.wants({
ft = { "typst" },
})
end,
{
"nvim-treesitter/nvim-treesitter",
opts = {
ensure_installed = { "typst" },
},
},
{
"neovim/nvim-lspconfig",
opts = {
servers = {
tinymist = {
keys = {
{
"<leader>cP",
function()
local buf_name = vim.api.nvim_buf_get_name(0)
local file_name = vim.fn.fnamemodify(buf_name, ":t")
LazyVim.lsp.execute({
command = "tinymist.pinMain",
arguments = { buf_name },
})
LazyVim.info("Tinymist: Pinned " .. file_name)
end,
desc = "Pin main file",
},
},
single_file_support = true, -- Fixes LSP attachment in non-Git directories
settings = {
formatterMode = "typstyle",
},
},
},
},
},
{
"stevearc/conform.nvim",
optional = true,
opts = {
formatters_by_ft = {
typst = { "typstyle", lsp_format = "prefer" },
},
},
},
{
"chomosuke/typst-preview.nvim",
cmd = { "TypstPreview", "TypstPreviewToggle", "TypstPreviewUpdate" },
keys = {
{
"<leader>cp",
ft = "typst",
"<cmd>TypstPreviewToggle<cr>",
desc = "Toggle Typst Preview",
},
},
opts = {
dependencies_bin = {
tinymist = "tinymist",
},
},
},
{
"folke/ts-comments.nvim",
opts = {
lang = {
typst = { "// %s", "/* %s */" },
},
},
},
}

View file

@ -106,6 +106,7 @@ return {
-- stylua: ignore -- stylua: ignore
keys = { keys = {
{"<leader>t", "", desc = "+test"}, {"<leader>t", "", desc = "+test"},
{ "<leader>ta", function() require("neotest").run.attach() end, desc = "Attach to Test (Neotest)" },
{ "<leader>tt", function() require("neotest").run.run(vim.fn.expand("%")) end, desc = "Run File (Neotest)" }, { "<leader>tt", function() require("neotest").run.run(vim.fn.expand("%")) end, desc = "Run File (Neotest)" },
{ "<leader>tT", function() require("neotest").run.run(vim.uv.cwd()) end, desc = "Run All Test Files (Neotest)" }, { "<leader>tT", function() require("neotest").run.run(vim.uv.cwd()) end, desc = "Run All Test Files (Neotest)" },
{ "<leader>tr", function() require("neotest").run.run() end, desc = "Run Nearest (Neotest)" }, { "<leader>tr", function() require("neotest").run.run() end, desc = "Run Nearest (Neotest)" },

View file

@ -32,6 +32,9 @@ return {
end, end,
}) })
-- schedule setting the mapping to override the default mapping from `keymaps.lua`
-- seems `keymaps.lua` is the last event to execute on `VeryLazy` and it overwrites it
vim.schedule(function()
Snacks.toggle({ Snacks.toggle({
name = "Mini Animate", name = "Mini Animate",
get = function() get = function()
@ -41,6 +44,7 @@ return {
vim.g.minianimate_disable = not state vim.g.minianimate_disable = not state
end, end,
}):map("<leader>ua") }):map("<leader>ua")
end)
local animate = require("mini.animate") local animate = require("mini.animate")
return vim.tbl_deep_extend("force", opts, { return vim.tbl_deep_extend("force", opts, {

View file

@ -23,6 +23,7 @@ return {
"mason", "mason",
"neo-tree", "neo-tree",
"notify", "notify",
"sidekick_terminal",
"snacks_dashboard", "snacks_dashboard",
"snacks_notif", "snacks_notif",
"snacks_terminal", "snacks_terminal",
@ -44,7 +45,7 @@ return {
end, end,
}, },
-- disable inent-blankline scope when mini-indentscope is enabled -- disable indent-blankline scope when mini-indentscope is enabled
{ {
"lukas-reineke/indent-blankline.nvim", "lukas-reineke/indent-blankline.nvim",
optional = true, optional = true,

View file

@ -8,7 +8,7 @@ local pick_chezmoi = function()
fzf_lua.actions.vimcmd_entry("ChezmoiEdit", selected, { cwd = os.getenv("HOME") }) fzf_lua.actions.vimcmd_entry("ChezmoiEdit", selected, { cwd = os.getenv("HOME") })
end, end,
} }
fzf_lua.files({ cmd = "chezmoi managed --include=files,symlinks", actions = actions }) fzf_lua.files({ cmd = "chezmoi managed --include=files,symlinks", actions = actions, hidden = false })
elseif LazyVim.pick.picker.name == "snacks" then elseif LazyVim.pick.picker.name == "snacks" then
local results = require("chezmoi.commands").list({ local results = require("chezmoi.commands").list({
args = { args = {

View file

@ -0,0 +1,51 @@
return {
-- depends on the git extra for highlighting and auto-completion of github issues/prs
{ import = "lazyvim.plugins.extras.lang.git" },
{ "ldelossa/litee.nvim", lazy = true },
-- gh.nvim
{
"ldelossa/gh.nvim",
opts = {},
config = function(_, opts)
require("litee.lib").setup()
require("litee.gh").setup(opts)
end,
keys = {
{ "<leader>G", "", desc = "+Github" },
{ "<leader>Gc", "", desc = "+Commits" },
{ "<leader>Gcc", "<cmd>GHCloseCommit<cr>", desc = "Close" },
{ "<leader>Gce", "<cmd>GHExpandCommit<cr>", desc = "Expand" },
{ "<leader>Gco", "<cmd>GHOpenToCommit<cr>", desc = "Open To" },
{ "<leader>Gcp", "<cmd>GHPopOutCommit<cr>", desc = "Pop Out" },
{ "<leader>Gcz", "<cmd>GHCollapseCommit<cr>", desc = "Collapse" },
{ "<leader>Gi", "", desc = "+Issues" },
{ "<leader>Gip", "<cmd>GHPreviewIssue<cr>", desc = "Preview" },
{ "<leader>Gio", "<cmd>GHOpenIssue<cr>", desc = "Open" },
{ "<leader>Gl", "", desc = "+Litee" },
{ "<leader>Glt", "<cmd>LTPanel<cr>", desc = "Toggle Panel" },
{ "<leader>Gp", "", desc = "+Pull Request" },
{ "<leader>Gpc", "<cmd>GHClosePR<cr>", desc = "Close" },
{ "<leader>Gpd", "<cmd>GHPRDetails<cr>", desc = "Details" },
{ "<leader>Gpe", "<cmd>GHExpandPR<cr>", desc = "Expand" },
{ "<leader>Gpo", "<cmd>GHOpenPR<cr>", desc = "Open" },
{ "<leader>Gpp", "<cmd>GHPopOutPR<cr>", desc = "PopOut" },
{ "<leader>Gpr", "<cmd>GHRefreshPR<cr>", desc = "Refresh" },
{ "<leader>Gpt", "<cmd>GHOpenToPR<cr>", desc = "Open To" },
{ "<leader>Gpz", "<cmd>GHCollapsePR<cr>", desc = "Collapse" },
{ "<leader>Gr", "", desc = "+Review" },
{ "<leader>Grb", "<cmd>GHStartReview<cr>", desc = "Begin" },
{ "<leader>Grc", "<cmd>GHCloseReview<cr>", desc = "Close" },
{ "<leader>Grd", "<cmd>GHDeleteReview<cr>", desc = "Delete" },
{ "<leader>Gre", "<cmd>GHExpandReview<cr>", desc = "Expand" },
{ "<leader>Grs", "<cmd>GHSubmitReview<cr>", desc = "Submit" },
{ "<leader>Grz", "<cmd>GHCollapseReview<cr>", desc = "Collapse" },
{ "<leader>Gt", "", desc = "+Threads" },
{ "<leader>Gtc", "<cmd>GHCreateThread<cr>", desc = "Create" },
{ "<leader>Gtn", "<cmd>GHNextThread<cr>", desc = "Next" },
{ "<leader>Gtt", "<cmd>GHToggleThread<cr>", desc = "Toggle" },
},
},
}

View file

@ -126,7 +126,7 @@ return {
"goolord/alpha-nvim", "goolord/alpha-nvim",
optional = true, optional = true,
opts = function(_, dashboard) opts = function(_, dashboard)
local button = dashboard.button("p", "" .. " Projects", pick) local button = dashboard.button("P", "" .. " Projects (util.project)", pick)
button.opts.hl = "AlphaButtons" button.opts.hl = "AlphaButtons"
button.opts.hl_shortcut = "AlphaShortcut" button.opts.hl_shortcut = "AlphaShortcut"
table.insert(dashboard.section.buttons.val, 4, button) table.insert(dashboard.section.buttons.val, 4, button)
@ -139,7 +139,7 @@ return {
opts = function(_, opts) opts = function(_, opts)
local items = { local items = {
{ {
name = "Projects", name = "Projects (util.project)",
action = pick, action = pick,
section = string.rep(" ", 22) .. "Telescope", section = string.rep(" ", 22) .. "Telescope",
}, },
@ -157,9 +157,9 @@ return {
end end
local projects = { local projects = {
action = pick, action = pick,
desc = " Projects", desc = " Projects (util.project)",
icon = "", icon = "",
key = "p", key = "P",
} }
projects.desc = projects.desc .. string.rep(" ", 43 - #projects.desc) projects.desc = projects.desc .. string.rep(" ", 43 - #projects.desc)
@ -175,9 +175,9 @@ return {
opts = function(_, opts) opts = function(_, opts)
table.insert(opts.dashboard.preset.keys, 3, { table.insert(opts.dashboard.preset.keys, 3, {
action = pick, action = pick,
desc = "Projects", desc = "Projects (util.project)",
icon = "", icon = "",
key = "p", key = "P",
}) })
end, end,
}, },

View file

@ -8,10 +8,11 @@ return {
"mistweaverco/kulala.nvim", "mistweaverco/kulala.nvim",
ft = "http", ft = "http",
keys = { keys = {
{ "<leader>R", "", desc = "+Rest", ft = "http" }, { "<leader>R", "", desc = "+Rest" },
{ "<leader>Rb", "<cmd>lua require('kulala').scratchpad()<cr>", desc = "Open scratchpad", ft = "http" }, { "<leader>Rb", "<cmd>lua require('kulala').scratchpad()<cr>", desc = "Open scratchpad" },
{ "<leader>Rc", "<cmd>lua require('kulala').copy()<cr>", desc = "Copy as cURL", ft = "http" }, { "<leader>Rc", "<cmd>lua require('kulala').copy()<cr>", desc = "Copy as cURL", ft = "http" },
{ "<leader>RC", "<cmd>lua require('kulala').from_curl()<cr>", desc = "Paste from curl", ft = "http" }, { "<leader>RC", "<cmd>lua require('kulala').from_curl()<cr>", desc = "Paste from curl", ft = "http" },
{ "<leader>Re", "<cmd>lua require('kulala').set_selected_env()<cr>", desc = "Set environment", ft = "http" },
{ {
"<leader>Rg", "<leader>Rg",
"<cmd>lua require('kulala').download_graphql_schema()<cr>", "<cmd>lua require('kulala').download_graphql_schema()<cr>",
@ -22,7 +23,7 @@ return {
{ "<leader>Rn", "<cmd>lua require('kulala').jump_next()<cr>", desc = "Jump to next request", ft = "http" }, { "<leader>Rn", "<cmd>lua require('kulala').jump_next()<cr>", desc = "Jump to next request", ft = "http" },
{ "<leader>Rp", "<cmd>lua require('kulala').jump_prev()<cr>", desc = "Jump to previous request", ft = "http" }, { "<leader>Rp", "<cmd>lua require('kulala').jump_prev()<cr>", desc = "Jump to previous request", ft = "http" },
{ "<leader>Rq", "<cmd>lua require('kulala').close()<cr>", desc = "Close window", ft = "http" }, { "<leader>Rq", "<cmd>lua require('kulala').close()<cr>", desc = "Close window", ft = "http" },
{ "<leader>Rr", "<cmd>lua require('kulala').replay()<cr>", desc = "Replay the last request", ft = "http" }, { "<leader>Rr", "<cmd>lua require('kulala').replay()<cr>", desc = "Replay the last request" },
{ "<leader>Rs", "<cmd>lua require('kulala').run()<cr>", desc = "Send the request", ft = "http" }, { "<leader>Rs", "<cmd>lua require('kulala').run()<cr>", desc = "Send the request", ft = "http" },
{ "<leader>RS", "<cmd>lua require('kulala').show_stats()<cr>", desc = "Show stats", ft = "http" }, { "<leader>RS", "<cmd>lua require('kulala').show_stats()<cr>", desc = "Show stats", ft = "http" },
{ "<leader>Rt", "<cmd>lua require('kulala').toggle_view()<cr>", desc = "Toggle headers/body", ft = "http" }, { "<leader>Rt", "<cmd>lua require('kulala').toggle_view()<cr>", desc = "Toggle headers/body", ft = "http" },

View file

@ -23,6 +23,7 @@ local enabled = {
} }
local Config = require("lazy.core.config") local Config = require("lazy.core.config")
local vscode = require("vscode")
Config.options.checker.enabled = false Config.options.checker.enabled = false
Config.options.change_detection.enabled = false Config.options.change_detection.enabled = false
Config.options.defaults.cond = function(plugin) Config.options.defaults.cond = function(plugin)
@ -36,23 +37,30 @@ vim.api.nvim_create_autocmd("User", {
callback = function() callback = function()
-- VSCode-specific keymaps for search and navigation -- 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>/", function()
vim.keymap.set("n", "<leader>ss", [[<cmd>lua require('vscode').action('workbench.action.gotoSymbol')<cr>]]) vscode.call("workbench.action.findInFiles")
end)
vim.keymap.set("n", "<leader>ss", function()
vscode.call("workbench.action.gotoSymbol")
end)
-- Keep undo/redo lists in sync with VsCode -- Toggle VS Code integrated terminal
vim.keymap.set("n", "u", "<Cmd>call VSCodeNotify('undo')<CR>") for _, lhs in ipairs({ "<leader>ft", "<leader>fT", "<c-/>" }) do
vim.keymap.set("n", "<C-r>", "<Cmd>call VSCodeNotify('redo')<CR>") vim.keymap.set("n", lhs, function()
vscode.call("workbench.action.terminal.toggleTerminal")
end)
end
-- Navigate VSCode tabs like lazyvim buffers -- Navigate VSCode tabs like lazyvim buffers
vim.keymap.set("n", "<S-h>", "<Cmd>call VSCodeNotify('workbench.action.previousEditor')<CR>") vim.keymap.set("n", "<S-h>", function()
vim.keymap.set("n", "<S-l>", "<Cmd>call VSCodeNotify('workbench.action.nextEditor')<CR>") vscode.call("workbench.action.previousEditor")
end)
vim.keymap.set("n", "<S-l>", function()
vscode.call("workbench.action.nextEditor")
end)
end, end,
}) })
function LazyVim.terminal()
require("vscode").action("workbench.action.terminal.toggleTerminal")
end
return { return {
{ {
"snacks.nvim", "snacks.nvim",

View file

@ -29,7 +29,7 @@ return {
function() function()
require("conform").format({ formatters = { "injected" }, timeout_ms = 3000 }) require("conform").format({ formatters = { "injected" }, timeout_ms = 3000 })
end, end,
mode = { "n", "v" }, mode = { "n", "x" },
desc = "Format Injected Langs", desc = "Format Injected Langs",
}, },
}, },

View file

@ -22,8 +22,8 @@ function M.get()
{ "K", function() return vim.lsp.buf.hover() end, desc = "Hover" }, { "K", function() return vim.lsp.buf.hover() end, desc = "Hover" },
{ "gK", function() return vim.lsp.buf.signature_help() end, desc = "Signature Help", has = "signatureHelp" }, { "gK", function() return vim.lsp.buf.signature_help() end, desc = "Signature Help", has = "signatureHelp" },
{ "<c-k>", function() return vim.lsp.buf.signature_help() end, mode = "i", desc = "Signature Help", has = "signatureHelp" }, { "<c-k>", function() return vim.lsp.buf.signature_help() end, mode = "i", desc = "Signature Help", has = "signatureHelp" },
{ "<leader>ca", vim.lsp.buf.code_action, desc = "Code Action", mode = { "n", "v" }, has = "codeAction" }, { "<leader>ca", vim.lsp.buf.code_action, desc = "Code Action", mode = { "n", "x" }, has = "codeAction" },
{ "<leader>cc", vim.lsp.codelens.run, desc = "Run Codelens", mode = { "n", "v" }, has = "codeLens" }, { "<leader>cc", vim.lsp.codelens.run, desc = "Run Codelens", mode = { "n", "x" }, has = "codeLens" },
{ "<leader>cC", vim.lsp.codelens.refresh, desc = "Refresh & Display Codelens", mode = { "n" }, has = "codeLens" }, { "<leader>cC", vim.lsp.codelens.refresh, desc = "Refresh & Display Codelens", mode = { "n" }, has = "codeLens" },
{ "<leader>cR", function() Snacks.rename.rename_file() end, desc = "Rename File", mode ={"n"}, has = { "workspace/didRenameFiles", "workspace/willRenameFiles" } }, { "<leader>cR", function() Snacks.rename.rename_file() end, desc = "Rename File", mode ={"n"}, has = { "workspace/didRenameFiles", "workspace/willRenameFiles" } },
{ "<leader>cr", vim.lsp.buf.rename, desc = "Rename", has = "rename" }, { "<leader>cr", vim.lsp.buf.rename, desc = "Rename", has = "rename" },

View file

@ -13,11 +13,12 @@ return {
LazyVim.error("Please restart Neovim and run `:TSUpdate` to use the `nvim-treesitter` **main** branch.") LazyVim.error("Please restart Neovim and run `:TSUpdate` to use the `nvim-treesitter` **main** branch.")
return return
end end
LazyVim.treesitter.ensure_treesitter_cli(function() -- make sure we're using the latest treesitter util
package.loaded["lazyvim.util.treesitter"] = nil
LazyVim.treesitter.build(function()
TS.update(nil, { summary = true }) TS.update(nil, { summary = true })
end) end)
end, end,
lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline
event = { "LazyFile", "VeryLazy" }, event = { "LazyFile", "VeryLazy" },
cmd = { "TSUpdate", "TSInstall", "TSLog", "TSUninstall" }, cmd = { "TSUpdate", "TSInstall", "TSLog", "TSUninstall" },
opts_extend = { "ensure_installed" }, opts_extend = { "ensure_installed" },
@ -90,7 +91,7 @@ return {
return not LazyVim.treesitter.have(lang) return not LazyVim.treesitter.have(lang)
end, opts.ensure_installed or {}) end, opts.ensure_installed or {})
if #install > 0 then if #install > 0 then
LazyVim.treesitter.ensure_treesitter_cli(function() LazyVim.treesitter.build(function()
TS.install(install, { summary = true }):await(function() TS.install(install, { summary = true }):await(function()
LazyVim.treesitter.get_installed(true) -- refresh the installed langs LazyVim.treesitter.get_installed(true) -- refresh the installed langs
end) end)
@ -160,10 +161,9 @@ return {
end end
TS.setup(opts) TS.setup(opts)
vim.api.nvim_create_autocmd("FileType", { local function attach(buf)
group = vim.api.nvim_create_augroup("lazyvim_treesitter_textobjects", { clear = true }), local ft = vim.bo[buf].filetype
callback = function(ev) if not (vim.tbl_get(opts, "move", "enable") and LazyVim.treesitter.have(ft, "textobjects")) then
if not (vim.tbl_get(opts, "move", "enable") and LazyVim.treesitter.have(ev.match, "textobjects")) then
return return
end end
---@type table<string, table<string, string>> ---@type table<string, table<string, string>>
@ -179,15 +179,22 @@ return {
vim.keymap.set({ "n", "x", "o" }, key, function() vim.keymap.set({ "n", "x", "o" }, key, function()
require("nvim-treesitter-textobjects.move")[method](query, "textobjects") require("nvim-treesitter-textobjects.move")[method](query, "textobjects")
end, { end, {
buffer = ev.buf, buffer = buf,
desc = desc, desc = desc,
silent = true, silent = true,
}) })
end end
end end
end end
end
vim.api.nvim_create_autocmd("FileType", {
group = vim.api.nvim_create_augroup("lazyvim_treesitter_textobjects", { clear = true }),
callback = function(ev)
attach(ev.buf)
end, end,
}) })
vim.tbl_map(attach, vim.api.nvim_list_bufs())
end, end,
}, },

View file

@ -25,13 +25,30 @@ end
local extras = {} ---@type string[] local extras = {} ---@type string[]
local defaults = LazyVim.config.get_defaults() local defaults = LazyVim.config.get_defaults()
local changed = false
local updated = {} ---@type string[]
-- Add extras from LazyExtras that are not disabled -- Add extras from LazyExtras that are not disabled
for _, extra in ipairs(LazyVim.config.json.data.extras) do for _, extra in ipairs(LazyVim.config.json.data.extras) do
if LazyVim.plugin.renamed_extras[extra] then
extra = LazyVim.plugin.renamed_extras[extra]
changed = true
end
if LazyVim.plugin.deprecated_extras[extra] then
changed = true
else
updated[#updated + 1] = extra
local def = defaults[extra] local def = defaults[extra]
if not (def and def.enabled == false) then if not (def and def.enabled == false) then
extras[#extras + 1] = extra extras[#extras + 1] = extra
end end
end end
end
if changed then
LazyVim.config.json.data.extras = updated
LazyVim.json.save()
end
-- Add default extras -- Add default extras
for name, extra in pairs(defaults) do for name, extra in pairs(defaults) do

View file

@ -26,6 +26,9 @@ M.deprecated_extras = {
Either use `basedpyright`, or copy the [old extra](https://github.com/LazyVim/LazyVim/blob/c1f5fcf9c7ed2659c9d5ac41b3bb8a93e0a3c6a0/lua/lazyvim/plugins/extras/lang/python-semshi.lua#L1) to your own config. Either use `basedpyright`, or copy the [old extra](https://github.com/LazyVim/LazyVim/blob/c1f5fcf9c7ed2659c9d5ac41b3bb8a93e0a3c6a0/lua/lazyvim/plugins/extras/lang/python-semshi.lua#L1) to your own config.
]], ]],
} }
M.renamed_extras = {
["lazyvim.plugins.extras.lang.omnisharp"] = "lazyvim.plugins.extras.lang.dotnet",
}
M.deprecated_modules = {} M.deprecated_modules = {}
@ -94,6 +97,18 @@ function M.fix_imports()
return false return false
end end
end end
local rename = M.renamed_extras[spec.import]
if rename then
LazyVim.warn(
("The extra `%s` was renamed to `%s`.\nPlease update your config for `%s`"):format(
spec.import,
rename,
spec.importing or "LazyVim"
),
{ title = "LazyVim" }
)
spec.import = rename
end
local dep = M.deprecated_extras[spec and spec.import] local dep = M.deprecated_extras[spec and spec.import]
if dep then if dep then
dep = dep .. "\n" .. "Please remove the extra from `lazyvim.json` to hide this warning." dep = dep .. "\n" .. "Please remove the extra from `lazyvim.json` to hide this warning."

View file

@ -51,31 +51,85 @@ function M.indentexpr()
return M.have(nil, "indents") and require("nvim-treesitter").indentexpr() or -1 return M.have(nil, "indents") and require("nvim-treesitter").indentexpr() or -1
end end
---@param cb fun() ---@return string?
function M.ensure_treesitter_cli(cb) local function win_find_cl()
if vim.fn.executable("tree-sitter") == 1 then local path = "C:/Program Files (x86)/Microsoft Visual Studio"
return cb() local pattern = "*/*/VC/Tools/MSVC/*/bin/Hostx64/x64/cl.exe"
return vim.fn.globpath(path, pattern, true, true)[1]
end end
---@param msg? string ---@return boolean ok, lazyvim.util.treesitter.Health health
local function fail(msg) function M.check()
return LazyVim.error({ local is_win = vim.fn.has("win32") == 1
"**treesitter-nvim** `main` requires the `tree-sitter` CLI executable to be installed.", ---@param tool string
"Please install it manually from https://github.com/tree-sitter/tree-sitter/tree/master/crates/cli or", ---@param win boolean?
"use your system package manager.", local function have(tool, win)
return (win == nil or is_win == win) and vim.fn.executable(tool) == 1
end
local have_cc = vim.env.CC ~= nil or have("cc", false) or have("cl", true) or (is_win and win_find_cl() ~= nil)
if not have_cc and is_win and vim.fn.executable("gcc") == 1 then
vim.env.CC = "gcc"
have_cc = true
end
---@class lazyvim.util.treesitter.Health: table<string,boolean>
local ret = {
["tree-sitter (CLI)"] = have("tree-sitter"),
["C compiler"] = have_cc,
tar = have("tar"),
curl = have("curl"),
node = have("node"),
}
local ok = true
for _, v in pairs(ret) do
ok = ok and v
end
return ok, ret
end
---@param cb fun()
function M.build(cb)
M.ensure_treesitter_cli(function(_, err)
local ok, health = M.check()
if ok then
return cb()
else
local lines = { "Unmet requirements for **nvim-treesitter** `main`:" }
local keys = vim.tbl_keys(health) ---@type string[]
table.sort(keys)
for _, k in pairs(keys) do
lines[#lines + 1] = ("- %s `%s`"):format(health[k] and "" or "", k)
end
vim.list_extend(lines, {
"",
"See the requirements at [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter/tree/main?tab=readme-ov-file#requirements)",
"Run `:checkhealth nvim-treesitter` for more information.", "Run `:checkhealth nvim-treesitter` for more information.",
msg,
}) })
if vim.fn.has("win32") == 1 and not health["C compiler"] then
lines[#lines + 1] = "Install a C compiler with `winget install --id=BrechtSanders.WinLibs.POSIX.UCRT -e`"
end
vim.list_extend(lines, err and { "", err } or {})
LazyVim.error(lines, { title = "LazyVim Treesitter" })
end
end)
end
---@param cb fun(ok:boolean, err?:string)
function M.ensure_treesitter_cli(cb)
if vim.fn.executable("tree-sitter") == 1 then
return cb(true)
end end
-- try installing with mason -- try installing with mason
if not pcall(require, "mason") then if not pcall(require, "mason") then
return fail("`mason.nvim` is disabled in your config, so we cannot install it automatically.") return cb(false, "`mason.nvim` is disabled in your config, so we cannot install it automatically.")
end end
-- check again since we might have installed it already -- check again since we might have installed it already
if vim.fn.executable("tree-sitter") == 1 then if vim.fn.executable("tree-sitter") == 1 then
return cb() return cb(true)
end end
local mr = require("mason-registry") local mr = require("mason-registry")
@ -88,9 +142,9 @@ function M.ensure_treesitter_cli(cb)
vim.schedule_wrap(function(success) vim.schedule_wrap(function(success)
if success then if success then
LazyVim.info("Installed `tree-sitter-cli` with `mason.nvim`.") LazyVim.info("Installed `tree-sitter-cli` with `mason.nvim`.")
cb() cb(true)
else else
fail("Failed to install `tree-sitter-cli` with `mason.nvim`.") cb(false, "Failed to install `tree-sitter-cli` with `mason.nvim`.")
end end
end) end)
) )

View file

@ -1,4 +1,5 @@
---@module 'luassert' ---@module 'luassert'
---@module 'lazy'
local Icons = require("mini.icons") local Icons = require("mini.icons")
@ -26,8 +27,15 @@ describe("Extra", function()
return not vim.tbl_contains(ignore, extra.modname) return not vim.tbl_contains(ignore, extra.modname)
end, extras) end, extras)
require("mason").setup()
local mr = require("mason-registry")
mr.refresh()
local lsp_to_pkg = {} local lsp_to_pkg = {}
lsp_to_pkg = require("mason-lspconfig.mappings").get_mason_map().lspconfig_to_package lsp_to_pkg = require("mason-lspconfig.mappings").get_mason_map().lspconfig_to_package
it("can get lspconfig to package map", function()
assert(not vim.tbl_isempty(lsp_to_pkg), "Could not get lspconfig to package map")
end)
local tsspec = Plugin.Spec.new({ local tsspec = Plugin.Spec.new({
import = "lazyvim.plugins.treesitter", import = "lazyvim.plugins.treesitter",
@ -65,6 +73,17 @@ describe("Extra", function()
{ "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } }, { "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } },
mod, mod,
}, { optional = true }) }, { optional = true })
it("it has no renamed plugins", function()
for _, p in pairs(spec.plugins) do
local short_url = p[1]
assert(
not LazyVim.plugin.renames[short_url],
"Plugin " .. short_url .. " has been renamed to " .. (LazyVim.plugin.renames[short_url] or "")
)
end
end)
local lspconfig = spec.plugins["nvim-lspconfig"] local lspconfig = spec.plugins["nvim-lspconfig"]
if lspconfig then if lspconfig then
it("does not install LSP servers with mason.nvim", function() it("does not install LSP servers with mason.nvim", function()