Merge pull request #45 from TonyWu20/ayamir-main

ayamir main
TonyWu20 · Jun 13, 2024 · 08e7dfb · 08e7dfb
2 parents e9e7fd4 + be3b6ae
commit 08e7dfb
Show file tree

Hide file tree

Showing 39 changed files with 965 additions and 341 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -7,7 +7,7 @@ body:
       value: |
         _Before reporting:_ Search [existing issues](https://github.com/ayamir/nvimdots/issues) and check the [FAQ](https://github.com/ayamir/nvimdots/wiki/Issues). Thank you for helping us improve!
         > [!IMPORTANT]
-        > The `0.10` branch is intended for nightly neovim builds and is **not** stable. It typically harbors subtle issues scattered throughout. Therefore, refrain from submitting issues if you happen to encounter them. They will be closed directly unless a viable solution is proposed or included.
+        > The `0.11` branch is intended for nightly Neovim builds and is **not** stable. It typically harbors subtle issues scattered throughout. Therefore, refrain from submitting issues if you happen to encounter them. They will be closed directly unless a viable solution is proposed or included.
   - type: checkboxes
     id: is-latest-commit
     attributes:
@@ -38,7 +38,7 @@ body:
     attributes:
       label: "Neovim version"
       description: "Paste the output of `nvim --version` here"
-      placeholder: "NVIM v0.10.0-dev-873+g71ad771ea"
+      placeholder: "NVIM v0.11.0-dev-194+g6c7677e5d"
     validations:
       required: true
   - type: input
@@ -69,16 +69,16 @@ body:
       description: "Which branch are you currently on? If you are not sure, check the output of `git rev-parse --abbrev-ref HEAD`"
       options:
         - main (Default/Latest)
-        - 0.8 (Legacy)
-        - 0.7 (Deprecated)
-        - 0.10 (Nightly)
+        - 0.9 (Legacy)
+        - 0.8 (Deprecated)
+        - 0.11 (Nightly)
     validations:
       required: true
   - type: dropdown
     id: fetch-pref
     attributes:
       label: "Fetch Preferences"
-      description: "In what way do you fetch resources? If you are not sure, check the value of `use_ssh` in `lua/core/settings.lua`"
+      description: "In what way do you fetch resources? If you are not sure, check the value of `use_ssh` in `lua/user/settings.lua`"
       options:
         - SSH (use_ssh = true)
         - HTTPS (use_ssh = false)

diff --git a/.github/ISSUE_TEMPLATE/custom_config.yml b/.github/ISSUE_TEMPLATE/custom_config.yml
@@ -7,7 +7,7 @@ body:
       value: |
         _Before requesting:_ Make sure you've read through our [Wiki: Usage](https://github.com/ayamir/nvimdots/wiki/Usage) before you start to add things to nvimdots!
         > [!IMPORTANT]
-        > The `0.10` branch is intended for nightly neovim builds and is **not** stable. It typically harbors subtle issues scattered throughout. Therefore, refrain from submitting issues if you happen to encounter them. They will be closed directly unless a viable solution is proposed or included.
+        > The `0.11` branch is intended for nightly Neovim builds and is **not** stable. It typically harbors subtle issues scattered throughout. Therefore, refrain from submitting issues if you happen to encounter them. They will be closed directly unless a viable solution is proposed or included.
   - type: checkboxes
     id: is-latest-commit
     attributes:
@@ -30,7 +30,7 @@ body:
     attributes:
       label: "Neovim version"
       description: "Paste the output of `nvim --version` here"
-      placeholder: "NVIM v0.10.0-dev-873+g71ad771ea"
+      placeholder: "NVIM v0.11.0-dev-194+g6c7677e5d"
     validations:
       required: true
   - type: dropdown
@@ -40,9 +40,9 @@ body:
       description: "This issue template mainly targets `main` branch. Check the output of `git rev-parse --abbrev-ref HEAD` if you're not sure."
       options:
         - main (Default/Latest)
-        - 0.8 (Legacy)
-        - 0.7 (Deprecated)
-        - 0.10 (Nightly)
+        - 0.9 (Legacy)
+        - 0.8 (Deprecated)
+        - 0.11 (Nightly)
     validations:
       required: true
 

diff --git a/.github/ISSUE_TEMPLATE/lsp_issue_report.yml b/.github/ISSUE_TEMPLATE/lsp_issue_report.yml
@@ -7,7 +7,7 @@ body:
       value: |
         _Before reporting:_ Search [existing issues](https://github.com/ayamir/nvimdots/issues) and check the [FAQ](https://github.com/ayamir/nvimdots/wiki/Issues). Thank you for helping us improve!
         > [!IMPORTANT]
-        > The `0.10` branch is intended for nightly neovim builds and is **not** stable. It typically harbors subtle issues scattered throughout. Therefore, refrain from submitting issues if you happen to encounter them. They will be closed directly unless a viable solution is proposed or included.
+        > The `0.11` branch is intended for nightly Neovim builds and is **not** stable. It typically harbors subtle issues scattered throughout. Therefore, refrain from submitting issues if you happen to encounter them. They will be closed directly unless a viable solution is proposed or included.
   - type: checkboxes
     id: is-latest-commit
     attributes:
@@ -38,7 +38,7 @@ body:
     attributes:
       label: "Neovim version"
       description: "Paste the output of `nvim --version` here"
-      placeholder: "NVIM v0.10.0-dev-873+g71ad771ea"
+      placeholder: "NVIM v0.11.0-dev-194+g6c7677e5d"
     validations:
       required: true
   - type: input
@@ -69,16 +69,16 @@ body:
       description: "Which branch are you currently on? If you are not sure, check the output of `git rev-parse --abbrev-ref HEAD`"
       options:
         - main (Default/Latest)
-        - 0.8 (Legacy)
-        - 0.7 (Deprecated)
-        - 0.10 (Nightly)
+        - 0.9 (Legacy)
+        - 0.8 (Deprecated)
+        - 0.11 (Nightly)
     validations:
       required: true
   - type: dropdown
     id: fetch-pref
     attributes:
       label: "Fetch Preferences"
-      description: "In what way do you fetch resources? If you are not sure, check the value of `use_ssh` in `lua/core/settings.lua`"
+      description: "In what way do you fetch resources? If you are not sure, check the value of `use_ssh` in `lua/user/settings.lua`"
       options:
         - SSH (use_ssh = true)
         - HTTPS (use_ssh = false)

diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -3,8 +3,8 @@
     <br>
     <a href="https://github.com/neovim/neovim/releases/tag/stable">
     <img
-        alt="NeoVim Version Capability"
-        src="https://img.shields.io/badge/Supports%20Nvim-v0.9-A6D895?style=for-the-badge&colorA=363A4F&logo=neovim&logoColor=D9E0EE">
+        alt="Neovim Version Capability"
+        src="https://img.shields.io/badge/Supports%20Nvim-v0.10-A6D895?style=for-the-badge&colorA=363A4F&logo=neovim&logoColor=D9E0EE">
     </a>
     <a href="https://github.com/ayamir/nvimdots/releases">
     <img
@@ -36,23 +36,23 @@
 
 ## 🪷 Introduction
 
-This repo hosts our [NeoVim](https://neovim.io/) configuration for Linux [(with NixOS support)](#nixos-support), macOS, and Windows. `init.lua` is the config entry point.
+This repo hosts our [Neovim](https://neovim.io/) configuration for Linux [(with NixOS support)](#nixos-support), macOS, and Windows. `init.lua` is the config entry point.
 
 Branch info:
 
 <div align="center">
 
-| Branch | Supported neovim version |
+| Branch | Supported Neovim version |
 | :----: | :----------------------: |
-|  main  |     nvim 0.9 stable      |
-|  0.10  |    nvim 0.10 nightly     |
+|  main  |     nvim 0.10 stable     |
+|  0.11  |    nvim 0.11 nightly     |
+|  0.9   |         nvim 0.9         |
 |  0.8   |         nvim 0.8         |
-|  0.7   |         nvim 0.7         |
 
 </div>
 
 > [!IMPORTANT]
-> The `0.10` branch is intended for nightly neovim builds and is **not** stable. It typically harbors subtle issues scattered throughout. Therefore, refrain from submitting issues if you happen to encounter them. They will be closed directly unless a viable solution is proposed or included.
+> The `0.11` branch is intended for nightly Neovim builds and is **not** stable. It typically harbors subtle issues scattered throughout. Therefore, refrain from submitting issues if you happen to encounter them. They will be closed directly unless a viable solution is proposed or included.
 
 We currently manage plugins using [lazy.nvim](https://github.com/folke/lazy.nvim).
 
@@ -61,14 +61,14 @@ Chinese introduction is [here](https://zhuanlan.zhihu.com/p/382092667).
 ### 🎐 Features
 
 - **Fast.** Less than **30ms** to start (Depends on SSD and CPU, tested on Zephyrus G14 2022 version).
-- **Simple.** Run out of the box.
+- **Simple.** Runs out of the box.
 - **Modern.** Pure `lua` config.
 - **Modular.** Easy to customize.
 - **Powerful.** Full functionality to code.
 
 ## 🏗 How to Install
 
-Just run the following interactive bootstrap command, and you're good to go 👍
+Simply run the following interactive bootstrap command, and you should be all set 👍
 
 - **Windows** _(Note: This script REQUIRES `pwsh` > `v7.1`)_
 
@@ -204,7 +204,7 @@ It's strongly recommended to read [Wiki: Prerequisites](https://github.com/ayami
 
 ## 📜 License
 
-This NeoVim configuration is released under the MIT license, which grants the following permissions:
+This Neovim configuration is released under the MIT license, which grants the following permissions:
 
 - Commercial use
 - Distribution

diff --git a/flake.lock b/flake.lock