Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ayamir main #46

Merged
merged 44 commits into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
2fedc08
feat(luasnip): support ECMAScript regexes (#1291)
Jint-lzxy Jun 16, 2024
9937d58
feat(core): use the lua API to set options (#1292)
Jint-lzxy Jun 17, 2024
a04cb81
chore(nix): cleanup (#1252)
Jint-lzxy Jun 17, 2024
4014842
chore(lockfile): auto update lazy-lock.json
github-actions[bot] Jun 18, 2024
80cda84
feat: include several new plugins (#1235)
CharlesChiuGit Jun 18, 2024
3166eef
feat: better way to check if the (T|G)UI is running (#1297)
Jint-lzxy Jun 18, 2024
7e11cdc
chore(global): cleanup legacy code (#1296)
Jint-lzxy Jun 18, 2024
4d76779
feat: reduce the use of direct syscalls (#1294)
Jint-lzxy Jun 18, 2024
4e614a3
fix(events): avoid name clashes (#1295)
Jint-lzxy Jun 18, 2024
1ed46db
Merge from ayamir-main 0.10
TonyWu20 Jun 19, 2024
9b49c2f
Use 0.9.0 version of `gitsign` to suppress the deprecated warnings po…
TonyWu20 Jun 19, 2024
fdda879
chore(lockfile): auto update flake.lock
github-actions[bot] Jul 1, 2024
5084976
feat!: nvim v0.10 support (#1260)
ayamir Jul 1, 2024
14d7be7
docs: update startup time. (#1318)
ayamir Jul 2, 2024
ba1ab45
chore(lockfile): auto update lazy-lock.json
github-actions[bot] Jul 2, 2024
f83d276
feat(cmp): deduplicate results from `nvim-lsp` (#1321)
Jint-lzxy Jul 9, 2024
8377bb0
chore(lockfile): auto update lazy-lock.json
github-actions[bot] Jul 10, 2024
ecb6b79
feat(which-key)!: support `v3` (#1324)
Jint-lzxy Jul 16, 2024
884f64b
chore(lockfile): auto update lazy-lock.json
github-actions[bot] Jul 17, 2024
2829a43
fix(which-key): config option `modes` has been deprecated (#1326)
Jint-lzxy Jul 20, 2024
ea3eaac
feat(lualine): always display BOM as part of the filetype (#1327)
Jint-lzxy Jul 20, 2024
e8f85fa
chore(lockfile): auto update lazy-lock.json
github-actions[bot] Jul 21, 2024
3828f4b
chore(lockfile): auto update flake.lock
github-actions[bot] Aug 1, 2024
ccf0464
feat: add `render-markdown.nvim` for md workflow (#1336)
CharlesChiuGit Aug 9, 2024
c9becdf
chore(lockfile): auto update lazy-lock.json
github-actions[bot] Aug 10, 2024
c9dea9d
fix(core): disable rtp plugins via `lazy.nvim`, #1339 (#1340)
CharlesChiuGit Aug 12, 2024
fb942c5
chore(lockfile): auto update lazy-lock.json
github-actions[bot] Aug 13, 2024
6c3f197
feat(persisted): update for recent code rewrite (#1338)
Jint-lzxy Aug 13, 2024
8d81c66
chore(lockfile): auto update lazy-lock.json
github-actions[bot] Aug 14, 2024
360ec25
fix: some vim plugins get disabled by mistake (#1341)
Jint-lzxy Aug 21, 2024
88b841d
Zen-mode
TonyWu20 Aug 21, 2024
1eabd73
Merged from `ayamir/nvimdots`
TonyWu20 Aug 21, 2024
05663e8
chore(lockfile): auto update lazy-lock.json
github-actions[bot] Aug 22, 2024
7bac911
Try to add wgsl_analyzer config
TonyWu20 Aug 24, 2024
a204e7d
Merged from `ayamir/nvimdots`
TonyWu20 Aug 24, 2024
a00b281
Merged from `ayamir/nvimdots`
TonyWu20 Aug 24, 2024
13b25a5
chore(lockfile): auto update flake.lock
github-actions[bot] Sep 1, 2024
99e136e
feat(lsp): `tsserver` renamed to `ts_ls` (#1346)
Jint-lzxy Sep 7, 2024
709bff0
feat(clang_format): disable formatting for all Java files (#1347)
Jint-lzxy Sep 7, 2024
233a53d
fix(pack): inconsistent docstring (#1348)
Jint-lzxy Sep 7, 2024
1e2f498
chore(lockfile): auto update lazy-lock.json
github-actions[bot] Sep 8, 2024
28c4cde
fix(core): correct GUI detection post v0.10.2 (#1349)
Jint-lzxy Sep 10, 2024
6c19335
chore(lockfile): auto update lazy-lock.json
github-actions[bot] Sep 11, 2024
4546c21
Merged from `ayamir/nvimdots`
TonyWu20 Sep 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint_code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ jobs:
- uses: actions/checkout@v4
- uses: lunarmodules/luacheck@v1
with:
args: . --std luajit --globals vim _toggle_lazygit _buf_vtext _command_panel _flash_esc_or_noh _debugging --max-line-length 150 --no-config
args: . --std luajit --globals vim _debugging _command_panel _flash_esc_or_noh _telescope_collections _toggle_lazygit --max-line-length 150 --no-config
2 changes: 0 additions & 2 deletions .github/workflows/update_flake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ jobs:
contents: write
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Required to count the commits
- uses: cachix/install-nix-action@v26
with:
nix_path: nixpkgs=channel:nixos-unstable
Expand Down
41 changes: 25 additions & 16 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,30 @@
MIT License
BSD 3-Clause License

Copyright (c) 2021 ayamir
Copyright (c) 2022 Jint-lzxy, CharlesChiuGit
Copyright (c) 2023 aarnphm, misumisumi

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ 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).
- **Fast.** Less than **50ms** to start (Depends on SSD and CPU, tested on Zephyrus G14 2022 version).
- **Simple.** Runs out of the box.
- **Modern.** Pure `lua` config.
- **Modular.** Easy to customize.
Expand Down Expand Up @@ -197,14 +197,16 @@ It's strongly recommended to read [Wiki: Prerequisites](https://github.com/ayami
- [ayamir](https://github.com/ayamir)
- [Jint-lzxy](https://github.com/Jint-lzxy)
- [CharlesChiuGit](https://github.com/CharlesChiuGit)
- [aarnphm](https://github.com/aarnphm)
- [misumisumi](https://github.com/misumisumi)

## 🎉 Acknowledgement

- [glepnir/nvim](https://github.com/glepnir/nvim)

## 📜 License

This Neovim configuration is released under the MIT license, which grants the following permissions:
This Neovim configuration is released under the BSD 3-Clause license, which grants the following permissions:

- Commercial use
- Distribution
Expand Down
72 changes: 19 additions & 53 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,21 @@
name = "check-linker";
text =
let
ldd_cmd = if pkgs.stdenv.isDarwin then "otool -L" else "${pkgs.glibc.bin}/bin/ldd";
ldd_cmd = if pkgs.stdenv.isDarwin then "xcrun otool -L" else "${pkgs.glibc.bin}/bin/ldd";
in
''
#shellcheck disable=SC1090
source <(sed -ne :1 -e 'N;1,1b1' -e 'P;D' "${self.packages.${system}.testEnv}/home-path/bin/nvim")
echo "check file under ''${XDG_DATA_HOME}/''${NVIM_APPNAME:-nvim}/mason/bin"
source <(sed -ne :1 -e 'N;1,1b1' -e 'P;D' "${self.packages.${system}.testEnv}/home-path/bin/nvim")
echo "Checking files under ''${XDG_DATA_HOME}/''${NVIM_APPNAME:-nvim}/mason/bin..."
find "''${XDG_DATA_HOME}/''${NVIM_APPNAME:-nvim}/mason/bin" -type l | while read -r link; do
"${ldd_cmd}" "$(readlink -f "$link")" > /dev/zero 2>&1 || continue
linkers=$("${ldd_cmd}" "$(readlink -f "$link")" | tail -n+2)
echo "$linkers" | while read -r line; do
[ -z "$line" ] && continue
echo "$line" | grep -q "/nix/store" || printf '%s: %s do not link to /nix/store \n' "$(basename "$link")" "$line"
echo "$line" | grep -q "/nix/store" || printf '%s: %s does not link to /nix/store \n' "$(basename "$link")" "$line"
done
done
echo "check done"
echo "*** Done ***"
'';
};
};
Expand All @@ -69,7 +69,7 @@
motd = ''
{202}🔨 Welcome to devshell{reset}
Symlink configs to "''${XDG_CONFIG_HOME}"/nvimdots!
And NVIM_APPNAME=nvimdots is already configured, so neovim will put file under "\$XDG_xxx_HOME"/nvimdots.
And NVIM_APPNAME=nvimdots is already configured, so neovim will put files under "\$XDG_xxx_HOME"/nvimdots.
To uninstall, remove "\$XDG_xxx_HOME"/nvimdots.

$(type -p menu &>/dev/null && menu)
Expand Down
Loading