From 2fedc0861fb0bf4fc2e43886d51cb6bec32ed8dc Mon Sep 17 00:00:00 2001 From: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Date: Sun, 16 Jun 2024 16:28:18 +0800 Subject: [PATCH 01/40] feat(luasnip): support ECMAScript regexes (#1291) As per `:h luasnip-lsp-snippets-transformations` Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --- lua/modules/plugins/completion.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/modules/plugins/completion.lua b/lua/modules/plugins/completion.lua index d4b5d088d..aba34cae3 100644 --- a/lua/modules/plugins/completion.lua +++ b/lua/modules/plugins/completion.lua @@ -51,8 +51,9 @@ completion["hrsh7th/nvim-cmp"] = { dependencies = { { "L3MON4D3/LuaSnip", - dependencies = { "rafamadriz/friendly-snippets" }, + build = "make install_jsregexp", config = require("completion.luasnip"), + dependencies = { "rafamadriz/friendly-snippets" }, }, { "lukas-reineke/cmp-under-comparator" }, { "saadparwaiz1/cmp_luasnip" }, From 9937d589db509b0bc8ae19eaf077aa0ddd428f7f Mon Sep 17 00:00:00 2001 From: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Date: Mon, 17 Jun 2024 11:22:03 +0800 Subject: [PATCH 02/40] feat(core): use the lua API to set options (#1292) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --- lua/core/init.lua | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lua/core/init.lua b/lua/core/init.lua index a6ebc62cc..6a49d0da0 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -161,10 +161,8 @@ local load_core = function() require("core.pack") require("keymap") - local colorscheme = settings.colorscheme - local background = settings.background - vim.api.nvim_command("set background=" .. background) - vim.api.nvim_command("colorscheme " .. colorscheme) + vim.api.nvim_set_option_value("background", settings.background, {}) + vim.cmd.colorscheme(settings.colorscheme) end load_core() From a04cb81f1c20db8334447a8433b24a34ac3aa0a2 Mon Sep 17 00:00:00 2001 From: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Date: Mon, 17 Jun 2024 16:36:29 +0800 Subject: [PATCH 03/40] chore(nix): cleanup (#1252) * chore(nix): cleanup This commit introduced three changes: 1. Opt for a shallow clone whenever we run the `update_flake` workflow since there's no need to retrive past commits. 2. Deleted `result` from `.gitignore` bc I couldn't track down its source (correct me if I'm wrong!) 3. Ensure either XCode or the CLT is installed on macOS before running `otool`. These aren't included by default on a fresh macOS install, and using `xcrun` can sort out those dependency snags. Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * revert(gitignore): add `result/` back Signed-off-by: Charles Chiu --------- Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: Charles Chiu Co-authored-by: Charles Chiu --- .github/workflows/update_flake.yml | 2 -- flake.nix | 12 ++++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/update_flake.yml b/.github/workflows/update_flake.yml index 88090f3b7..9d9e31c51 100644 --- a/.github/workflows/update_flake.yml +++ b/.github/workflows/update_flake.yml @@ -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 diff --git a/flake.nix b/flake.nix index f24cfc588..9dd3840c7 100644 --- a/flake.nix +++ b/flake.nix @@ -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 ***" ''; }; }; @@ -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) From 401484274b26f92007d7371c50831229589817d5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 01:51:07 +0000 Subject: [PATCH 04/40] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 96 +++++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 1028a4ede..43e8c7c95 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,12 +1,12 @@ { - "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" }, - "aerial.nvim": { "branch": "master", "commit": "bd5f141a547c082e9c1644026f38590407dad659" }, + "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, + "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, + "aerial.nvim": { "branch": "master", "commit": "eb25396dae306cef5b8fffbe9ae98283d2f1c199" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "autoclose.nvim": { "branch": "main", "commit": "dc42806540dcf448ecb2bad6b67204410cfbe629" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, - "catppuccin": { "branch": "refactor/syntax-highlighting", "commit": "389473c8f4cfcbf430d05a19cabee62fae2ca808" }, + "catppuccin": { "branch": "refactor/syntax-highlighting", "commit": "e34171a3273e6a2c881f28ae36b8b37a2c84f196" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-latex-symbols": { "branch": "main", "commit": "165fb66afdbd016eaa1570e41672c4c557b57124" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, @@ -17,80 +17,80 @@ "cmp-treesitter": { "branch": "master", "commit": "c8e3a74b51597d69d240085a258636972ce98e15" }, "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, - "crates.nvim": { "branch": "main", "commit": "d556c00d60c9421c913ee54ff690df2a34f6264e" }, - "csv.vim": { "branch": "master", "commit": "962f88787ec6873eba1c7dbbd81d2723f1ee3c4b" }, - "diffview.nvim": { "branch": "main", "commit": "3afa6a053f680e9f1329c4a151db988a482306cd" }, + "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, + "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, + "crates.nvim": { "branch": "main", "commit": "3ab99ade2c9a9d4291a8424c03db9a3be9862a72" }, + "csv.vim": { "branch": "master", "commit": "4d5255829afe3b6badb0c8a040116704c0d3213c" }, + "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" }, - "flash.nvim": { "branch": "main", "commit": "11a2e667d19d8f48c93c6ed2e2e525ac6b1b79be" }, - "friendly-snippets": { "branch": "main", "commit": "d0610077b6129cf9f7f78afbe3a1425d60f6e2f1" }, - "fzf": { "branch": "master", "commit": "124cd70710cb7c94ef2282773494bb0d727598d8" }, + "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, + "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, + "fzf": { "branch": "master", "commit": "e2401aca68acb86f6dead826acf7499b11d96a10" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, - "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" }, + "gitsigns.nvim": { "branch": "main", "commit": "47c8e3e571376b24de62408fd0c9d12f0a9fc0a3" }, "glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" }, - "go.nvim": { "branch": "master", "commit": "8f8ab4b968d08bd70ecda1f2909fb5e6177452ca" }, - "guihua.lua": { "branch": "master", "commit": "a53b76514ad42d92a821d75d712ef71e71898fcf" }, + "go.nvim": { "branch": "master", "commit": "fca26b05699ad06c077721823a0b1a8e02539d5c" }, + "guihua.lua": { "branch": "master", "commit": "225db770e36aae6a1e9e3a65578095c8eb4038d3" }, "hop.nvim": { "branch": "master", "commit": "036462a345792279c58f2f6445756efab706f04a" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "eab487c2520f0fe9e54eb5e3ea0606e20512492e" }, + "lazy.nvim": { "branch": "main", "commit": "cd6a8293430a7fadf6a093dfdfbdb1ddbaf8ae7d" }, "local-highlight.nvim": { "branch": "master", "commit": "ae3ada3a332128b1036c84c8587b9069891c63da" }, "lsp-format-modifications.nvim": { "branch": "main", "commit": "006d4cd88f4f09fdc4375fcb75dd5b7d981a723b" }, - "lsp_signature.nvim": { "branch": "master", "commit": "8528ff659a2a7a463c0c51383bf7ecf219714413" }, - "lspsaga.nvim": { "branch": "main", "commit": "4e9d6162863d2f532751db91a1193cfe1f3a4361" }, + "lsp_signature.nvim": { "branch": "master", "commit": "52fc14a45244b04a37160b20fa938f48ccd59ef1" }, + "lspsaga.nvim": { "branch": "main", "commit": "6f920cfabddb9b7de5a3a4d0b7cd4f0774ae23e2" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" }, - "mason.nvim": { "branch": "main", "commit": "0fb4e56837f13b81a972fcc0554be1327b39061e" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "f5425eb1d0d794f0305d5eeebddabb74614683ff" }, + "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, "mini.align": { "branch": "main", "commit": "68a8d3205f0e7ce1bded057f4a851f42ef8fc584" }, - "neoconf.nvim": { "branch": "main", "commit": "f1fd38d61d11f3b1b3e7dc75dc667f79cf2fa58b" }, + "neoconf.nvim": { "branch": "main", "commit": "83d78b9fb3729e2ce9bd4066cf62ab47f946072f" }, "neodim": { "branch": "master", "commit": "9477da03b93f1984a81fee3b92e6ac7c6ada6aa4" }, "neoscroll.nvim": { "branch": "master", "commit": "a731f66f1d39ec6175fd201c5bf849e54abda99c" }, - "none-ls.nvim": { "branch": "main", "commit": "f5b960a73418249aebcdae3455de320360509253" }, - "nvim-bqf": { "branch": "main", "commit": "7751b6ef9fbc3907478eaf23e866c4316a2ed1b4" }, + "none-ls.nvim": { "branch": "main", "commit": "cc0a3c45047e3daf85d07c1571d65476cfce6480" }, + "nvim-bqf": { "branch": "main", "commit": "1b24dc6050c34e8cd377b6b4cd6abe40509e0187" }, "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" }, - "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, + "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, - "nvim-dap": { "branch": "master", "commit": "09b54e03d43d967c062a7d5b1da445f04e6f3113" }, + "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, - "nvim-lspconfig": { "branch": "master", "commit": "710a8fa7379db32199545f30ea01dd8446b9302f" }, - "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" }, + "nvim-lspconfig": { "branch": "master", "commit": "bd7c76375a511994c9ca8d69441f134dc10ae3bd" }, + "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-scrollview": { "branch": "main", "commit": "9257c3f3ebf7608a8711caf44f878d87cd40395d" }, - "nvim-spectre": { "branch": "master", "commit": "366f46fdd4a1593cc237aea13d5ef113739a472c" }, - "nvim-tree.lua": { "branch": "master", "commit": "5a87ffe35c4739ffb6b62052572583ad277a20ae" }, + "nvim-scrollview": { "branch": "main", "commit": "fd334e5ad0c616987d1b9114890a59c97165cf83" }, + "nvim-spectre": { "branch": "master", "commit": "ec67d4b5370094b923dfcf6b09b39142f2964861" }, + "nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" }, "nvim-treehopper": { "branch": "master", "commit": "13559079e33665a310d9ccf0e43f4e9bb9f337e2" }, - "nvim-treesitter": { "branch": "master", "commit": "b7d50e59b1b2990b3ce8761d4cf595f4b71c87e2" }, - "nvim-treesitter-context": { "branch": "master", "commit": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "3557e41418b4a6c5b85d5d64abe94c9c50fa9b14" }, - "nvim-ts-autotag": { "branch": "main", "commit": "bcf3146864262ef2d3c877beba3e222b5c73780d" }, + "nvim-treesitter": { "branch": "master", "commit": "c29989f5d735a30b6d2350b54d5cd50be811f8b2" }, + "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, + "nvim-ts-autotag": { "branch": "main", "commit": "06fe07d7523ba8c755fac7c913fceba43b1720ee" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, - "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, + "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, "paint.nvim": { "branch": "main", "commit": "6ce64212804f425073c61ab0d9c2b034f0435260" }, - "persisted.nvim": { "branch": "main", "commit": "2b4f192aca7d6665066c4fe94b25e98d657811aa" }, + "persisted.nvim": { "branch": "main", "commit": "0a9eebf5cc92b1113a382a660ee73f21ffd62ae7" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "0f314613125fdd7c85faaee3c87051611d883253" }, - "rustaceanvim": { "branch": "master", "commit": "2fa45427c01ded4d3ecca72e357f8a60fd8e46d4" }, - "smart-splits.nvim": { "branch": "master", "commit": "1064164ed25fd266dfb9cfe5c456617a2b2aceaa" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "5c9660801ce345cd3835e1947c12b54290ab7e71" }, + "rustaceanvim": { "branch": "master", "commit": "1e7600b370db3caf37a1cd867e00aac27597a114" }, + "smart-splits.nvim": { "branch": "master", "commit": "3d9fa9e4b31c30d6b328f2447a4dc7dceffbc2ea" }, "smartyank.nvim": { "branch": "master", "commit": "d9e078fe08d6466e37ea45ac446a9f60e6866789" }, - "sniprun": { "branch": "master", "commit": "9006d4af4f7016523f8619ae1526ab4e7f0df785" }, + "sniprun": { "branch": "master", "commit": "1420cff041a0582636f63960d7160f7832463c10" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "8783a062f76ffa2c328fa98288a404f478d78908" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "1f2e9b07ac7f927f36c17313071cc12759670767" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, - "telescope-live-grep-args.nvim": { "branch": "master", "commit": "4122e146d199c0d6d1cfb359c76bc1250d522460" }, + "telescope-live-grep-args.nvim": { "branch": "master", "commit": "8ad632f793fd437865f99af5684f78300dac93fb" }, "telescope-undo.nvim": { "branch": "main", "commit": "95b61c01ea3a4c9e8747731148e905bbcf0ccaee" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, - "telescope.nvim": { "branch": "master", "commit": "dfa230be84a044e7f546a6c2b0a403c739732b86" }, - "todo-comments.nvim": { "branch": "main", "commit": "e1549807066947818113a7d7ed48f637e49620d3" }, + "telescope.nvim": { "branch": "master", "commit": "c392f1b78eaaf870ca584bd698e78076ed301b26" }, + "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" }, "toggleterm.nvim": { "branch": "main", "commit": "fee58a0473fd92b28c34f8f724e4918b15ba30a3" }, - "trouble.nvim": { "branch": "main", "commit": "d7f69ff5638cf1864cabac54ade1b1694adfe085" }, + "trouble.nvim": { "branch": "main", "commit": "58a3acfc6d8d819324dab4c87068596319032e64" }, "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" }, - "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" }, + "vim-fugitive": { "branch": "master", "commit": "64d6cafb9dcbacce18c26d7daf617ebb96b273f3" }, "vim-matchup": { "branch": "master", "commit": "1535a769d5dca851fe7d41b0be95f7c7203a4bef" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, - "which-key.nvim": { "branch": "main", "commit": "4b7167f8fb2dba3d01980735e3509e172c024c29" }, + "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" }, "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" } } \ No newline at end of file From 80cda843117e1ae957ba2c954a206b6df57aaa92 Mon Sep 17 00:00:00 2001 From: Charles Chiu Date: Tue, 18 Jun 2024 13:39:24 +0800 Subject: [PATCH 05/40] feat: include several new plugins (#1235) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(cmp): more completion candidates from opened buffers. (#1219) * buffer completion config * opts -> option * chore(lockfile): auto update lazy-lock.json * chore(plugins): tidying up (#1221) This commit mainly tweaks the loading events of some plugins to align with upstream specifications. Additionally, there have been enhancements made to certain documentation. Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix(plugins): remove duplicate specifications Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix: use `init` for vim plugins (#1222) Signed-off-by: ayamir * chore(lockfile): auto update lazy-lock.json * docs: mention the experimental nature of the 0.10 branch (#1215) * docs: add note for 0.10 nightly branch in readme. Signed-off-by: ayamir * chore(issue_template): add nightly warning Signed-off-by: Charles Chiu * chore(issue_tempate): linting Signed-off-by: Charles Chiu * docs: update readme for 0.10 branch. Co-authored-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: Mohu * chore(issue_template): add nightly warning Signed-off-by: Charles Chiu * chore(issue_template): add nightly warning Signed-off-by: Charles Chiu --------- Signed-off-by: ayamir Signed-off-by: Charles Chiu Signed-off-by: Mohu Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> Co-authored-by: Charles Chiu Co-authored-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix(ISSUE_TEMPLATE): format code Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix(README): misplaced content Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix(todo-comment): add missing keywords (#1225) Signed-off-by: Charles Chiu * chore(lockfile): auto update lazy-lock.json * fix(options): remove options managed by `vim-sleuth` (#1229) Since all tab-related stuff is now managed by `vim-sleuth`, I think it is better to remove the relevant options to avoid confusion. Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * chore(lockfile): auto update lazy-lock.json * fix(rustaceanvim): use `init` for its config (#1231) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * chore(lockfile): auto update lazy-lock.json * feat!: improve go development experience (#1226) * chore(go): replace vim-go with go.nvim. Signed-off-by: ayamir * fix: install gopls by mason by default. Signed-off-by: ayamir * feat(keymap): set `n|gi` to goto implementation. Signed-off-by: ayamir * chore(keymap): use `gm` to jump to lsp implementations Co-authored-by: 冷酔閑吟 <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: Mohu * fixup: remove unused `map_cu`. * chore: use gopls instead of null-ls to format. Signed-off-by: ayamir * chore: add notes for config options. Signed-off-by: ayamir * fixup: tidy settings for go.nvim and gopls. * docs: update more notes for how to config go.nvim. * chore: cleanup Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix: enable only the options that are truly necessary Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fixup! chore: cleanup * fix(gopls): invalid config entry Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --------- Signed-off-by: ayamir Signed-off-by: Mohu Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> Co-authored-by: 冷酔閑吟 <50296129+Jint-lzxy@users.noreply.github.com> Co-authored-by: neogtliu * feat!: add `advanced-git-search.nvim` * feat!: add `search.nvim` to enhance `telescope`. * feat: reorganize keymaps for telescope search collections. Signed-off-by: ayamir * fixup: update descriptions for modified keymaps. * chore: remove single diagnostic disable for undefined-field. Co-authored-by: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: Mohu * chore: remove diagnostic disable for undefined-field. * feat!: replace `colorizer.lua` with `nvim-highlight-colors` * fix: invoke `utils.load_plugin` Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * chore(advanced-git-search): remove unused options Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * feat(telescope): add collection panel for `search.nvim` * chore: typo * feat: more documentation Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * chore: clean up * feat: don't hard-code collection names * chore: use custom loader * fix: disable warning * fix: CI & cleanup Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * Revert `lazy-lock.json` Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix: make luaJIT happy Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --------- Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: ayamir Signed-off-by: Charles Chiu Signed-off-by: Mohu Co-authored-by: mjkx <52132505+mjkx5@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: 冷酔閑吟 <50296129+Jint-lzxy@users.noreply.github.com> Co-authored-by: Mohu Co-authored-by: neogtliu --- .github/workflows/lint_code.yml | 2 +- lua/core/mapping.lua | 1 + lua/keymap/helpers.lua | 27 ++++ lua/keymap/tool.lua | 44 +----- lua/modules/configs/editor/colorizer.lua | 3 - .../configs/editor/highlight-colors.lua | 31 +++++ lua/modules/configs/tool/search.lua | 130 ++++++++++++++++++ lua/modules/configs/tool/telescope.lua | 13 +- lua/modules/plugins/editor.lua | 11 +- lua/modules/plugins/tool.lua | 23 +++- 10 files changed, 224 insertions(+), 61 deletions(-) delete mode 100644 lua/modules/configs/editor/colorizer.lua create mode 100644 lua/modules/configs/editor/highlight-colors.lua create mode 100644 lua/modules/configs/tool/search.lua diff --git a/.github/workflows/lint_code.yml b/.github/workflows/lint_code.yml index 9e88fa59e..71d11c5e2 100644 --- a/.github/workflows/lint_code.yml +++ b/.github/workflows/lint_code.yml @@ -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 diff --git a/lua/core/mapping.lua b/lua/core/mapping.lua index cb0c061de..351216925 100644 --- a/lua/core/mapping.lua +++ b/lua/core/mapping.lua @@ -34,6 +34,7 @@ local core_map = { ["n|"] = map_cr("wq"):with_desc("edit: Save file and quit"), ["n|"] = map_cr("q!"):with_desc("edit: Force quit"), ["n|o"] = map_cr("setlocal spell! spelllang=en_us"):with_desc("edit: Toggle spell check"), + ["n|bn"] = map_cu("enew"):with_noremap():with_silent():with_desc("buffer: New"), ["n|tn"] = map_cr("tabnew"):with_noremap():with_silent():with_desc("tab: Create a new tab"), ["n|tk"] = map_cr("tabnext"):with_noremap():with_silent():with_desc("tab: Move to next tab"), ["n|tj"] = map_cr("tabprevious"):with_noremap():with_silent():with_desc("tab: Move to previous tab"), diff --git a/lua/keymap/helpers.lua b/lua/keymap/helpers.lua index b411bcd79..60d99e46f 100644 --- a/lua/keymap/helpers.lua +++ b/lua/keymap/helpers.lua @@ -11,6 +11,33 @@ _G._command_panel = function() }) end +_G._telescope_collections = function(picker_type) + local actions = require("telescope.actions") + local action_state = require("telescope.actions.state") + local conf = require("telescope.config").values + local finder = require("telescope.finders") + local pickers = require("telescope.pickers") + picker_type = picker_type or {} + + local collections = vim.tbl_keys(require("search.tabs").collections) + pickers + .new(picker_type, { + prompt_title = "Telescope Collections", + finder = finder.new_table({ results = collections }), + sorter = conf.generic_sorter(picker_type), + attach_mappings = function(bufnr) + actions.select_default:replace(function() + actions.close(bufnr) + local selection = action_state.get_selected_entry() + require("search").open({ collection = selection[1] }) + end) + + return true + end, + }) + :find() +end + _G._flash_esc_or_noh = function() local flash_active, state = pcall(function() return require("flash.plugins.char").state diff --git a/lua/keymap/tool.lua b/lua/keymap/tool.lua index 50eead580..bd928f082 100644 --- a/lua/keymap/tool.lua +++ b/lua/keymap/tool.lua @@ -84,50 +84,12 @@ local plug_map = { :with_noremap() :with_silent() :with_desc("tool: Toggle command panel"), - ["n|u"] = map_callback(function() - require("telescope").extensions.undo.undo() + ["n|f"] = map_callback(function() + _telescope_collections(require("telescope.themes").get_dropdown()) end) :with_noremap() :with_silent() - :with_desc("edit: Show undo history"), - ["n|fp"] = map_callback(function() - require("telescope").extensions.projects.projects({}) - end) - :with_noremap() - :with_silent() - :with_desc("find: Project"), - ["n|fr"] = map_callback(function() - require("telescope").extensions.frecency.frecency({}) - end) - :with_noremap() - :with_silent() - :with_desc("find: File by frecency"), - ["n|fw"] = map_callback(function() - require("telescope").extensions.live_grep_args.live_grep_args() - end) - :with_noremap() - :with_silent() - :with_desc("find: Word in project"), - ["n|fe"] = map_cu("Telescope oldfiles"):with_noremap():with_silent():with_desc("find: File by history"), - ["n|ff"] = map_cu("Telescope find_files"):with_noremap():with_silent():with_desc("find: File in project"), - ["n|fc"] = map_callback(function() - require("telescope.builtin").colorscheme({ enable_preview = true }) - end) - :with_noremap() - :with_silent() - :with_desc("ui: Change colorscheme for current session"), - ["n|bn"] = map_cu(":enew"):with_noremap():with_silent():with_desc("buffer: New"), - ["n|fg"] = map_cu("Telescope git_files") - :with_noremap() - :with_silent() - :with_desc("find: file in git project"), - ["n|fz"] = map_cu("Telescope zoxide list") - :with_noremap() - :with_silent() - :with_desc("edit: Change current directory by zoxide"), - ["n|fb"] = map_cu("Telescope buffers"):with_noremap():with_silent():with_desc("find: Buffer opened"), - ["nv|fs"] = map_cu("Telescope grep_string"):with_noremap():with_silent():with_desc("find: Current word"), - ["n|fd"] = map_cu("Telescope persisted"):with_noremap():with_silent():with_desc("find: Session"), + :with_desc("tool: Open Telescope"), -- Plugin: dap ["n|"] = map_callback(function() diff --git a/lua/modules/configs/editor/colorizer.lua b/lua/modules/configs/editor/colorizer.lua deleted file mode 100644 index efee45019..000000000 --- a/lua/modules/configs/editor/colorizer.lua +++ /dev/null @@ -1,3 +0,0 @@ -return function() - require("modules.utils").load_plugin("colorizer", {}) -end diff --git a/lua/modules/configs/editor/highlight-colors.lua b/lua/modules/configs/editor/highlight-colors.lua new file mode 100644 index 000000000..06a0f6acd --- /dev/null +++ b/lua/modules/configs/editor/highlight-colors.lua @@ -0,0 +1,31 @@ +return function() + require("modules.utils").load_plugin("nvim-highlight-colors", { + render = "background", + enable_hex = true, + enable_short_hex = true, + enable_rgb = true, + enable_hsl = true, + enable_var_usage = true, + enable_named_colors = false, + enable_tailwind = false, + -- Exclude filetypes or buftypes from highlighting + exclude_filetypes = { + "alpha", + "bigfile", + "dap-repl", + "fugitive", + "git", + "notify", + "NvimTree", + "Outline", + "TelescopePrompt", + "toggleterm", + "undotree", + }, + exclude_buftypes = { + "nofile", + "prompt", + "terminal", + }, + }) +end diff --git a/lua/modules/configs/tool/search.lua b/lua/modules/configs/tool/search.lua new file mode 100644 index 000000000..e01f50437 --- /dev/null +++ b/lua/modules/configs/tool/search.lua @@ -0,0 +1,130 @@ +return function() + local builtin = require("telescope.builtin") + local extensions = require("telescope").extensions + + require("modules.utils").load_plugin("search", { + collections = { + file = { + initial_tab = 1, + tabs = { + { + name = "Files", + tele_func = function(opts) + opts = opts or {} + if vim.fn.isdirectory(".git") == 1 then + builtin.git_files(opts) + else + builtin.find_files(opts) + end + end, + }, + { + name = "Frecency", + tele_func = function() + extensions.frecency.frecency() + end, + }, + { + name = "Oldfiles", + tele_func = function() + builtin.oldfiles() + end, + }, + }, + }, + live_grep = { + initial_tab = 1, + tabs = { + { + name = "Word in project", + tele_func = function() + extensions.live_grep_args.live_grep_args() + end, + }, + { + name = "Word under cursor", + tele_func = function(opts) + opts = opts or {} + builtin.grep_string(opts) + end, + }, + }, + }, + git = { + initial_tab = 1, + tabs = { + { + name = "Branches", + tele_func = function() + builtin.git_branches() + end, + }, + { + name = "Commits", + tele_func = function() + builtin.git_commits() + end, + }, + { + name = "Commit content", + tele_func = function() + extensions.advanced_git_search.search_log_content() + end, + }, + { + name = "Diff current file with commit", + tele_func = function() + extensions.advanced_git_search.diff_commit_file() + end, + }, + }, + }, + workspace = { + initial_tab = 1, + tabs = { + { + name = "Buffers", + tele_func = function() + builtin.buffers() + end, + }, + { + name = "Sessions", + tele_func = function() + extensions.persisted.persisted() + end, + }, + { + name = "Projects", + tele_func = function() + extensions.projects.projects({}) + end, + }, + { + name = "Zoxide", + tele_func = function() + extensions.zoxide.list() + end, + }, + }, + }, + misc = { + initial_tab = 1, + tabs = { + { + name = "Colorschemes", + tele_func = function() + builtin.colorscheme({ enable_preview = true }) + end, + }, + { + name = "Undo History", + tele_func = function() + extensions.undo.undo() + end, + }, + }, + }, + }, + }) +end diff --git a/lua/modules/configs/tool/telescope.lua b/lua/modules/configs/tool/telescope.lua index d8fdddd44..71884d085 100644 --- a/lua/modules/configs/tool/telescope.lua +++ b/lua/modules/configs/tool/telescope.lua @@ -64,7 +64,6 @@ return function() }, live_grep_args = { auto_quoting = true, -- enable/disable auto-quoting - -- define mappings, e.g. mappings = { -- extend mappings i = { [""] = lga_actions.quote_prompt(), @@ -74,18 +73,19 @@ return function() }, undo = { side_by_side = true, - mappings = { -- this whole table is the default + mappings = { i = { - -- IMPORTANT: Note that telescope-undo must be available when telescope is configured if - -- you want to use the following actions. This means installing as a dependency of - -- telescope in it's `requirements` and loading this extension from there instead of - -- having the separate plugin definition as outlined above. See issue #6. [""] = require("telescope-undo.actions").yank_additions, [""] = require("telescope-undo.actions").yank_deletions, [""] = require("telescope-undo.actions").restore, }, }, }, + advanced_git_search = { + diff_plugin = "diffview", + git_flags = { "-c", "delta.side-by-side=true" }, + entry_default_author_or_date = "author", -- one of "author" or "date" + }, }, }) @@ -98,4 +98,5 @@ return function() require("telescope").load_extension("zoxide") require("telescope").load_extension("persisted") require("telescope").load_extension("aerial") + require("telescope").load_extension("advanced_git_search") end diff --git a/lua/modules/plugins/editor.lua b/lua/modules/plugins/editor.lua index 73b273351..b25003e12 100644 --- a/lua/modules/plugins/editor.lua +++ b/lua/modules/plugins/editor.lua @@ -63,9 +63,14 @@ editor["smoka7/hop.nvim"] = { } editor["tzachar/local-highlight.nvim"] = { lazy = true, - event = { "CursorHold", "CursorHoldI" }, + event = { "BufReadPost", "BufAdd", "BufNewFile" }, config = require("editor.local-highlight"), } +editor["brenoprata10/nvim-highlight-colors"] = { + lazy = true, + event = { "CursorHold", "CursorHoldI" }, + config = require("editor.highlight-colors"), +} editor["romainl/vim-cool"] = { lazy = true, event = { "CursorMoved", "InsertEnter" }, @@ -109,10 +114,6 @@ editor["nvim-treesitter/nvim-treesitter"] = { "windwp/nvim-ts-autotag", config = require("editor.autotag"), }, - { - "NvChad/nvim-colorizer.lua", - config = require("editor.colorizer"), - }, { "hiphish/rainbow-delimiters.nvim", config = require("editor.rainbow_delims"), diff --git a/lua/modules/plugins/tool.lua b/lua/modules/plugins/tool.lua index 33fb33424..37be1ed8e 100644 --- a/lua/modules/plugins/tool.lua +++ b/lua/modules/plugins/tool.lua @@ -80,18 +80,31 @@ tool["nvim-telescope/telescope.nvim"] = { cmd = "Telescope", config = require("tool.telescope"), dependencies = { - { "nvim-tree/nvim-web-devicons" }, { "nvim-lua/plenary.nvim" }, + { "nvim-tree/nvim-web-devicons" }, + { "jvgrootveld/telescope-zoxide" }, { "debugloop/telescope-undo.nvim" }, + { "nvim-telescope/telescope-frecency.nvim" }, + { "nvim-telescope/telescope-live-grep-args.nvim" }, + { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, + { + "FabianWirth/search.nvim", + config = require("tool.search"), + }, { "ahmedkhalf/project.nvim", event = { "CursorHold", "CursorHoldI" }, config = require("tool.project"), }, - { "jvgrootveld/telescope-zoxide" }, - { "nvim-telescope/telescope-frecency.nvim" }, - { "nvim-telescope/telescope-live-grep-args.nvim" }, - { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, + { + "aaronhallaert/advanced-git-search.nvim", + cmd = { "AdvancedGitSearch" }, + dependencies = { + "tpope/vim-rhubarb", + "tpope/vim-fugitive", + "sindrets/diffview.nvim", + }, + }, }, } From 3166eefed81cb954bd51d7f3113cc55e0b93af0b Mon Sep 17 00:00:00 2001 From: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Date: Tue, 18 Jun 2024 22:09:09 +0800 Subject: [PATCH 06/40] feat: better way to check if the (T|G)UI is running (#1297) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --- lua/modules/plugins/editor.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/modules/plugins/editor.lua b/lua/modules/plugins/editor.lua index b25003e12..f396fc0ad 100644 --- a/lua/modules/plugins/editor.lua +++ b/lua/modules/plugins/editor.lua @@ -100,7 +100,7 @@ editor["mrjones2014/smart-splits.nvim"] = { editor["nvim-treesitter/nvim-treesitter"] = { lazy = true, build = function() - if #vim.api.nvim_list_uis() ~= 0 then + if vim.fn.has("gui_running") == 1 then vim.api.nvim_command([[TSUpdate]]) end end, From 7e11cdcf58df62646839137fe14ae5eb9745ed81 Mon Sep 17 00:00:00 2001 From: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Date: Tue, 18 Jun 2024 22:09:47 +0800 Subject: [PATCH 07/40] chore(global): cleanup legacy code (#1296) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --- lua/core/global.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lua/core/global.lua b/lua/core/global.lua index 523fd78d9..0f01edc16 100644 --- a/lua/core/global.lua +++ b/lua/core/global.lua @@ -7,12 +7,10 @@ function global:load_variables() self.is_windows = os_name == "Windows_NT" self.is_wsl = vim.fn.has("wsl") == 1 self.vim_path = vim.fn.stdpath("config") - local path_sep = self.is_windows and "\\" or "/" - local home = self.is_windows and os.getenv("USERPROFILE") or os.getenv("HOME") - self.cache_dir = home .. path_sep .. ".cache" .. path_sep .. "nvim" .. path_sep - self.modules_dir = self.vim_path .. path_sep .. "modules" - self.home = home + self.cache_dir = vim.fn.stdpath("cache") self.data_dir = string.format("%s/site/", vim.fn.stdpath("data")) + self.modules_dir = self.vim_path .. "/modules" + self.home = self.is_windows and os.getenv("USERPROFILE") or os.getenv("HOME") end global:load_variables() From 4d76779768b48af36a8c71771d3c3239b89bcbb5 Mon Sep 17 00:00:00 2001 From: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Date: Tue, 18 Jun 2024 22:10:46 +0800 Subject: [PATCH 08/40] feat: reduce the use of direct syscalls (#1294) * feat: reduce the use of direct syscalls Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix: typo Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --------- Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --- lua/core/init.lua | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lua/core/init.lua b/lua/core/init.lua index 6a49d0da0..59dbf37d7 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -3,7 +3,7 @@ local global = require("core.global") -- Create cache dir and data dirs local createdir = function() - local data_dir = { + local data_dirs = { global.cache_dir .. "backup", global.cache_dir .. "session", global.cache_dir .. "swap", @@ -12,10 +12,11 @@ local createdir = function() } -- Only check whether cache_dir exists, this would be enough. if vim.fn.isdirectory(global.cache_dir) == 0 then - os.execute("mkdir -p " .. global.cache_dir) - for _, v in pairs(data_dir) do - if vim.fn.isdirectory(v) == 0 then - os.execute("mkdir -p " .. v) + ---@diagnostic disable-next-line: param-type-mismatch + vim.fn.mkdir(global.cache_dir, "p") + for _, dir in pairs(data_dirs) do + if vim.fn.isdirectory(dir) == 0 then + vim.fn.mkdir(dir, "p") end end end From 4e614a37028fe5bb2c17eae98bf2ba7f9a364ddf Mon Sep 17 00:00:00 2001 From: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Date: Tue, 18 Jun 2024 22:11:08 +0800 Subject: [PATCH 09/40] fix(events): avoid name clashes (#1295) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --- lua/core/event.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lua/core/event.lua b/lua/core/event.lua index d94506829..b7ba7788c 100644 --- a/lua/core/event.lua +++ b/lua/core/event.lua @@ -3,7 +3,8 @@ local autocmd = {} function autocmd.nvim_create_augroups(definitions) for group_name, definition in pairs(definitions) do - vim.api.nvim_command("augroup " .. group_name) + -- Prepend an underscore to avoid name clashes + vim.api.nvim_command("augroup _" .. group_name) vim.api.nvim_command("autocmd!") for _, def in ipairs(definition) do local command = table.concat(vim.iter({ "autocmd", def }):flatten(math.huge):totable(), " ") @@ -67,7 +68,7 @@ vim.api.nvim_create_autocmd("FileType", { }, callback = function(event) vim.bo[event.buf].buflisted = false - vim.api.nvim_buf_set_keymap(event.buf, "n", "q", "close", { silent = true }) + vim.api.nvim_buf_set_keymap(event.buf, "n", "q", "close", { silent = true }) end, }) From 9b49c2fb5a3b475647321bfccbe37f1a2388949a Mon Sep 17 00:00:00 2001 From: TonyWu20 Date: Thu, 20 Jun 2024 03:55:10 +0800 Subject: [PATCH 10/40] Use 0.9.0 version of `gitsign` to suppress the deprecated warnings possibly caused by other plugins --- lazy-lock.json | 2 +- lua/modules/plugins/ui.lua | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lazy-lock.json b/lazy-lock.json index 19fe742ba..bb24492f3 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -29,7 +29,7 @@ "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, "fzf": { "branch": "master", "commit": "b9d15569e88d5abc5cfeaaf64c5aed3f95ee71da" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, - "gitsigns.nvim": { "branch": "main", "commit": "651d5ed082605f3ed96b0f037a768ca06ecf8fc3" }, + "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, "glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" }, "hop.nvim": { "branch": "master", "commit": "036462a345792279c58f2f6445756efab706f04a" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, diff --git a/lua/modules/plugins/ui.lua b/lua/modules/plugins/ui.lua index 5318694b7..29845875e 100644 --- a/lua/modules/plugins/ui.lua +++ b/lua/modules/plugins/ui.lua @@ -23,6 +23,7 @@ ui["j-hui/fidget.nvim"] = { } ui["lewis6991/gitsigns.nvim"] = { lazy = true, + version = "0.9", event = { "CursorHold", "CursorHoldI" }, config = require("ui.gitsigns"), } From fdda8796a43ba8f29568aa71ad6c48c5866dfb30 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 02:43:00 +0000 Subject: [PATCH 11/40] chore(lockfile): auto update flake.lock --- flake.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index ef96466e1..c62dd92e3 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "owner": "numtide", "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "type": "github" }, "original": { @@ -24,11 +24,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1719745305, + "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9", "type": "github" }, "original": { @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1717097707, - "narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=", + "lastModified": 1719677234, + "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=", "owner": "nix-community", "repo": "home-manager", - "rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9", + "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d", "type": "github" }, "original": { @@ -93,23 +93,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1714640452, - "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", + "lastModified": 1717284937, + "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1717112898, - "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", + "lastModified": 1719468428, + "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", + "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", "type": "github" }, "original": { From 508497602b49eed06c57b565beefb09d600bc6b5 Mon Sep 17 00:00:00 2001 From: ayamir Date: Mon, 1 Jul 2024 12:56:28 +0800 Subject: [PATCH 12/40] feat!: nvim v0.10 support (#1260) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: implement inlay virtual text for rust and go (#759) * feat: implement inlay virtual text for rust and go Signed-off-by: 蔡略 * fix: go-nvim use lsp-inlayhints.nvim only Signed-off-by: 蔡略 * refactor: move inlay-hints to `completion` Signed-off-by: 蔡略 * feat: lua support Signed-off-by: 蔡略 * chore(inlay-hints): remove `sumneko_lua` * fix: set inlay-hints debug mode off Signed-off-by: 蔡略 --------- Signed-off-by: 蔡略 Co-authored-by: Charles Chiu * workaroud for watchfile problem (#871) * workaroud for watchfile problem * fix CI * Merge branch 'main' * chore(neodim): remove pin commit (#1142) Signed-off-by: Charles Chiu * fix: remove `specs.nvim` due to long time no update. Signed-off-by: ayamir * Merge branch 'main' into 0.10 Signed-off-by: ayamir * refactor: use neovim native inlay-hint. Signed-off-by: ayamir * fix(lsp): adapt to upstream API, eliminate warning. Signed-off-by: ayamir * fix(plugins): add nvim-bqf. * fix(go.nvim): adapt upstream api. * feat(plugins): add dropbar.nvim for winbar. Signed-off-by: ayamir * feat(settings): make enable_inlayhint configurable. Signed-off-by: ayamir * fixup: check user input, improve robustness. Signed-off-by: ayamir * fix(clangd): disable clangd for proto. Signed-off-by: ayamir * fixup: clean redundant config files. * fix(gopls): unify gopls config, allow user overrides. * fixup: clean code. * feat(clang_format): enable clang_format for cuda and protobuf. * fix: inlay_hint error (#1236) * Merge remote-tracking branch 'origin' into 0.10 * fix: lua_ls workspace settings. Signed-off-by: ayamir * chore: upgrade to new api to judge if is a list. Signed-off-by: ayamir * chore: use builtin grep_string to search selection. Signed-off-by: ayamir * chore: general cleanup Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix: `inlayhint` -> `inlayhints` Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix(ts-autotag): update config format * chore: use vim.uv in place of vim.loop. Signed-off-by: ayamir * chore: use vim.iter():flattern in place of vim.tbl_flattern. Signed-off-by: ayamir * chore: update install scripts for nvim 0.10 stable. (#1271) Signed-off-by: ayamir * chore: replace deprecated apis (#1266) * chore: use vim.lsp.get_clients in place of vim.lsp.get_active_clients. Signed-off-by: ayamir * chore: use vim.lsp.get_clients in place of vim.lsp.buf_get_clients. Signed-off-by: ayamir --------- Signed-off-by: ayamir * fix(toggleterm): use `""` instead of `nil` to fix auto-exit on Windows (#1267) * fix: utilize `ts-context` in `glance` preview window (#1265) * set ts-context floatterm zindex to 50 which greater than 45. default zindex of glance [dnlhc/glance.nvim] floatterm is 45. It can display on glance. Signed-off-by: mjkx <291083247@qq.com> * set trim_scope to inner Signed-off-by: mjkx <291083247@qq.com> * perf: add discription --------- Signed-off-by: mjkx <291083247@qq.com> Co-authored-by: CharlesChiuGit * chore: use vim.o in place of vim.api.nvim_get_option_value. (#1269) Signed-off-by: ayamir * fix(0.10): minor cleanup (#1276) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * feat(scripts): update frequently used functions (#1277) I recently refactored my frequently used commands and thought it would be great to also port that here lol Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * feat(docs): support v0.10 (#1278) * feat(docs): support v0.10 Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix instructions Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --------- Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix(scripts): typo Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fixup! fix(scripts): typo * feat(README): supports `0.9` -> `0.10` Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * chore: cleanup Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix(lualine): ensure all components are properly aligned Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * unlock rustaceanvim Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * feat(lsp): be protective Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix: `neovim` -> `Neovim` Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * Revert "fix(lualine): ensure all components are properly aligned" This reverts commit 9be7ffedd1e5f59dd911e0de70d9cfdf9fcd8ae4. * feat: support new options (#1279) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * feat(trouble)!: v3 support (#1281) * feat(trouble)!: v3 support This PR includes the following changes: - *REMOVED* all features unrelated to the original purpose of trouble.nvim, such as LSP References (Glance.nvim covers this) and qf-list preview (bqf handles this). - Added a custom mapping for searching project diagnostics. This is slightly different from workspace diagnostics: one is defined by the language server itself (e.g., see LuaLS's documentation on workspace diagnostics), while the other is determined with assistance from Project.nvim. - General cleanup: I deliberately excluded LspKind support from our config this time bc imho it's a feature we likely won't use and supporting it is a real hassle. Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fixup! Missing one option * fix: invoke `utils.load_plugin` Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --------- Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * refactor: overhaul the icon library (#1282) This PR significantly updates the icon library by expanding its content, removing duplicates, and organizing icons into more cohesive groups. I've also created a custom Dropbar config that uses these icons and adds toggleterm support. * fix typo * Oops... Missing one icon * fix: invoke `utils.load_plugin` Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * feat(lsp): correctly configure diagnostic-signs (#1280) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * feat: disable more plugins for RO (buf|file)types (#1284) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix(alpha): cannot cast `string` to `integer` for winheight (#1285) iirc this is deprecated Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * feat(ibl): support per-language indent config (#1287) * feat(ibl): support per-language indent config Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fixup! feat(ibl): support per-language indent config --------- Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * feat(ibl): more language nodes (#1288) * feat(ibl): more language nodes Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * feat(ibl): even more language nodes Signed-off-by: Charles Chiu * chore(ibl): sorting Signed-off-by: Charles Chiu --------- Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: Charles Chiu Co-authored-by: Charles Chiu * feat(luasnip): support ECMAScript regexes (#1291) As per `:h luasnip-lsp-snippets-transformations` Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * feat(core): use the lua API to set options (#1292) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * feat: include several new plugins (#1235) * feat(cmp): more completion candidates from opened buffers. (#1219) * buffer completion config * opts -> option * chore(lockfile): auto update lazy-lock.json * chore(plugins): tidying up (#1221) This commit mainly tweaks the loading events of some plugins to align with upstream specifications. Additionally, there have been enhancements made to certain documentation. Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix(plugins): remove duplicate specifications Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix: use `init` for vim plugins (#1222) Signed-off-by: ayamir * chore(lockfile): auto update lazy-lock.json * docs: mention the experimental nature of the 0.10 branch (#1215) * docs: add note for 0.10 nightly branch in readme. Signed-off-by: ayamir * chore(issue_template): add nightly warning Signed-off-by: Charles Chiu * chore(issue_tempate): linting Signed-off-by: Charles Chiu * docs: update readme for 0.10 branch. Co-authored-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: Mohu * chore(issue_template): add nightly warning Signed-off-by: Charles Chiu * chore(issue_template): add nightly warning Signed-off-by: Charles Chiu --------- Signed-off-by: ayamir Signed-off-by: Charles Chiu Signed-off-by: Mohu Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> Co-authored-by: Charles Chiu Co-authored-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix(ISSUE_TEMPLATE): format code Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix(README): misplaced content Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix(todo-comment): add missing keywords (#1225) Signed-off-by: Charles Chiu * chore(lockfile): auto update lazy-lock.json * fix(options): remove options managed by `vim-sleuth` (#1229) Since all tab-related stuff is now managed by `vim-sleuth`, I think it is better to remove the relevant options to avoid confusion. Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * chore(lockfile): auto update lazy-lock.json * fix(rustaceanvim): use `init` for its config (#1231) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * chore(lockfile): auto update lazy-lock.json * feat!: improve go development experience (#1226) * chore(go): replace vim-go with go.nvim. Signed-off-by: ayamir * fix: install gopls by mason by default. Signed-off-by: ayamir * feat(keymap): set `n|gi` to goto implementation. Signed-off-by: ayamir * chore(keymap): use `gm` to jump to lsp implementations Co-authored-by: 冷酔閑吟 <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: Mohu * fixup: remove unused `map_cu`. * chore: use gopls instead of null-ls to format. Signed-off-by: ayamir * chore: add notes for config options. Signed-off-by: ayamir * fixup: tidy settings for go.nvim and gopls. * docs: update more notes for how to config go.nvim. * chore: cleanup Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix: enable only the options that are truly necessary Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fixup! chore: cleanup * fix(gopls): invalid config entry Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --------- Signed-off-by: ayamir Signed-off-by: Mohu Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> Co-authored-by: 冷酔閑吟 <50296129+Jint-lzxy@users.noreply.github.com> Co-authored-by: neogtliu * feat!: add `advanced-git-search.nvim` * feat!: add `search.nvim` to enhance `telescope`. * feat: reorganize keymaps for telescope search collections. Signed-off-by: ayamir * fixup: update descriptions for modified keymaps. * chore: remove single diagnostic disable for undefined-field. Co-authored-by: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: Mohu * chore: remove diagnostic disable for undefined-field. * feat!: replace `colorizer.lua` with `nvim-highlight-colors` * fix: invoke `utils.load_plugin` Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * chore(advanced-git-search): remove unused options Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * feat(telescope): add collection panel for `search.nvim` * chore: typo * feat: more documentation Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * chore: clean up * feat: don't hard-code collection names * chore: use custom loader * fix: disable warning * fix: CI & cleanup Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * Revert `lazy-lock.json` Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix: make luaJIT happy Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --------- Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: ayamir Signed-off-by: Charles Chiu Signed-off-by: Mohu Co-authored-by: mjkx <52132505+mjkx5@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: 冷酔閑吟 <50296129+Jint-lzxy@users.noreply.github.com> Co-authored-by: Mohu Co-authored-by: neogtliu * feat: better way to check if the (T|G)UI is running (#1297) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * chore(global): cleanup legacy code (#1296) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * feat: reduce the use of direct syscalls (#1294) * feat: reduce the use of direct syscalls Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix: typo Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --------- Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix(events): avoid name clashes (#1295) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * Feat/telescope collections keymaps (#1299) * feat(telescope): add some new plugins for `search.nvim` * fixup: correct alpha-nvim config. * feat: more resonable keymap, add notify to misc. Signed-off-by: ayamir --------- Signed-off-by: ayamir Co-authored-by: ayamir * fix(gitsigns): upstream breaking changes (#1300) See https://github.com/lewis6991/gitsigns.nvim/commit/3d7e49c201537ee0293a1a3abe67b67f8e7648a5 Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix(core): missing leading path separator (#1301) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * Revert "Feat/telescope collections keymaps (#1299)" (#1302) This reverts commit 93c06cd954e7a73cc3fad0799ab49f1a1fc10d73. * Feat/telescope collections keymaps (#1303) * feat(telescope): add some new plugins for `search.nvim` * fixup: correct alpha-nvim config. * feat: more resonable keymap, add notify to misc. Signed-off-by: ayamir * revert: local cmp changes. * fix: update alpha-nvim config. * chore: update doc strings Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * Update lua/modules/configs/ui/alpha.lua Co-authored-by: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: Mohu * Update lua/modules/configs/ui/alpha.lua Co-authored-by: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: Mohu * Update lua/modules/configs/ui/alpha.lua Co-authored-by: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: Mohu * Update lua/modules/configs/ui/alpha.lua Co-authored-by: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: Mohu * Update lua/modules/configs/ui/alpha.lua Co-authored-by: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: Mohu * feat: update dotstutor. Signed-off-by: ayamir * feat: correct several minor issues Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * chore: cleanup Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * feat!: mnemonic keymaps Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --------- Signed-off-by: ayamir Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: Mohu Co-authored-by: CharlesChiuGit Co-authored-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * feat(treesitter): lessened performance restrictions (#1305) * feat(treesitter): lessened performance restrictions This commit lifts some of the performance restrictions previously imposed on Treesitter when incremental parsing was not yet supported. Specifically: Treesitter will now only be disabled by default for files exceeding 7,500 lines or 2 MiB in size. Testing on an Intel i9-9880H with an APPLE SSD AP1024N shows noticeable lag at these thresholds. Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fixup: return correct value. --------- Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> Co-authored-by: ayamir * chore: update plugin author's name Signed-off-by: Charles Chiu * feat(nixos): add `mergeLazyLock` option (#1310) * feat(nixos): add copyLazyLock option * fix(nixos): fix code style accepted modification proposed by nixd see more nix's code style best practice below url https://nix.dev/guides/best-practices * fix(nixos): rename copyLazyLock to mergeLazyLock * fix(nixos): fix discription * fix: cmp snippets source selecting issue (#1309) * migrate(cmp): `cmp_nvim_lsp` capabilities API update * feat(cmp): make `` safer * fix(cmp): occasional inability to select completion items (#1315) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: ayamir Co-authored-by: ayamir * feat: credit all collaborators as copyright holders (#1316) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * feat: make format timeout configurable (#1275) * feat&refactor: make format timeout configurable, refactor format-related options. * chore(settings): set `format_modifications_only` to `false` to prevent possible ci issues Signed-off-by: Charles Chiu * fix: set timeout for null-ls considering range format capability. this commit also revert the settings structure b/c we can refactor it in another PR. * fixup: fix ci. * fix: remove redundant notification. * fixup: fix notify logic and CI. * fixup: merge judgements. Co-authored-by: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: Mohu * fixup: remove redundant judge. * docs: more accurate comment note. Co-authored-by: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: ayamir * fix: wrong require source. Co-authored-by: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: ayamir --------- Signed-off-by: Charles Chiu Signed-off-by: Mohu Signed-off-by: ayamir Co-authored-by: Charles Chiu Co-authored-by: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> --------- Signed-off-by: 蔡略 Signed-off-by: ayamir Signed-off-by: Charles Chiu Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> Signed-off-by: mjkx <291083247@qq.com> Signed-off-by: Mohu Signed-off-by: ayamir Co-authored-by: ClSlaid Co-authored-by: Charles Chiu Co-authored-by: Xie Zejian Co-authored-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> Co-authored-by: Mythos_404 Co-authored-by: mjkx <52132505+mjkx5@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: neogtliu Co-authored-by: MiSumiSumi --- .github/ISSUE_TEMPLATE/bug_report.yml | 12 +- .github/ISSUE_TEMPLATE/custom_config.yml | 10 +- .github/ISSUE_TEMPLATE/lsp_issue_report.yml | 12 +- .github/workflows/lint_code.yml | 2 +- LICENSE | 41 +- README.md | 24 +- lazy-lock.json | 2 +- lua/core/event.lua | 19 +- lua/core/global.lua | 10 +- lua/core/init.lua | 40 +- lua/core/mapping.lua | 1 + lua/core/options.lua | 17 +- lua/core/pack.lua | 2 +- lua/core/settings.lua | 42 +- lua/keymap/helpers.lua | 40 +- lua/keymap/tool.lua | 71 +-- lua/modules/configs/completion/cmp.lua | 24 +- lua/modules/configs/completion/copilot.lua | 8 +- lua/modules/configs/completion/formatting.lua | 11 +- lua/modules/configs/completion/lsp.lua | 2 +- lua/modules/configs/completion/lspsaga.lua | 26 +- .../configs/completion/mason-lspconfig.lua | 10 +- lua/modules/configs/completion/null-ls.lua | 5 +- .../configs/completion/servers/lua_ls.lua | 6 +- lua/modules/configs/editor/autoclose.lua | 18 +- lua/modules/configs/editor/autotag.lua | 11 +- lua/modules/configs/editor/bigfile.lua | 9 +- lua/modules/configs/editor/colorizer.lua | 3 - .../configs/editor/highlight-colors.lua | 31 + lua/modules/configs/editor/rainbow_delims.lua | 15 +- lua/modules/configs/editor/treesitter.lua | 12 +- lua/modules/configs/editor/ts-context.lua | 2 +- lua/modules/configs/lang/crates-keymap.lua | 39 +- lua/modules/configs/tool/dropbar.lua | 109 ++++ lua/modules/configs/tool/nvim-tree.lua | 23 +- lua/modules/configs/tool/search.lua | 141 +++++ lua/modules/configs/tool/telescope.lua | 13 +- lua/modules/configs/tool/trouble.lua | 75 +-- lua/modules/configs/ui/alpha.lua | 99 +-- lua/modules/configs/ui/catppuccin.lua | 1 + lua/modules/configs/ui/gitsigns.lua | 45 +- lua/modules/configs/ui/indent-blankline.lua | 588 ++++++++++++++++-- lua/modules/configs/ui/lualine.lua | 8 +- lua/modules/configs/ui/neodim.lua | 23 +- lua/modules/configs/ui/scrollview.lua | 12 +- lua/modules/configs/ui/todo.lua | 17 +- lua/modules/plugins/completion.lua | 5 +- lua/modules/plugins/editor.lua | 13 +- lua/modules/plugins/lang.lua | 2 +- lua/modules/plugins/tool.lua | 33 +- lua/modules/plugins/ui.lua | 1 - lua/modules/utils/icons.lua | 69 +- lua/modules/utils/init.lua | 5 +- nixos/neovim/default.nix | 152 +++-- scripts/install.ps1 | 24 +- scripts/install.sh | 36 +- tutor/dots.tutor | 57 +- 57 files changed, 1534 insertions(+), 594 deletions(-) mode change 100755 => 100644 LICENSE delete mode 100644 lua/modules/configs/editor/colorizer.lua create mode 100644 lua/modules/configs/editor/highlight-colors.lua create mode 100644 lua/modules/configs/tool/dropbar.lua create mode 100644 lua/modules/configs/tool/search.lua diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 5c0f3fff4..4906f93c9 100644 --- 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 index d3dc98dd2..6a95d3903 100644 --- 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 index 519b0e6de..09978612c 100644 --- 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/.github/workflows/lint_code.yml b/.github/workflows/lint_code.yml index 9e88fa59e..71d11c5e2 100644 --- a/.github/workflows/lint_code.yml +++ b/.github/workflows/lint_code.yml @@ -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 diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 index 0203a8bed..33895b644 --- a/LICENSE +++ b/LICENSE @@ -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. diff --git a/README.md b/README.md index 05390439a..c450710be 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@
NeoVim Version Capability + 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"> -| 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 | > [!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`)_ @@ -197,6 +197,8 @@ 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 @@ -204,7 +206,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 BSD 3-Clause license, which grants the following permissions: - Commercial use - Distribution diff --git a/lazy-lock.json b/lazy-lock.json index 43e8c7c95..a5ecf48e1 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -93,4 +93,4 @@ "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" }, "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" } -} \ No newline at end of file +} diff --git a/lua/core/event.lua b/lua/core/event.lua index c605da18a..b7ba7788c 100644 --- a/lua/core/event.lua +++ b/lua/core/event.lua @@ -3,23 +3,32 @@ local autocmd = {} function autocmd.nvim_create_augroups(definitions) for group_name, definition in pairs(definitions) do - vim.api.nvim_command("augroup " .. group_name) + -- Prepend an underscore to avoid name clashes + vim.api.nvim_command("augroup _" .. group_name) vim.api.nvim_command("autocmd!") for _, def in ipairs(definition) do - local command = table.concat(vim.tbl_flatten({ "autocmd", def }), " ") + local command = table.concat(vim.iter({ "autocmd", def }):flatten(math.huge):totable(), " ") vim.api.nvim_command(command) end vim.api.nvim_command("augroup END") end end --- defer setting LSP-related keymaps till LspAttach +-- Hold off on configuring anything related to the LSP until LspAttach local mapping = require("keymap.completion") vim.api.nvim_create_autocmd("LspAttach", { group = vim.api.nvim_create_augroup("LspKeymapLoader", { clear = true }), callback = function(event) if not _G._debugging then + -- LSP Keymaps mapping.lsp(event.buf) + + -- LSP Inlay Hints + local inlayhints_enabled = require("core.settings").lsp_inlayhints + local client = vim.lsp.get_client_by_id(event.data.client_id) + if client and client.server_capabilities.inlayHintProvider ~= nil then + vim.lsp.inlay_hint.enable(inlayhints_enabled == true, { bufnr = event.buf }) + end end end, }) @@ -32,7 +41,7 @@ vim.api.nvim_create_autocmd("BufEnter", { local layout = vim.api.nvim_call_function("winlayout", {}) if layout[1] == "leaf" - and vim.api.nvim_get_option_value("filetype", { buf = vim.api.nvim_win_get_buf(layout[2]) }) == "NvimTree" + and vim.bo[vim.api.nvim_win_get_buf(layout[2])].filetype == "NvimTree" and layout[3] == nil then vim.api.nvim_command([[confirm quit]]) @@ -59,7 +68,7 @@ vim.api.nvim_create_autocmd("FileType", { }, callback = function(event) vim.bo[event.buf].buflisted = false - vim.api.nvim_buf_set_keymap(event.buf, "n", "q", "close", { silent = true }) + vim.api.nvim_buf_set_keymap(event.buf, "n", "q", "close", { silent = true }) end, }) diff --git a/lua/core/global.lua b/lua/core/global.lua index 7ab42829c..0f01edc16 100644 --- a/lua/core/global.lua +++ b/lua/core/global.lua @@ -1,5 +1,5 @@ local global = {} -local os_name = vim.loop.os_uname().sysname +local os_name = vim.uv.os_uname().sysname function global:load_variables() self.is_mac = os_name == "Darwin" @@ -7,12 +7,10 @@ function global:load_variables() self.is_windows = os_name == "Windows_NT" self.is_wsl = vim.fn.has("wsl") == 1 self.vim_path = vim.fn.stdpath("config") - local path_sep = self.is_windows and "\\" or "/" - local home = self.is_windows and os.getenv("USERPROFILE") or os.getenv("HOME") - self.cache_dir = home .. path_sep .. ".cache" .. path_sep .. "nvim" .. path_sep - self.modules_dir = self.vim_path .. path_sep .. "modules" - self.home = home + self.cache_dir = vim.fn.stdpath("cache") self.data_dir = string.format("%s/site/", vim.fn.stdpath("data")) + self.modules_dir = self.vim_path .. "/modules" + self.home = self.is_windows and os.getenv("USERPROFILE") or os.getenv("HOME") end global:load_variables() diff --git a/lua/core/init.lua b/lua/core/init.lua index 951d3adaa..a5fa32813 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -3,19 +3,20 @@ local global = require("core.global") -- Create cache dir and data dirs local createdir = function() - local data_dir = { - global.cache_dir .. "backup", - global.cache_dir .. "session", - global.cache_dir .. "swap", - global.cache_dir .. "tags", - global.cache_dir .. "undo", + local data_dirs = { + global.cache_dir .. "/backup", + global.cache_dir .. "/session", + global.cache_dir .. "/swap", + global.cache_dir .. "/tags", + global.cache_dir .. "/undo", } -- Only check whether cache_dir exists, this would be enough. if vim.fn.isdirectory(global.cache_dir) == 0 then - os.execute("mkdir -p " .. global.cache_dir) - for _, v in pairs(data_dir) do - if vim.fn.isdirectory(v) == 0 then - os.execute("mkdir -p " .. v) + ---@diagnostic disable-next-line: param-type-mismatch + vim.fn.mkdir(global.cache_dir, "p") + for _, dir in pairs(data_dirs) do + if vim.fn.isdirectory(dir) == 0 then + vim.fn.mkdir(dir, "p") end end end @@ -135,12 +136,13 @@ You're recommended to install PowerShell for better experience.]], local basecmd = "-NoLogo -MTA -ExecutionPolicy RemoteSigned" local ctrlcmd = "-Command [console]::InputEncoding = [console]::OutputEncoding = [System.Text.Encoding]::UTF8" - vim.api.nvim_set_option_value("shell", vim.fn.executable("pwsh") == 1 and "pwsh" or "powershell", {}) - vim.api.nvim_set_option_value("shellcmdflag", string.format("%s %s;", basecmd, ctrlcmd), {}) - vim.api.nvim_set_option_value("shellredir", "-RedirectStandardOutput %s -NoNewWindow -Wait", {}) - vim.api.nvim_set_option_value("shellpipe", "2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode", {}) - vim.api.nvim_set_option_value("shellquote", nil, {}) - vim.api.nvim_set_option_value("shellxquote", nil, {}) + local set_opts = vim.api.nvim_set_option_value + set_opts("shell", vim.fn.executable("pwsh") == 1 and "pwsh" or "powershell", {}) + set_opts("shellcmdflag", string.format("%s %s;", basecmd, ctrlcmd), {}) + set_opts("shellredir", "-RedirectStandardOutput %s -NoNewWindow -Wait", {}) + set_opts("shellpipe", "2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode", {}) + set_opts("shellquote", "", {}) + set_opts("shellxquote", "", {}) end end @@ -160,10 +162,8 @@ local load_core = function() require("core.pack") require("keymap") - local colorscheme = settings.colorscheme - local background = settings.background - vim.api.nvim_command("set background=" .. background) - vim.api.nvim_command("colorscheme " .. colorscheme) + vim.api.nvim_set_option_value("background", settings.background, {}) + vim.cmd.colorscheme(settings.colorscheme) end load_core() diff --git a/lua/core/mapping.lua b/lua/core/mapping.lua index cb0c061de..351216925 100644 --- a/lua/core/mapping.lua +++ b/lua/core/mapping.lua @@ -34,6 +34,7 @@ local core_map = { ["n|"] = map_cr("wq"):with_desc("edit: Save file and quit"), ["n|"] = map_cr("q!"):with_desc("edit: Force quit"), ["n|o"] = map_cr("setlocal spell! spelllang=en_us"):with_desc("edit: Toggle spell check"), + ["n|bn"] = map_cu("enew"):with_noremap():with_silent():with_desc("buffer: New"), ["n|tn"] = map_cr("tabnew"):with_noremap():with_silent():with_desc("tab: Create a new tab"), ["n|tk"] = map_cr("tabnext"):with_noremap():with_silent():with_desc("tab: Move to next tab"), ["n|tj"] = map_cr("tabprevious"):with_noremap():with_silent():with_desc("tab: Move to previous tab"), diff --git a/lua/core/options.lua b/lua/core/options.lua index b3b3e0295..d025abf07 100644 --- a/lua/core/options.lua +++ b/lua/core/options.lua @@ -2,10 +2,10 @@ local global = require("core.global") local function load_options() local global_local = { - -- backupdir = global.cache_dir .. "backup/", - -- directory = global.cache_dir .. "swap/", - -- spellfile = global.cache_dir .. "spell/en.uft-8.add", - -- viewdir = global.cache_dir .. "view/", + -- backupdir = global.cache_dir .. "/backup/", + -- directory = global.cache_dir .. "/swap/", + -- spellfile = global.cache_dir .. "/spell/en.uft-8.add", + -- viewdir = global.cache_dir .. "/view/", autoindent = true, autoread = true, autowrite = true, @@ -17,8 +17,8 @@ local function load_options() clipboard = "unnamedplus", cmdheight = 1, -- 0, 1, 2 cmdwinheight = 5, - complete = ".,w,b,k", - completeopt = "menuone,noselect", + complete = ".,w,b,k,kspell", + completeopt = "menuone,noselect,popup", concealcursor = "niv", conceallevel = 0, cursorcolumn = true, @@ -70,6 +70,7 @@ local function load_options() signcolumn = "yes", smartcase = true, smarttab = true, + smoothscroll = true, splitbelow = true, splitkeep = "screen", splitright = true, @@ -83,7 +84,7 @@ local function load_options() timeoutlen = 300, ttimeout = true, ttimeoutlen = 0, - undodir = global.cache_dir .. "undo/", + undodir = global.cache_dir .. "/undo/", undofile = true, -- Please do NOT set `updatetime` to above 500, otherwise most plugins may not function correctly updatetime = 200, @@ -120,7 +121,7 @@ local function load_options() end for name, value in pairs(require("modules.utils").extend_config(global_local, "user.options")) do - vim.o[name] = value + vim.api.nvim_set_option_value(name, value, {}) end end diff --git a/lua/core/pack.lua b/lua/core/pack.lua index 6046e5fe3..326bf3df9 100644 --- a/lua/core/pack.lua +++ b/lua/core/pack.lua @@ -63,7 +63,7 @@ function Lazy:load_plugins() end function Lazy:load_lazy() - if not vim.loop.fs_stat(lazy_path) then + if not vim.uv.fs_stat(lazy_path) then local lazy_repo = use_ssh and "git@github.com:folke/lazy.nvim.git " or "https://github.com/folke/lazy.nvim.git " api.nvim_command("!git clone --filter=blob:none --branch=stable " .. lazy_repo .. lazy_path) end diff --git a/lua/core/settings.lua b/lua/core/settings.lua index 0b0d61030..125416008 100644 --- a/lua/core/settings.lua +++ b/lua/core/settings.lua @@ -8,10 +8,14 @@ settings["use_ssh"] = true ---@type boolean settings["use_copilot"] = true --- Set it to false if there are no need to format on save. +-- Set it to false if there is no need to format on save. ---@type boolean settings["format_on_save"] = true +-- Set format timeout here (in ms). +---@type number +settings["format_timeout"] = 1000 + -- Set it to false if the notification after formatting is annoying. ---@type boolean settings["format_notify"] = true @@ -33,6 +37,24 @@ settings["format_disabled_dirs"] = { "~/format_disabled_dir", } +-- Filetypes in this list will skip lsp formatting if rhs is true. +---@type table +settings["formatter_block_list"] = { + lua = false, -- example +} + +-- Servers in this list will skip setting formatting capabilities if rhs is true. +---@type table +settings["server_formatting_block_list"] = { + lua_ls = true, + tsserver = true, + clangd = true, +} + +-- Set it to false if you want to turn off LSP Inlay Hints +---@type boolean +settings["lsp_inlayhints"] = true + -- Set it to false if diagnostics virtual text is annoying. -- If disabled, you may browse lsp diagnostics using trouble.nvim (press `gt` to toggle it). ---@type boolean @@ -42,8 +64,8 @@ settings["diagnostics_virtual_text"] = true -- Priority: `Error` > `Warning` > `Information` > `Hint`. -- > e.g. if you set this option to `Warning`, only lsp warnings and errors will be shown. -- NOTE: This entry only works when `diagnostics_virtual_text` is true. ----@type "Error"|"Warning"|"Information"|"Hint" -settings["diagnostics_level"] = "Hint" +---@type "ERROR"|"WARN"|"INFO"|"HINT" +settings["diagnostics_level"] = "HINT" -- Set the plugins to disable here. -- Example: "Some-User/A-Repo" @@ -81,20 +103,6 @@ settings["background"] = "dark" ---@type string settings["external_browser"] = "chrome-cli open" --- Filetypes in this list will skip lsp formatting if rhs is true. ----@type table -settings["formatter_block_list"] = { - lua = false, -- example -} - --- Servers in this list will skip setting formatting capabilities if rhs is true. ----@type table -settings["server_formatting_block_list"] = { - lua_ls = true, - tsserver = true, - clangd = true, -} - -- Set the language servers that will be installed during bootstrap here. -- check the below link for all the supported LSPs: -- https://github.com/neovim/nvim-lspconfig/tree/master/lua/lspconfig/server_configurations diff --git a/lua/keymap/helpers.lua b/lua/keymap/helpers.lua index 68276e2eb..60d99e46f 100644 --- a/lua/keymap/helpers.lua +++ b/lua/keymap/helpers.lua @@ -11,6 +11,33 @@ _G._command_panel = function() }) end +_G._telescope_collections = function(picker_type) + local actions = require("telescope.actions") + local action_state = require("telescope.actions.state") + local conf = require("telescope.config").values + local finder = require("telescope.finders") + local pickers = require("telescope.pickers") + picker_type = picker_type or {} + + local collections = vim.tbl_keys(require("search.tabs").collections) + pickers + .new(picker_type, { + prompt_title = "Telescope Collections", + finder = finder.new_table({ results = collections }), + sorter = conf.generic_sorter(picker_type), + attach_mappings = function(bufnr) + actions.select_default:replace(function() + actions.close(bufnr) + local selection = action_state.get_selected_entry() + require("search").open({ collection = selection[1] }) + end) + + return true + end, + }) + :find() +end + _G._flash_esc_or_noh = function() local flash_active, state = pcall(function() return require("flash.plugins.char").state @@ -38,16 +65,3 @@ _G._toggle_lazygit = function() vim.notify("Command [lazygit] not found!", vim.log.levels.ERROR, { title = "toggleterm.nvim" }) end end - --- TODO: Update this function to use `vim.getregion()` when v0.10 is released. -_G._buf_vtext = function() - local a_orig = vim.fn.getreg("a") - local mode = vim.fn.mode() - if mode ~= "v" and mode ~= "V" then - vim.cmd([[normal! gv]]) - end - vim.cmd([[silent! normal! "aygv]]) - local text = vim.fn.getreg("a") - vim.fn.setreg("a", a_orig) - return text -end diff --git a/lua/keymap/tool.lua b/lua/keymap/tool.lua index 6eebff316..617a2d082 100644 --- a/lua/keymap/tool.lua +++ b/lua/keymap/tool.lua @@ -63,24 +63,19 @@ local plug_map = { :with_desc("git: Toggle lazygit"), -- Plugin: trouble - ["n|gt"] = map_cr("TroubleToggle"):with_noremap():with_silent():with_desc("lsp: Toggle trouble list"), - ["n|ll"] = map_cr("TroubleToggle lsp_references") + ["n|gt"] = map_cr("Trouble diagnostics toggle"):with_noremap():with_silent():with_desc("lsp: Toggle trouble list"), + ["n|lw"] = map_cr("Trouble diagnostics toggle") :with_noremap() :with_silent() - :with_desc("lsp: Show lsp references"), - ["n|ld"] = map_cr("TroubleToggle document_diagnostics") + :with_desc("lsp: Show workspace diagnostics"), + ["n|lp"] = map_cr("Trouble project_diagnostics toggle") :with_noremap() :with_silent() - :with_desc("lsp: Show document diagnostics"), - ["n|lw"] = map_cr("TroubleToggle workspace_diagnostics") + :with_desc("lsp: Show project diagnostics"), + ["n|ld"] = map_cr("Trouble diagnostics toggle filter.buf=0") :with_noremap() :with_silent() - :with_desc("lsp: Show workspace diagnostics"), - ["n|lq"] = map_cr("TroubleToggle quickfix") - :with_noremap() - :with_silent() - :with_desc("lsp: Show quickfix list"), - ["n|lL"] = map_cr("TroubleToggle loclist"):with_noremap():with_silent():with_desc("lsp: Show loclist"), + :with_desc("lsp: Show document diagnostics"), -- Plugin: telescope ["n|"] = map_callback(function() @@ -89,56 +84,46 @@ local plug_map = { :with_noremap() :with_silent() :with_desc("tool: Toggle command panel"), - ["n|u"] = map_callback(function() - require("telescope").extensions.undo.undo() + ["n|fc"] = map_callback(function() + _telescope_collections(require("telescope.themes").get_dropdown()) end) :with_noremap() :with_silent() - :with_desc("edit: Show undo history"), - ["n|fp"] = map_callback(function() - require("telescope").extensions.projects.projects({}) + :with_desc("tool: Open Telescope collections"), + ["n|ff"] = map_callback(function() + require("search").open({ collection = "file" }) end) :with_noremap() :with_silent() - :with_desc("find: Project"), - ["n|fr"] = map_callback(function() - require("telescope").extensions.frecency.frecency({}) + :with_desc("tool: Find files"), + ["n|fp"] = map_callback(function() + require("search").open({ collection = "pattern" }) end) :with_noremap() :with_silent() - :with_desc("find: File by frecency"), - ["n|fw"] = map_callback(function() - require("telescope").extensions.live_grep_args.live_grep_args() - end) + :with_desc("tool: Find patterns"), + ["v|fs"] = map_cu("Telescope grep_string") :with_noremap() :with_silent() - :with_desc("find: Word in project"), - ["n|fe"] = map_cu("Telescope oldfiles"):with_noremap():with_silent():with_desc("find: File by history"), - ["n|ff"] = map_cu("Telescope find_files"):with_noremap():with_silent():with_desc("find: File in project"), - ["n|fc"] = map_callback(function() - require("telescope.builtin").colorscheme({ enable_preview = true }) + :with_desc("tool: Find word under cursor"), + ["n|fg"] = map_callback(function() + require("search").open({ collection = "git" }) end) :with_noremap() :with_silent() - :with_desc("ui: Change colorscheme for current session"), - ["n|bn"] = map_cu(":enew"):with_noremap():with_silent():with_desc("buffer: New"), - ["n|fg"] = map_cu("Telescope git_files") - :with_noremap() - :with_silent() - :with_desc("find: file in git project"), - ["n|fz"] = map_cu("Telescope zoxide list") + :with_desc("tool: Locate Git objects"), + ["n|fd"] = map_callback(function() + require("search").open({ collection = "dossier" }) + end) :with_noremap() :with_silent() - :with_desc("edit: Change current directory by zoxide"), - ["n|fb"] = map_cu("Telescope buffers"):with_noremap():with_silent():with_desc("find: Buffer opened"), - ["n|fs"] = map_cu("Telescope grep_string"):with_noremap():with_silent():with_desc("find: Current word"), - ["v|fs"] = map_callback(function() - require("telescope.builtin").grep_string({ search = _buf_vtext() }) + :with_desc("tool: Retrieve dossiers"), + ["n|fm"] = map_callback(function() + require("search").open({ collection = "misc" }) end) :with_noremap() :with_silent() - :with_desc("find: Selection text"), - ["n|fd"] = map_cu("Telescope persisted"):with_noremap():with_silent():with_desc("find: Session"), + :with_desc("tool: Miscellaneous"), -- Plugin: dap ["n|"] = map_callback(function() diff --git a/lua/modules/configs/completion/cmp.lua b/lua/modules/configs/completion/cmp.lua index 0d926e0ee..f20e7b60d 100644 --- a/lua/modules/configs/completion/cmp.lua +++ b/lua/modules/configs/completion/cmp.lua @@ -127,15 +127,14 @@ return function() }, -- You can set mappings if you want mapping = cmp.mapping.preset.insert({ - [""] = cmp.mapping.confirm({ select = false, behavior = cmp.ConfirmBehavior.Replace }), - [""] = cmp.mapping.select_prev_item(), - [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Select }), + [""] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Select }), [""] = cmp.mapping.scroll_docs(-4), [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.close(), + [""] = cmp.mapping.abort(), [""] = cmp.mapping(function(fallback) if cmp.visible() then - cmp.select_next_item() + cmp.select_next_item({ behavior = cmp.SelectBehavior.Select }) elseif require("luasnip").expand_or_locally_jumpable() then require("luasnip").expand_or_jump() else @@ -144,13 +143,24 @@ return function() end, { "i", "s" }), [""] = cmp.mapping(function(fallback) if cmp.visible() then - cmp.select_prev_item() + cmp.select_prev_item({ behavior = cmp.SelectBehavior.Select }) elseif require("luasnip").jumpable(-1) then require("luasnip").jump(-1) else fallback() end end, { "i", "s" }), + [""] = cmp.mapping({ + i = function(fallback) + if cmp.visible() and cmp.get_active_entry() then + cmp.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = false }) + else + fallback() + end + end, + s = cmp.mapping.confirm({ select = true }), + c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = true }), + }), }), snippet = { expand = function(args) @@ -171,7 +181,7 @@ return function() name = "buffer", option = { get_bufnrs = function() - return vim.api.nvim_list_bufs() + return vim.api.nvim_buf_line_count(0) < 7500 and vim.api.nvim_list_bufs() or {} end, }, }, diff --git a/lua/modules/configs/completion/copilot.lua b/lua/modules/configs/completion/copilot.lua index 96de94fd1..a6ea78c2a 100644 --- a/lua/modules/configs/completion/copilot.lua +++ b/lua/modules/configs/completion/copilot.lua @@ -14,8 +14,14 @@ return function() enabled = false, }, filetypes = { + ["bigfile"] = false, ["dap-repl"] = false, - ["big_file_disabled_ft"] = false, + ["fugitive"] = false, + ["fugitiveblame"] = false, + ["git"] = false, + ["gitcommit"] = false, + ["log"] = false, + ["toggleterm"] = false, }, }) end, 100) diff --git a/lua/modules/configs/completion/formatting.lua b/lua/modules/configs/completion/formatting.lua index 9e8018812..0368efef7 100644 --- a/lua/modules/configs/completion/formatting.lua +++ b/lua/modules/configs/completion/formatting.lua @@ -6,12 +6,13 @@ local format_on_save = settings.format_on_save local format_notify = settings.format_notify local format_modifications_only = settings.format_modifications_only local server_formatting_block_list = settings.server_formatting_block_list +local format_timeout = settings.format_timeout vim.api.nvim_create_user_command("FormatToggle", function() M.toggle_format_on_save() end, {}) -local block_list = require("core.settings").formatter_block_list +local block_list = settings.formatter_block_list vim.api.nvim_create_user_command("FormatterToggleFt", function(opts) if block_list[opts.args] == nil then vim.notify( @@ -35,7 +36,7 @@ vim.api.nvim_create_user_command("FormatterToggleFt", function(opts) end, { nargs = 1, complete = "filetype" }) function M.enable_format_on_save(is_configured) - local opts = { pattern = "*", timeout = 1000 } + local opts = { pattern = "*", timeout = format_timeout } vim.api.nvim_create_augroup("format_on_save", { clear = true }) vim.api.nvim_create_autocmd("BufWritePre", { group = "format_on_save", @@ -117,7 +118,7 @@ function M.format(opts) end local bufnr = opts.bufnr or vim.api.nvim_get_current_buf() - local clients = vim.lsp.buf_get_clients(bufnr) + local clients = vim.lsp.get_clients({ buffer = bufnr }) if opts.filter then clients = opts.filter(clients) @@ -156,7 +157,9 @@ function M.format(opts) { title = "LSP Formatter Warning" } ) return - elseif + end + + if format_modifications_only and require("lsp-format-modifications").format_modifications(client, bufnr).success then diff --git a/lua/modules/configs/completion/lsp.lua b/lua/modules/configs/completion/lsp.lua index be60436db..ba3c5a873 100644 --- a/lua/modules/configs/completion/lsp.lua +++ b/lua/modules/configs/completion/lsp.lua @@ -19,5 +19,5 @@ return function() pcall(require, "user.configs.lsp") - vim.api.nvim_command([[LspStart]]) -- Start LSPs + pcall(vim.cmd.LspStart) -- Start LSPs end diff --git a/lua/modules/configs/completion/lspsaga.lua b/lua/modules/configs/completion/lspsaga.lua index bca447da0..162cdda2c 100644 --- a/lua/modules/configs/completion/lspsaga.lua +++ b/lua/modules/configs/completion/lspsaga.lua @@ -10,17 +10,17 @@ return function() } local function set_sidebar_icons() - -- Set icons for sidebar. - local diagnostic_icons = { - Error = icons.diagnostics.Error_alt, - Warn = icons.diagnostics.Warning_alt, - Info = icons.diagnostics.Information_alt, - Hint = icons.diagnostics.Hint_alt, - } - for type, icon in pairs(diagnostic_icons) do - local hl = "DiagnosticSign" .. type - vim.fn.sign_define(hl, { text = icon, texthl = hl }) - end + -- Set icons for sidebar + vim.diagnostic.config({ + signs = { + text = { + [vim.diagnostic.severity.ERROR] = icons.diagnostics.Error_alt, + [vim.diagnostic.severity.WARN] = icons.diagnostics.Warning_alt, + [vim.diagnostic.severity.INFO] = icons.diagnostics.Information_alt, + [vim.diagnostic.severity.HINT] = icons.diagnostics.Hint_alt, + }, + }, + }) end set_sidebar_icons() @@ -28,7 +28,7 @@ return function() require("modules.utils").load_plugin("lspsaga", { -- Breadcrumbs: https://nvimdev.github.io/lspsaga/breadcrumbs/ symbol_in_winbar = { - enable = true, + enable = false, separator = " " .. icons.ui.Separator, hide_keyword = false, show_file = false, @@ -148,7 +148,6 @@ return function() Method = { icons.kind.Method, "LspKindMethod" }, Module = { icons.kind.Module, "LspKindModule" }, Namespace = { icons.kind.Namespace, "LspKindNamespace" }, - Number = { icons.kind.Number, "LspKindNumber" }, Operator = { icons.kind.Operator, "LspKindOperator" }, Package = { icons.kind.Package, "LspKindPackage" }, Property = { icons.kind.Property, "LspKindProperty" }, @@ -159,6 +158,7 @@ return function() Array = { icons.type.Array, "LspKindArray" }, Boolean = { icons.type.Boolean, "LspKindBoolean" }, Null = { icons.type.Null, "LspKindNull" }, + Number = { icons.type.Number, "LspKindNumber" }, Object = { icons.type.Object, "LspKindObject" }, String = { icons.type.String, "LspKindString" }, -- ccls-specific icons. diff --git a/lua/modules/configs/completion/mason-lspconfig.lua b/lua/modules/configs/completion/mason-lspconfig.lua index 8885aaa2b..567ff9f94 100644 --- a/lua/modules/configs/completion/mason-lspconfig.lua +++ b/lua/modules/configs/completion/mason-lspconfig.lua @@ -16,14 +16,20 @@ M.setup = function() signs = true, underline = true, virtual_text = diagnostics_virtual_text and { - severity_limit = diagnostics_level, + severity = { + min = vim.diagnostic.severity[diagnostics_level], + }, } or false, -- set update_in_insert to false because it was enabled by lspsaga update_in_insert = false, }) local opts = { - capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()), + capabilities = vim.tbl_deep_extend( + "force", + vim.lsp.protocol.make_client_capabilities(), + require("cmp_nvim_lsp").default_capabilities() + ), } ---A handler to setup all servers defined under `completion/servers/*.lua` ---@param lsp_name string diff --git a/lua/modules/configs/completion/null-ls.lua b/lua/modules/configs/completion/null-ls.lua index 3ff15f54b..72982d6ea 100644 --- a/lua/modules/configs/completion/null-ls.lua +++ b/lua/modules/configs/completion/null-ls.lua @@ -17,7 +17,7 @@ return function() -- Don't specify any config here if you are using the default one. local sources = { btns.formatting.clang_format.with({ - filetypes = { "c", "cpp" }, + filetypes = { "c", "cpp", "objc", "objcpp", "cs", "java", "cuda", "proto" }, extra_args = formatter_args("clang_format"), }), btns.formatting.prettier.with({ @@ -42,6 +42,7 @@ return function() log_level = "warn", update_in_insert = false, sources = sources, + default_timeout = require("core.settings").format_timeout, }) require("completion.mason-null-ls").setup() @@ -49,7 +50,7 @@ return function() -- Setup usercmd to register/deregister available source(s) local function _gen_completion() local sources_cont = null_ls.get_source({ - filetype = vim.api.nvim_get_option_value("filetype", { scope = "local" }), + filetype = vim.bo.filetype, }) local completion_items = {} for _, server in pairs(sources_cont) do diff --git a/lua/modules/configs/completion/servers/lua_ls.lua b/lua/modules/configs/completion/servers/lua_ls.lua index 67cc63078..cd68c9ee4 100644 --- a/lua/modules/configs/completion/servers/lua_ls.lua +++ b/lua/modules/configs/completion/servers/lua_ls.lua @@ -2,18 +2,20 @@ return { settings = { Lua = { + runtime = { version = "LuaJIT" }, diagnostics = { globals = { "vim" }, disable = { "different-requires", "undefined-field" }, }, workspace = { library = { - [vim.fn.expand("$VIMRUNTIME/lua")] = true, - [vim.fn.expand("$VIMRUNTIME/lua/vim/lsp")] = true, + vim.fn.expand("$VIMRUNTIME/lua"), + vim.fn.expand("$VIMRUNTIME/lua/vim/lsp"), }, maxPreload = 100000, preloadFileSize = 10000, }, + hint = { enable = true, setType = true }, format = { enable = false }, telemetry = { enable = false }, -- Do not override treesitter lua highlighting with lua_ls's highlighting diff --git a/lua/modules/configs/editor/autoclose.lua b/lua/modules/configs/editor/autoclose.lua index d5e9b0d46..a43888f49 100644 --- a/lua/modules/configs/editor/autoclose.lua +++ b/lua/modules/configs/editor/autoclose.lua @@ -16,8 +16,24 @@ return function() ["'"] = { escape = true, close = true, pair = "''", disabled_filetypes = { "rust" } }, }, options = { - disabled_filetypes = { "big_file_disabled_ft" }, disable_when_touch = false, + disabled_filetypes = { + "alpha", + "bigfile", + "checkhealth", + "dap-repl", + "diff", + "help", + "log", + "notify", + "NvimTree", + "Outline", + "qf", + "TelescopePrompt", + "toggleterm", + "undotree", + "vimwiki", + }, }, }) end diff --git a/lua/modules/configs/editor/autotag.lua b/lua/modules/configs/editor/autotag.lua index 303b67fd2..42dcd973f 100644 --- a/lua/modules/configs/editor/autotag.lua +++ b/lua/modules/configs/editor/autotag.lua @@ -1,12 +1,9 @@ return function() require("modules.utils").load_plugin("nvim-ts-autotag", { - filetypes = { - "html", - "javascript", - "javascriptreact", - "typescriptreact", - "vue", - "xml", + opts = { + enable_close = true, -- Auto close tags + enable_rename = true, -- Auto rename pairs of tags + enable_close_on_slash = false, -- Auto close on trailing 7500 then + return nil + end + + -- Disable on parser error local errors = 200 vim.treesitter.get_parser():for_each_tree(function(lt) if lt:root():has_error() and errors >= 0 then @@ -11,7 +18,8 @@ return function() if errors < 0 then return nil end - return vim.fn.line("$") > threshold and require("rainbow-delimiters").strategy["global"] + + return line_count > threshold and require("rainbow-delimiters").strategy["global"] or require("rainbow-delimiters").strategy["local"] end end @@ -19,8 +27,8 @@ return function() vim.g.rainbow_delimiters = { strategy = { [""] = init_strategy(500), - c = init_strategy(200), - cpp = init_strategy(200), + c = init_strategy(300), + cpp = init_strategy(300), lua = init_strategy(500), vimdoc = init_strategy(300), vim = init_strategy(300), @@ -40,5 +48,6 @@ return function() "RainbowDelimiterViolet", }, } + require("modules.utils").load_plugin("rainbow_delimiters", nil, true) end diff --git a/lua/modules/configs/editor/treesitter.lua b/lua/modules/configs/editor/treesitter.lua index e9fe90151..5b25ebe95 100644 --- a/lua/modules/configs/editor/treesitter.lua +++ b/lua/modules/configs/editor/treesitter.lua @@ -9,7 +9,10 @@ return vim.schedule_wrap(function() highlight = { enable = true, disable = function(ft, bufnr) - if vim.tbl_contains({ "vim" }, ft) then + if + vim.tbl_contains({ "gitcommit" }, ft) + or (vim.api.nvim_buf_line_count(bufnr) > 7500 and ft ~= "vimdoc") + then return true end @@ -21,6 +24,7 @@ return vim.schedule_wrap(function() textobjects = { select = { enable = true, + lookahead = true, keymaps = { ["af"] = "@function.outer", ["if"] = "@function.inner", @@ -30,7 +34,7 @@ return vim.schedule_wrap(function() }, move = { enable = true, - set_jumps = true, -- whether to set jumps in the jumplist + set_jumps = true, goto_next_start = { ["]["] = "@function.outer", ["]m"] = "@class.outer", @@ -55,8 +59,8 @@ return vim.schedule_wrap(function() require("nvim-treesitter.install").prefer_git = true if use_ssh then local parsers = require("nvim-treesitter.parsers").get_parser_configs() - for _, p in pairs(parsers) do - p.install_info.url = p.install_info.url:gsub("https://github.com/", "git@github.com:") + for _, parser in pairs(parsers) do + parser.install_info.url = parser.install_info.url:gsub("https://github.com/", "git@github.com:") end end end) diff --git a/lua/modules/configs/editor/ts-context.lua b/lua/modules/configs/editor/ts-context.lua index 186a52558..ba96e0312 100644 --- a/lua/modules/configs/editor/ts-context.lua +++ b/lua/modules/configs/editor/ts-context.lua @@ -7,6 +7,6 @@ return function() multiline_threshold = 20, -- Maximum number of lines to collapse for a single context line trim_scope = "outer", -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer' mode = "cursor", -- Line used to calculate context. Choices: 'cursor', 'topline' - zindex = 30, + zindex = 50, -- Ensure compatibility with Glance's preview window }) end diff --git a/lua/modules/configs/lang/crates-keymap.lua b/lua/modules/configs/lang/crates-keymap.lua index 1c07e9ff2..cf1584cff 100644 --- a/lua/modules/configs/lang/crates-keymap.lua +++ b/lua/modules/configs/lang/crates-keymap.lua @@ -1,16 +1,17 @@ local bind = require("keymap.bind") local map_callback = bind.map_callback +local crates = require("crates") local crates_keymap = { ["n|ct"] = map_callback(function() - require("crates").toggle() + crates.toggle() end) :with_noremap() :with_silent() :with_buffer(0) :with_desc("crates: Toggle spec activities"), ["n|cr"] = map_callback(function() - require("crates").reload() + crates.reload() end) :with_noremap() :with_silent() @@ -18,31 +19,31 @@ local crates_keymap = { :with_desc("crates: Reload crate specs"), ["n|cs"] = map_callback(function() - require("crates").show_popup() + crates.show_popup() end) :with_noremap() :with_silent() :with_buffer(0) :with_desc("crates: Toggle pop-up window"), ["n|cv"] = map_callback(function() - require("crates").show_versions_popup() - require("crates").show_popup() + crates.show_versions_popup() + crates.show_popup() end) :with_noremap() :with_silent() :with_buffer(0) :with_desc("crates: Select spec versions"), ["n|cf"] = map_callback(function() - require("crates").show_features_popup() - require("crates").show_popup() + crates.show_features_popup() + crates.show_popup() end) :with_noremap() :with_silent() :with_buffer(0) :with_desc("crates: Select spec features"), ["n|cd"] = map_callback(function() - require("crates").show_dependencies_popup() - require("crates").show_popup() + crates.show_dependencies_popup() + crates.show_popup() end) :with_noremap() :with_silent() @@ -50,42 +51,42 @@ local crates_keymap = { :with_desc("crates: Show project dependencies"), ["n|cu"] = map_callback(function() - require("crates").update_crate() + crates.update_crate() end) :with_noremap() :with_silent() :with_buffer(0) :with_desc("crates: Update current crate's spec"), ["v|cu"] = map_callback(function() - require("crates").update_crates() + crates.update_crates() end) :with_noremap() :with_silent() :with_buffer(0) :with_desc("crates: Update selected crate's spec"), ["n|ca"] = map_callback(function() - require("crates").update_all_crates() + crates.update_all_crates() end) :with_noremap() :with_silent() :with_buffer(0) :with_desc("crates: Update all crates' specs"), ["n|cU"] = map_callback(function() - require("crates").upgrade_crate() + crates.upgrade_crate() end) :with_noremap() :with_silent() :with_buffer(0) :with_desc("crates: Upgrade current crate"), ["v|cU"] = map_callback(function() - require("crates").upgrade_crates() + crates.upgrade_crates() end) :with_noremap() :with_silent() :with_buffer(0) :with_desc("crates: Upgrade selected crates"), ["n|cA"] = map_callback(function() - require("crates").upgrade_all_crates() + crates.upgrade_all_crates() end) :with_noremap() :with_silent() @@ -93,28 +94,28 @@ local crates_keymap = { :with_desc("crates: Upgrade all crates"), ["n|cH"] = map_callback(function() - require("crates").open_homepage() + crates.open_homepage() end) :with_noremap() :with_silent() :with_buffer(0) :with_desc("crates: Open current crate's homepage"), ["n|cR"] = map_callback(function() - require("crates").open_repository() + crates.open_repository() end) :with_noremap() :with_silent() :with_buffer(0) :with_desc("crates: Open current crate's repository"), ["n|cD"] = map_callback(function() - require("crates").open_documentation() + crates.open_documentation() end) :with_noremap() :with_silent() :with_buffer(0) :with_desc("crates: Open current crate's documentation"), ["n|cC"] = map_callback(function() - require("crates").open_crates_io() + crates.open_crates_io() end) :with_noremap() :with_silent() diff --git a/lua/modules/configs/tool/dropbar.lua b/lua/modules/configs/tool/dropbar.lua new file mode 100644 index 000000000..a02dcaf04 --- /dev/null +++ b/lua/modules/configs/tool/dropbar.lua @@ -0,0 +1,109 @@ +return function() + local icons = { + kind = require("modules.utils.icons").get("kind", true), + type = require("modules.utils.icons").get("type", true), + misc = require("modules.utils.icons").get("misc", true), + ui = require("modules.utils.icons").get("ui", true), + } + + require("modules.utils").load_plugin("dropbar", { + bar = { + hover = false, + truncate = true, + pick = { pivots = "etovxqpdygfblzhckisuran" }, + }, + sources = { + path = { + relative_to = function() + -- Only show the leaf filename in dropbar + return vim.fn.expand("%:p:h") + end, + }, + terminal = { + name = function(buf) + local name = vim.api.nvim_buf_get_name(buf) + local term = select(2, require("toggleterm.terminal").identify(name)) + -- Trying to "snag" a display name from toggleterm + if term then + return term.display_name or term.name + else + return name + end + end, + }, + }, + icons = { + enable = true, + kinds = { + use_devicons = true, + symbols = { + -- Type + Array = icons.type.Array, + Boolean = icons.type.Boolean, + Null = icons.type.Null, + Number = icons.type.Number, + Object = icons.type.Object, + String = icons.type.String, + Text = icons.type.String, + + -- Kind + BreakStatement = icons.kind.Break, + Call = icons.kind.Call, + CaseStatement = icons.kind.Case, + Class = icons.kind.Class, + Color = icons.kind.Color, + Constant = icons.kind.Constant, + Constructor = icons.kind.Constructor, + ContinueStatement = icons.kind.Continue, + Declaration = icons.kind.Declaration, + Delete = icons.kind.Delete, + DoStatement = icons.kind.Loop, + Enum = icons.kind.Enum, + EnumMember = icons.kind.EnumMember, + Event = icons.kind.Event, + Field = icons.kind.Field, + File = icons.kind.File, + ForStatement = icons.kind.Loop, + Function = icons.kind.Function, + Identifier = icons.kind.Variable, + Interface = icons.kind.Interface, + Keyword = icons.kind.Keyword, + List = icons.kind.List, + Lsp = icons.misc.LspAvailable, + Method = icons.kind.Method, + Module = icons.kind.Module, + Namespace = icons.kind.Namespace, + Operator = icons.kind.Operator, + Package = icons.kind.Package, + Pair = icons.kind.List, + Property = icons.kind.Property, + Reference = icons.kind.Reference, + Regex = icons.kind.Regex, + Repeat = icons.kind.Loop, + Scope = icons.kind.Statement, + Snippet = icons.kind.Snippet, + Statement = icons.kind.Statement, + Struct = icons.kind.Struct, + SwitchStatement = icons.kind.Switch, + Type = icons.kind.Interface, + TypeParameter = icons.kind.TypeParameter, + Unit = icons.kind.Unit, + Value = icons.kind.Value, + Variable = icons.kind.Variable, + WhileStatement = icons.kind.Loop, + + -- Microsoft-specific icons + Folder = icons.kind.Folder, + + -- ccls-specific icons + Macro = icons.kind.Macro, + Terminal = icons.kind.Terminal, + }, + }, + ui = { + bar = { separator = "  " }, + menu = { indicator = icons.ui.ArrowClosed }, + }, + }, + }) +end diff --git a/lua/modules/configs/tool/nvim-tree.lua b/lua/modules/configs/tool/nvim-tree.lua index 3f6f64112..fcf5288ce 100644 --- a/lua/modules/configs/tool/nvim-tree.lua +++ b/lua/modules/configs/tool/nvim-tree.lua @@ -126,8 +126,27 @@ return function() enable = true, chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890", exclude = { - filetype = { "notify", "qf", "diff", "fugitive", "fugitiveblame" }, - buftype = { "terminal", "help" }, + buftype = { + "help", + "nofile", + "prompt", + "quickfix", + "terminal", + }, + filetype = { + "dap-repl", + "diff", + "fugitive", + "fugitiveblame", + "git", + "notify", + "NvimTree", + "Outline", + "qf", + "TelescopePrompt", + "toggleterm", + "undotree", + }, }, }, }, diff --git a/lua/modules/configs/tool/search.lua b/lua/modules/configs/tool/search.lua new file mode 100644 index 000000000..ffad69cbc --- /dev/null +++ b/lua/modules/configs/tool/search.lua @@ -0,0 +1,141 @@ +return function() + local builtin = require("telescope.builtin") + local extensions = require("telescope").extensions + + require("modules.utils").load_plugin("search", { + collections = { + -- Search using filenames + file = { + initial_tab = 1, + tabs = { + { + name = "Files", + tele_func = function(opts) + opts = opts or {} + if vim.fn.isdirectory(".git") == 1 then + builtin.git_files(opts) + else + builtin.find_files(opts) + end + end, + }, + { + name = "Frecency", + tele_func = function() + extensions.frecency.frecency() + end, + }, + { + name = "Oldfiles", + tele_func = function() + builtin.oldfiles() + end, + }, + { + name = "Buffers", + tele_func = function() + builtin.buffers() + end, + }, + }, + }, + -- Search using patterns + pattern = { + initial_tab = 1, + tabs = { + { + name = "Word in project", + tele_func = function() + extensions.live_grep_args.live_grep_args() + end, + }, + { + name = "Word under cursor", + tele_func = function(opts) + opts = opts or {} + builtin.grep_string(opts) + end, + }, + }, + }, + -- Search Git objects (branches, commits) + git = { + initial_tab = 1, + tabs = { + { + name = "Branches", + tele_func = function() + builtin.git_branches() + end, + }, + { + name = "Commits", + tele_func = function() + builtin.git_commits() + end, + }, + { + name = "Commit content", + tele_func = function() + extensions.advanced_git_search.search_log_content() + end, + }, + { + name = "Diff current file with commit", + tele_func = function() + extensions.advanced_git_search.diff_commit_file() + end, + }, + }, + }, + -- Retrieve dossiers + dossier = { + initial_tab = 1, + tabs = { + { + name = "Sessions", + tele_func = function() + extensions.persisted.persisted() + end, + }, + { + name = "Projects", + tele_func = function() + extensions.projects.projects({}) + end, + }, + { + name = "Zoxide", + tele_func = function() + extensions.zoxide.list() + end, + }, + }, + }, + -- Miscellaneous + misc = { + initial_tab = 1, + tabs = { + { + name = "Colorschemes", + tele_func = function() + builtin.colorscheme({ enable_preview = true }) + end, + }, + { + name = "Notify", + tele_func = function() + extensions.notify.notify() + end, + }, + { + name = "Undo History", + tele_func = function() + extensions.undo.undo() + end, + }, + }, + }, + }, + }) +end diff --git a/lua/modules/configs/tool/telescope.lua b/lua/modules/configs/tool/telescope.lua index d8fdddd44..71884d085 100644 --- a/lua/modules/configs/tool/telescope.lua +++ b/lua/modules/configs/tool/telescope.lua @@ -64,7 +64,6 @@ return function() }, live_grep_args = { auto_quoting = true, -- enable/disable auto-quoting - -- define mappings, e.g. mappings = { -- extend mappings i = { [""] = lga_actions.quote_prompt(), @@ -74,18 +73,19 @@ return function() }, undo = { side_by_side = true, - mappings = { -- this whole table is the default + mappings = { i = { - -- IMPORTANT: Note that telescope-undo must be available when telescope is configured if - -- you want to use the following actions. This means installing as a dependency of - -- telescope in it's `requirements` and loading this extension from there instead of - -- having the separate plugin definition as outlined above. See issue #6. [""] = require("telescope-undo.actions").yank_additions, [""] = require("telescope-undo.actions").yank_deletions, [""] = require("telescope-undo.actions").restore, }, }, }, + advanced_git_search = { + diff_plugin = "diffview", + git_flags = { "-c", "delta.side-by-side=true" }, + entry_default_author_or_date = "author", -- one of "author" or "date" + }, }, }) @@ -98,4 +98,5 @@ return function() require("telescope").load_extension("zoxide") require("telescope").load_extension("persisted") require("telescope").load_extension("aerial") + require("telescope").load_extension("advanced_git_search") end diff --git a/lua/modules/configs/tool/trouble.lua b/lua/modules/configs/tool/trouble.lua index 386af479a..6a9bbfcb0 100644 --- a/lua/modules/configs/tool/trouble.lua +++ b/lua/modules/configs/tool/trouble.lua @@ -1,55 +1,38 @@ return function() local icons = { - ui = require("modules.utils.icons").get("ui"), - diagnostics = require("modules.utils.icons").get("diagnostics"), + ui = require("modules.utils.icons").get("ui", true), } require("modules.utils").load_plugin("trouble", { - position = "bottom", -- position of the list can be: bottom, top, left, right - height = 10, -- height of the trouble list when position is top or bottom - width = 50, -- width of the list when position is left or right - icons = true, -- use devicons for filenames - mode = "document_diagnostics", -- "workspace_diagnostics", "document_diagnostics", "quickfix", "lsp_references", "loclist" - fold_open = icons.ui.ArrowOpen, -- icon used for open folds - fold_closed = icons.ui.ArrowClosed, -- icon used for closed folds - group = true, -- group results by file - padding = true, -- add an extra new line on top of the list - action_keys = { - -- key mappings for actions in the trouble list - -- map to {} to remove a mapping, for example: - -- close = {}, - close = "q", -- close the list - cancel = "", -- cancel the preview and get back to your last window / buffer / cursor - refresh = "r", -- manually refresh - jump = { "", "" }, -- jump to the diagnostic or open / close folds - open_split = { "" }, -- open buffer in new split - open_vsplit = { "" }, -- open buffer in new vsplit - open_tab = { "" }, -- open buffer in new tab - jump_close = { "o" }, -- jump to the diagnostic and close the list - toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode - toggle_preview = "P", -- toggle auto_preview - hover = "K", -- opens a small popup with the full multiline message - preview = "p", -- preview the diagnostic location - close_folds = { "zM", "zm" }, -- close all folds - open_folds = { "zR", "zr" }, -- open all folds - toggle_fold = { "zA", "za" }, -- toggle fold of current file - previous = "k", -- preview item - next = "j", -- next item + auto_open = false, + auto_close = false, + auto_jump = false, + auto_preview = true, + auto_refresh = true, + focus = false, -- do not focus the window when opened + follow = true, + restore = true, + icons = { + indent = { + fold_open = icons.ui.ArrowOpen, + fold_closed = icons.ui.ArrowClosed, + }, + folder_closed = icons.ui.Folder, + folder_open = icons.ui.FolderOpen, }, - indent_lines = true, -- add an indent guide below the fold icons - auto_open = false, -- automatically open the list when you have diagnostics - auto_close = false, -- automatically close the list when you have no diagnostics - auto_preview = true, -- automatically preview the location of the diagnostic. to close preview and go back to last window - auto_fold = false, -- automatically fold a file trouble list at creation - auto_jump = { "lsp_definitions" }, -- for the given modes, automatically jump if there is only a single result - signs = { - -- icons / text used for a diagnostic - error = icons.diagnostics.Error_alt, - warning = icons.diagnostics.Warning_alt, - hint = icons.diagnostics.Hint_alt, - information = icons.diagnostics.Information_alt, - other = icons.diagnostics.Question_alt, + modes = { + project_diagnostics = { + mode = "diagnostics", + filter = { + any = { + { + function(item) + return item.filename:find(vim.fn.getcwd(), 1, true) + end, + }, + }, + }, + }, }, - use_diagnostic_signs = false, -- enabling this will use the signs defined in your lsp client }) end diff --git a/lua/modules/configs/ui/alpha.lua b/lua/modules/configs/ui/alpha.lua index c84dbcf06..befcbd2e3 100644 --- a/lua/modules/configs/ui/alpha.lua +++ b/lua/modules/configs/ui/alpha.lua @@ -39,55 +39,56 @@ return function() end local leader = " " + local icons = { + documents = require("modules.utils.icons").get("documents", true), + git = require("modules.utils.icons").get("git", true), + ui = require("modules.utils.icons").get("ui", true), + misc = require("modules.utils.icons").get("misc", true), + } + dashboard.section.buttons.val = { - button("space f c", " Scheme change", leader, nil, { - noremap = true, - silent = true, - nowait = true, - callback = function() - require("telescope.builtin").colorscheme() - end, - }), - button("space f r", " File frecency", leader, nil, { - noremap = true, - silent = true, - nowait = true, - callback = function() - require("telescope").extensions.frecency.frecency({}) - end, - }), - button("space f e", "󰋚 File history", leader, nil, { - noremap = true, - silent = true, - nowait = true, - callback = function() - require("telescope.builtin").oldfiles() - end, - }), - button("space f p", " Project find", leader, nil, { - noremap = true, - silent = true, - nowait = true, - callback = function() - require("telescope").extensions.projects.projects({}) - end, - }), - button("space f f", "󰈞 File find", leader, nil, { - noremap = true, - silent = true, - nowait = true, - callback = function() - require("telescope.builtin").find_files() - end, - }), - button("space f w", " Word find", leader, nil, { - noremap = true, - silent = true, - nowait = true, - callback = function() - require("telescope.builtin").live_grep() - end, - }), + button( + "space f c", + icons.misc.Neovim .. "Telescope collections", + leader, + nil, + { noremap = true, silent = true, nowait = true } + ), + button( + "space f f", + icons.documents.FileFind .. "Find files", + leader, + nil, + { noremap = true, silent = true, nowait = true } + ), + button( + "space f d", + icons.ui.FolderWithHeart .. "Retrieve dossiers", + leader, + nil, + { noremap = true, silent = true, nowait = true } + ), + button( + "space f p", + icons.documents.Word .. "Find patterns", + leader, + nil, + { noremap = true, silent = true, nowait = true } + ), + button( + "space f g", + icons.git.Git .. "Locate Git objects", + leader, + nil, + { noremap = true, silent = true, nowait = true } + ), + button( + "space f m", + icons.misc.Ghost .. "Miscellaneous artifacts", + leader, + nil, + { noremap = true, silent = true, nowait = true } + ), } dashboard.section.buttons.opts.hl = "AlphaButtons" @@ -113,7 +114,7 @@ return function() local head_butt_padding = 2 local occu_height = #dashboard.section.header.val + 2 * #dashboard.section.buttons.val + head_butt_padding - local header_padding = math.max(0, math.ceil((vim.fn.winheight("$") - occu_height) * 0.25)) + local header_padding = math.max(0, math.ceil((vim.fn.winheight(0) - occu_height) * 0.25)) local foot_butt_padding = 1 dashboard.config.layout = { diff --git a/lua/modules/configs/ui/catppuccin.lua b/lua/modules/configs/ui/catppuccin.lua index b3a402394..c0a9048b1 100644 --- a/lua/modules/configs/ui/catppuccin.lua +++ b/lua/modules/configs/ui/catppuccin.lua @@ -146,6 +146,7 @@ return function() -- For trouble.nvim TroubleNormal = { bg = transparent_background and cp.none or cp.base }, + TroubleNormalNC = { bg = transparent_background and cp.none or cp.base }, -- For telescope.nvim TelescopeMatching = { fg = cp.lavender }, diff --git a/lua/modules/configs/ui/gitsigns.lua b/lua/modules/configs/ui/gitsigns.lua index c70684266..de14cd5f5 100644 --- a/lua/modules/configs/ui/gitsigns.lua +++ b/lua/modules/configs/ui/gitsigns.lua @@ -2,45 +2,22 @@ return function() local mapping = require("keymap.ui") require("modules.utils").load_plugin("gitsigns", { signs = { - add = { - hl = "GitSignsAdd", - text = "│", - numhl = "GitSignsAddNr", - linehl = "GitSignsAddLn", - }, - change = { - hl = "GitSignsChange", - text = "│", - numhl = "GitSignsChangeNr", - linehl = "GitSignsChangeLn", - }, - delete = { - hl = "GitSignsDelete", - text = "_", - numhl = "GitSignsDeleteNr", - linehl = "GitSignsDeleteLn", - }, - topdelete = { - hl = "GitSignsDelete", - text = "‾", - numhl = "GitSignsDeleteNr", - linehl = "GitSignsDeleteLn", - }, - changedelete = { - hl = "GitSignsChange", - text = "~", - numhl = "GitSignsChangeNr", - linehl = "GitSignsChangeLn", - }, + add = { text = "┃" }, + change = { text = "┃" }, + delete = { text = "_" }, + topdelete = { text = "‾" }, + changedelete = { text = "~" }, + untracked = { text = "┆" }, }, + auto_attach = true, on_attach = mapping.gitsigns, - watch_gitdir = { interval = 1000, follow_files = true }, - current_line_blame = true, - current_line_blame_opts = { delay = 1000, virtual_text_pos = "eol" }, + signcolumn = true, sign_priority = 6, update_debounce = 100, - status_formatter = nil, -- Use default word_diff = false, + current_line_blame = true, diff_opts = { internal = true }, + watch_gitdir = { follow_files = true }, + current_line_blame_opts = { delay = 1000, virt_text = true, virtual_text_pos = "eol" }, }) end diff --git a/lua/modules/configs/ui/indent-blankline.lua b/lua/modules/configs/ui/indent-blankline.lua index 1f55ea3a9..169a56f29 100644 --- a/lua/modules/configs/ui/indent-blankline.lua +++ b/lua/modules/configs/ui/indent-blankline.lua @@ -1,4 +1,468 @@ return function() + -- This list delineates the per-language nodes used for guiding |ibl| in highlighting the current scope + -- It is extracted from each language's `indents.scm` file + -- NOTE: Only a subset of the supported programming languages is included + -- If your preferred language isn't listed, you can add it to the user config + local nodes = { + bibtex = { + "entry", + }, + c = { + "case_statement", + "compound_literal_expression", + "enumerator_list", + "field_declaration_list", + "initializer_list", + "init_declarator", + }, + cmake = { + "block_def", + "foreach_loop", + "function_def", + "if_condition", + "macro_def", + "normal_command", + "while_loop", + }, + cpp = { + "case_statement", + "compound_literal_expression", + "condition_clause", + "enumerator_list", + "field_declaration_list", + "field_initializer_list", + "init_declarator", + "initializer_list", + "namespace_definition", + }, + css = { + "block", + "declaration", + }, + d = { + "aggregate_body", + "block_statement", + "case_statement", + "expression_statement", + "function_body", + "parameters", + "scope_statement", + "template_parameters", + }, + dart = { + "arguments", + "class_body", + "formal_parameter", + "formal_parameter_list", + "function_body", + "function_expression_body", + "initializers", + "list_literal", + "return_statement", + "switch_block", + }, + dot = { + "block", + "attr_list", + }, + ecma = { + "arguments", + "array", + "binary_expression", + "call_expression", + "class_body", + "export_clause", + "formal_parameters", + "named_imports", + "object", + "object_pattern", + "parenthesized_expression", + "return_statement", + "switch_case", + "switch_default", + "switch_statement", + "template_substitution", + "ternary_expression", + }, + elixir = { + "arguments", + "block", + "do_block", + "list", + "map", + "tuple", + }, + firrtl = { + "memory", + }, + fortran = { + "derived_type_definition", + "do_loop_statement", + "enum", + "function", + "if_statement", + "module", + "program", + "subroutine", + "where_statement", + }, + gleam = { + "anonymous_function", + "assert", + "case", + "constant", + "external_function", + "function", + "import", + "let", + "list", + "constant", + "function", + "type_definition", + "type_alias", + "todo", + "tuple", + }, + go = { + "call_expression", + "communication_case", + "const_declaration", + "default_case", + "expression_case", + "import_declaration", + "literal_value", + "parameter_list", + "struct_type", + "type_case", + "type_declaration", + "var_declaration", + }, + html = { + "start_tag", + "self_closing_tag", + }, + java = { + "annotation_argument_list", + "annotation_type_body", + "argument_list", + "array_initializer", + "class_body", + "constructor_body", + "element_value_array_initializer", + "enum_body", + "formal_parameters", + "interface_body", + "method_invocation", + "switch_block", + }, + javascript = { + "arguments", + "array", + "binary_expression", + "call_expression", + "class_body", + "export_clause", + "formal_parameters", + "jsx_expression", + "jsx_self_closing_element", + "named_imports", + "object", + "object_pattern", + "parenthesized_expression", + "return_statement", + "switch_case", + "switch_default", + "switch_statement", + "template_substitution", + "ternary_expression", + }, + julia = { + "assignment", + "call_expression", + "compound_statement", + "comprehension_expression", + "for_binding", + "if_statement", + "matrix_expression", + "parenthesized_expression", + "struct_definition", + "tuple_expression", + "vector_expression", + }, + just = { + "external_command", + "recipe", + "string", + }, + linkerscript = { + "memory_command", + "output_section", + "phdrs_command", + "sections_command", + }, + lua = { + "arguments", + "field", + "method_index_expression", + "return_statement", + "table_constructor", + }, + matlab = { + "class_definition", + "enumeration", + "events", + "for_statement", + "if_statement", + "methods", + "properties", + "switch_statement", + "try_statement", + "while_statement", + }, + ninja = { + "build", + "pool", + "rule", + }, + ocaml = { + "application_expression", + "do_clause", + "external", + "field_expression", + "if_expression", + "list_expression", + "parenthesized_expression", + "record_declaration", + "record_expression", + "try_expression", + "type_binding", + "value_specification", + }, + pascal = { + "arrInitializer", + "block", + "declArgs", + "declClass", + "declConsts", + "declProc", + "declTypes", + "declUses", + "declVars", + "defaultValue", + "exprArgs", + "exprBrackets", + "exprParens", + "exprSubscript", + "recInitializer", + "statement", + }, + php = { + "arguments", + "array_creation_expression", + "binary_expression", + "case_statement", + "compound_statement", + "declaration_list", + "default_statement", + "enum_declaration_list", + "formal_parameters", + "match_block", + "member_call_expression", + "parenthesized_expression", + "return_statement", + "switch_block", + }, + python = { + "binary_operator", + "case_clause", + "concatenated_string", + "for_statement", + "generator_expression", + "if_statement", + "import_from_statement", + "lambda", + "list_pattern", + "match_statement", + "parenthesized_expression", + "try_statement", + "tuple_pattern", + "while_statement", + "with_statement", + }, + query = { + "list", + "predicate", + }, + r = { + "brace_list", + "call", + "paren_list", + "pipe", + "special", + }, + readline = { + "conditional_construct", + }, + ruby = { + "argument_list", + "array", + "assignment", + "begin", + "call", + "case", + "for", + "hash", + "if", + "module", + "parenthesized_statements", + "singleton_class", + "singleton_method", + "unless", + "until", + "while", + }, + rust = { + "arguments", + "array_expression", + "assignment_expression", + "call_expression", + "enum_variant_list", + "field_declaration_list", + "macro_definition", + "match_block", + "mod_item", + "ordered_field_declaration_list", + "parameters", + "struct_expression", + "struct_pattern", + "token_repetition", + "token_tree", + "trait_item", + "tuple_expression", + "tuple_pattern", + "tuple_struct_pattern", + "tuple_type", + "use_list", + "where_clause", + }, + scss = { + "block", + "declaration", + "each_statement", + "mixin_statement", + "while_statement", + }, + sql = { + "case", + "column_definitions", + "cte", + "insert", + "select", + "subquery", + "when_clause", + }, + ssh_config = { + "host_declaration", + "match_declaration", + }, + swift = { + "array_literal", + "array_type", + "assignment", + "call_expression", + "class_body", + "computed_getter", + "computed_property", + "computed_setter", + "control_transfer_statement", + "deinit_declaration", + "dictionary_literal", + "dictionary_type", + "didset_clause", + "enum_class_body", + "init_declaration", + "lambda_literal", + "protocol_body", + "subscript_declaration", + "tuple_expression", + "tuple_type", + "type_parameters", + "willset_clause", + "willset_didset_block", + }, + tablegen = { + "assert", + "value_suffix", + }, + tcl = { + "braced_word_simple", + "command", + "command_substitution", + "conditional", + "foreach", + "namespace", + "procedure", + "try", + "while", + }, + teal = { + "record_declaration", + "function_body", + "table_constructor", + "return_statement", + "while_statement", + }, + terraform = { + "block", + "function_call", + "object", + "tuple", + }, + textproto = { + "message_list", + "message_value", + "scalar_list", + }, + toml = { + "array", + "inline_table", + }, + typescript = { + "arguments", + "array", + "binary_expression", + "call_expression", + "class_body", + "enum_declaration", + "export_clause", + "formal_parameters", + "interface_declaration", + "named_imports", + "object", + "object_pattern", + "object_type", + "parenthesized_expression", + "return_statement", + "switch_case", + "switch_default", + "switch_statement", + "template_substitution", + "ternary_expression", + }, + vue = { + "start_tag", + }, + xml = { + "element", + }, + zig = { + "Block", + "ContainerDecl", + "InitList", + "SwitchExpr", + }, + } + require("modules.utils").load_plugin("ibl", { enabled = true, debounce = 200, @@ -19,76 +483,96 @@ return function() priority = 1000, include = { node_type = { - ["*"] = { - "argument_list", - "arguments", - "assignment_statement", - "Block", - "class", - "ContainerDecl", - "dictionary", - "do_block", - "do_statement", - "element", - "except", - "FnCallArguments", - "for", - "for_statement", - "function", - "function_declaration", - "function_definition", - "if_statement", - "IfExpr", - "IfStatement", - "import", - "InitList", - "list_literal", - "method", - "object", - "ParamDeclList", - "repeat_statement", - "selector", - "SwitchExpr", - "table", - "table_constructor", - "try", - "tuple", - "type", - "var", - "while", - "while_statement", - "with", - }, + angular = nodes.html, + arduino = nodes.cpp, + astro = nodes.html, + bibtex = nodes.bibtex, + c = nodes.c, + cmake = nodes.cmake, + cpp = nodes.cpp, + css = nodes.css, + cuda = nodes.cpp, + d = nodes.d, + dart = nodes.dart, + dot = nodes.dot, + ecma = nodes.ecma, + elixir = nodes.elixir, + firrtl = nodes.firrtl, + fortran = nodes.fortran, + glsl = nodes.c, + gleam = nodes.gleam, + go = nodes.go, + hlsl = nodes.cpp, + html = nodes.html, + java = nodes.java, + javascript = nodes.javascript, + julia = nodes.julia, + just = nodes.just, + linkerscript = nodes.linkerscript, + lua = nodes.lua, + luau = nodes.lua, + matlab = nodes.matlab, + ninja = nodes.ninja, + objc = nodes.c, + ocaml = nodes.ocaml, + ocaml_interface = nodes.ocaml, + pascal = nodes.pascal, + php = nodes.php, + python = nodes.python, + query = nodes.query, + r = nodes.r, + readline = nodes.readline, + ruby = nodes.ruby, + rust = nodes.rust, + scss = nodes.scss, + sql = nodes.sql, + ssh_config = nodes.ssh_config, + swift = nodes.swift, + tablegen = nodes.tablegen, + tcl = nodes.tcl, + teal = nodes.teal, + terraform = nodes.terraform, + textproto = nodes.textproto, + toml = nodes.toml, + typescript = nodes.typescript, + vue = nodes.vue, + xml = nodes.xml, + zig = nodes.zig, }, }, }, exclude = { + buftypes = { + "help", + "nofile", + "prompt", + "quickfix", + "terminal", + }, filetypes = { "", -- for all buffers without a file type - "aerial", "alpha", - "big_file_disabled_ft", - "dashboard", - "dotooagenda", - "flutterToolsOutline", + "bigfile", + "checkhealth", + "dap-repl", + "diff", "fugitive", + "fugitiveblame", "git", "gitcommit", "help", - "json", "log", "markdown", + "notify", "NvimTree", - "peekaboo", - "startify", + "Outline", + "qf", "TelescopePrompt", - "todoist", - "txt", + "text", + "toggleterm", "undotree", "vimwiki", - "vista", }, - buftypes = { "terminal", "nofile", "quickfix", "prompt" }, }, }) end diff --git a/lua/modules/configs/ui/lualine.lua b/lua/modules/configs/ui/lualine.lua index 5681523a3..39e4b8911 100644 --- a/lua/modules/configs/ui/lualine.lua +++ b/lua/modules/configs/ui/lualine.lua @@ -163,8 +163,8 @@ return function() lsp = { function() - local buf_ft = vim.api.nvim_get_option_value("filetype", { scope = "local" }) - local clients = vim.lsp.get_active_clients() + local buf_ft = vim.bo.filetype + local clients = vim.lsp.get_clients({ buffer = vim.api.nvim_get_current_buf() }) local lsp_lists = {} local available_servers = {} if next(clients) == nil then @@ -201,7 +201,7 @@ return function() return venv end - if vim.api.nvim_get_option_value("filetype", { scope = "local" }) == "python" then + if vim.bo.filetype == "python" then local venv = os.getenv("CONDA_DEFAULT_ENV") if venv then return icons.misc.PyEnv .. env_cleanup(venv) @@ -219,7 +219,7 @@ return function() tabwidth = { function() - return icons.ui.Tab .. vim.api.nvim_get_option_value("tabstop", { scope = "local" }) + return icons.ui.Tab .. vim.bo.tabstop end, padding = 1, }, diff --git a/lua/modules/configs/ui/neodim.lua b/lua/modules/configs/ui/neodim.lua index 17a5b262c..08ee94d66 100644 --- a/lua/modules/configs/ui/neodim.lua +++ b/lua/modules/configs/ui/neodim.lua @@ -11,6 +11,27 @@ return function() underline = false, }, priority = 80, - disable = { "big_file_disabled_ft" }, + disable = { + "alpha", + "bigfile", + "checkhealth", + "dap-repl", + "diff", + "fugitive", + "fugitiveblame", + "git", + "gitcommit", + "help", + "log", + "notify", + "NvimTree", + "Outline", + "qf", + "TelescopePrompt", + "text", + "toggleterm", + "undotree", + "vimwiki", + }, }) end diff --git a/lua/modules/configs/ui/scrollview.lua b/lua/modules/configs/ui/scrollview.lua index d3a821d53..ef11b5992 100644 --- a/lua/modules/configs/ui/scrollview.lua +++ b/lua/modules/configs/ui/scrollview.lua @@ -3,12 +3,22 @@ return function() require("modules.utils").load_plugin("scrollview", { mode = "virtual", - excluded_filetypes = { "NvimTree", "terminal", "nofile", "aerial" }, winblend = 0, signs_on_startup = { "diagnostics", "folds", "marks", "search", "spell" }, diagnostics_error_symbol = icons.diagnostics.Error, diagnostics_warn_symbol = icons.diagnostics.Warning, diagnostics_info_symbol = icons.diagnostics.Information, diagnostics_hint_symbol = icons.diagnostics.Hint, + excluded_filetypes = { + "alpha", + "fugitive", + "git", + "notify", + "NvimTree", + "Outline", + "TelescopePrompt", + "toggleterm", + "undotree", + }, }) end diff --git a/lua/modules/configs/ui/todo.lua b/lua/modules/configs/ui/todo.lua index bbd8af4b8..ebdef8ee3 100644 --- a/lua/modules/configs/ui/todo.lua +++ b/lua/modules/configs/ui/todo.lua @@ -30,7 +30,22 @@ return function() after = "", comments_only = true, max_line_len = 500, - exclude = { "big_file_disabled_ft", "checkhealth" }, + exclude = { + "alpha", + "bigfile", + "checkhealth", + "dap-repl", + "diff", + "help", + "log", + "notify", + "NvimTree", + "Outline", + "qf", + "TelescopePrompt", + "toggleterm", + "undotree", + }, }, colors = { error = { "DiagnosticError", "ErrorMsg", "#DC2626" }, diff --git a/lua/modules/plugins/completion.lua b/lua/modules/plugins/completion.lua index d4b5d088d..af694f73f 100644 --- a/lua/modules/plugins/completion.lua +++ b/lua/modules/plugins/completion.lua @@ -26,7 +26,7 @@ completion["stevearc/aerial.nvim"] = { event = "LspAttach", config = require("completion.aerial"), } -completion["dnlhc/glance.nvim"] = { +completion["DNLHC/glance.nvim"] = { lazy = true, event = "LspAttach", config = require("completion.glance"), @@ -51,8 +51,9 @@ completion["hrsh7th/nvim-cmp"] = { dependencies = { { "L3MON4D3/LuaSnip", - dependencies = { "rafamadriz/friendly-snippets" }, + build = "make install_jsregexp", config = require("completion.luasnip"), + dependencies = { "rafamadriz/friendly-snippets" }, }, { "lukas-reineke/cmp-under-comparator" }, { "saadparwaiz1/cmp_luasnip" }, diff --git a/lua/modules/plugins/editor.lua b/lua/modules/plugins/editor.lua index 73b273351..f396fc0ad 100644 --- a/lua/modules/plugins/editor.lua +++ b/lua/modules/plugins/editor.lua @@ -63,9 +63,14 @@ editor["smoka7/hop.nvim"] = { } editor["tzachar/local-highlight.nvim"] = { lazy = true, - event = { "CursorHold", "CursorHoldI" }, + event = { "BufReadPost", "BufAdd", "BufNewFile" }, config = require("editor.local-highlight"), } +editor["brenoprata10/nvim-highlight-colors"] = { + lazy = true, + event = { "CursorHold", "CursorHoldI" }, + config = require("editor.highlight-colors"), +} editor["romainl/vim-cool"] = { lazy = true, event = { "CursorMoved", "InsertEnter" }, @@ -95,7 +100,7 @@ editor["mrjones2014/smart-splits.nvim"] = { editor["nvim-treesitter/nvim-treesitter"] = { lazy = true, build = function() - if #vim.api.nvim_list_uis() ~= 0 then + if vim.fn.has("gui_running") == 1 then vim.api.nvim_command([[TSUpdate]]) end end, @@ -109,10 +114,6 @@ editor["nvim-treesitter/nvim-treesitter"] = { "windwp/nvim-ts-autotag", config = require("editor.autotag"), }, - { - "NvChad/nvim-colorizer.lua", - config = require("editor.colorizer"), - }, { "hiphish/rainbow-delimiters.nvim", config = require("editor.rainbow_delims"), diff --git a/lua/modules/plugins/lang.lua b/lua/modules/plugins/lang.lua index 6877b0f0a..2cfc3974d 100644 --- a/lua/modules/plugins/lang.lua +++ b/lua/modules/plugins/lang.lua @@ -18,7 +18,7 @@ lang["ray-x/go.nvim"] = { lang["mrcjkb/rustaceanvim"] = { lazy = true, ft = "rust", - version = "^4", + version = "*", init = require("lang.rust"), dependencies = { "nvim-lua/plenary.nvim" }, } diff --git a/lua/modules/plugins/tool.lua b/lua/modules/plugins/tool.lua index bbcf0bb8e..37be1ed8e 100644 --- a/lua/modules/plugins/tool.lua +++ b/lua/modules/plugins/tool.lua @@ -4,13 +4,21 @@ tool["tpope/vim-fugitive"] = { lazy = true, cmd = { "Git", "G" }, } --- only for fcitx5 user who uses non-English language during coding +-- This is specifically for fcitx5 users who code in languages other than English -- tool["pysan3/fcitx5.nvim"] = { -- lazy = true, -- event = "BufReadPost", -- cond = vim.fn.executable("fcitx5-remote") == 1, -- config = require("tool.fcitx5"), -- } +tool["Bekaboo/dropbar.nvim"] = { + lazy = false, + config = require("tool.dropbar"), + dependencies = { + "nvim-tree/nvim-web-devicons", + "nvim-telescope/telescope-fzf-native.nvim", + }, +} tool["nvim-tree/nvim-tree.lua"] = { lazy = true, cmd = { @@ -72,18 +80,31 @@ tool["nvim-telescope/telescope.nvim"] = { cmd = "Telescope", config = require("tool.telescope"), dependencies = { - { "nvim-tree/nvim-web-devicons" }, { "nvim-lua/plenary.nvim" }, + { "nvim-tree/nvim-web-devicons" }, + { "jvgrootveld/telescope-zoxide" }, { "debugloop/telescope-undo.nvim" }, + { "nvim-telescope/telescope-frecency.nvim" }, + { "nvim-telescope/telescope-live-grep-args.nvim" }, + { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, + { + "FabianWirth/search.nvim", + config = require("tool.search"), + }, { "ahmedkhalf/project.nvim", event = { "CursorHold", "CursorHoldI" }, config = require("tool.project"), }, - { "jvgrootveld/telescope-zoxide" }, - { "nvim-telescope/telescope-frecency.nvim" }, - { "nvim-telescope/telescope-live-grep-args.nvim" }, - { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, + { + "aaronhallaert/advanced-git-search.nvim", + cmd = { "AdvancedGitSearch" }, + dependencies = { + "tpope/vim-rhubarb", + "tpope/vim-fugitive", + "sindrets/diffview.nvim", + }, + }, }, } diff --git a/lua/modules/plugins/ui.lua b/lua/modules/plugins/ui.lua index 062f2b0b5..1a5aab469 100644 --- a/lua/modules/plugins/ui.lua +++ b/lua/modules/plugins/ui.lua @@ -38,7 +38,6 @@ ui["nvim-lualine/lualine.nvim"] = { } ui["zbirenbaum/neodim"] = { lazy = true, - commit = "9477da0", event = "LspAttach", config = require("ui.neodim"), } diff --git a/lua/modules/utils/icons.lua b/lua/modules/utils/icons.lua index 2b24b3cdb..a050401b6 100644 --- a/lua/modules/utils/icons.lua +++ b/lua/modules/utils/icons.lua @@ -2,10 +2,16 @@ local icons = {} local data = { kind = { + Break = "󰙧", + Call = "󰃷", + Case = "󰬶", Class = "󰠱", Color = "󰏘", Constant = "󰏿", Constructor = "", + Continue = "󰞘", + Declaration = "󰙠", + Delete = "󱟁", Enum = "", EnumMember = "", Event = "", @@ -14,30 +20,35 @@ local data = { Folder = "󰉋", Fragment = "", Function = "󰊕", - Interface = "", Implementation = "", + Interface = "", Keyword = "󰌋", + List = "󰅪", + Loop = "󰑖", Method = "󰆧", Module = "", Namespace = "󰌗", - Number = "", Operator = "󰆕", Package = "", Property = "󰜢", Reference = "", + Regex = "", Snippet = "", + Statement = "󰅩", Struct = "", + Switch = "", Text = "󰉿", TypeParameter = "󰅲", Undefined = "", Unit = "", Value = "󰎠", Variable = "", - -- ccls-specific icons. - TypeAlias = "", + -- ccls-specific icons + Macro = "", Parameter = "", StaticMethod = "", - Macro = "", + Terminal = "", + TypeAlias = "", }, type = { Array = "󰅪", @@ -51,9 +62,11 @@ local data = { Default = "", File = "", Files = "", + FileFind = "󰈞", FileTree = "󰙅", Import = "", Symlink = "", + Word = "", }, git = { Add = "", @@ -92,6 +105,7 @@ local data = { CodeAction = "󰌵", Comment = "󰅺", Dashboard = "", + DoubleSeparator = "󰄾", Emoji = "󰱫", EmptyFolder = "", EmptyFolderOpen = "", @@ -107,8 +121,6 @@ local data = { Keyboard = "", Left = "", List = "", - Square = "", - SymlinkFolder = "", Lock = "󰍁", Modified = "✥", Modified_alt = "", @@ -125,12 +137,13 @@ local data = { RootFolderOpened = "", Search = "󰍉", Separator = "", - DoubleSeparator = "󰄾", SignIn = "", SignOut = "", Sort = "", Spell = "󰓆", + Square = "", Symlink = "", + SymlinkFolder = "", Tab = "", Table = "", Telescope = "", @@ -142,7 +155,7 @@ local data = { Information = "", Question = "", Hint = "󰌵", - -- Holo version + -- Hollow version Error_alt = "󰅚", Warning_alt = "󰀪", Information_alt = "", @@ -150,37 +163,28 @@ local data = { Hint_alt = "󰌶", }, misc = { + Add = "+", + Added = "", Campass = "󰀹", Code = "", Gavel = "", + Ghost = "󰊠", Glass = "󰂖", + Lego = "", + LspAvailable = "󱜙", + ManUp = "", + Neovim = "", NoActiveLsp = "󱚧", PyEnv = "󰢩", Squirrel = "", Tag = "", Tree = "", - Watch = "", - Lego = "", - LspAvailable = "󱜙", Vbar = "│", - Add = "+", - Added = "", - Ghost = "󰊠", - ManUp = "", - Neovim = "", Vim = "", + Watch = "", }, cmp = { - Codeium = "", - TabNine = "", - Copilot = "", - Copilot_alt = "", - -- Add source-specific icons here - buffer = "", - cmp_tabnine = "", - codeium = "", - copilot = "", - copilot_alt = "", + buffer = "󰉿", latex_symbols = "", luasnip = "󰃐", nvim_lsp = "", @@ -191,6 +195,15 @@ local data = { tmux = "", treesitter = "", undefined = "", + -- Add source-specific icons here + codeium = "", + Codeium = "", + copilot = "", + copilot_alt = "", + Copilot = "", + Copilot_alt = "", + TabNine = "", + cmp_tabnine = "", }, dap = { Breakpoint = "󰝥", @@ -211,7 +224,7 @@ local data = { ---Get a specific icon set. ---@param category "kind"|"type"|"documents"|"git"|"ui"|"diagnostics"|"misc"|"cmp"|"dap" ----@param add_space? boolean @Add trailing space after the icon. +---@param add_space? boolean @Add trailing whitespace after the icon. function icons.get(category, add_space) if add_space then return setmetatable({}, { diff --git a/lua/modules/utils/init.lua b/lua/modules/utils/init.lua index c5a25ca42..c2c9fd53e 100644 --- a/lua/modules/utils/init.lua +++ b/lua/modules/utils/init.lua @@ -121,7 +121,6 @@ end ---@param background string @The background color to blend with ---@param alpha number|string @Number between 0 and 1 for blending amount. function M.blend(foreground, background, alpha) - ---@diagnostic disable-next-line: cast-local-type alpha = type(alpha) == "string" and (tonumber(alpha, 16) / 0xff) or alpha local bg = hex_to_rgb(background) local fg = hex_to_rgb(foreground) @@ -277,9 +276,9 @@ local function tbl_recursive_merge(dst, src) for key, value in pairs(src) do if type(dst[key]) == "table" and type(value) == "function" then dst[key] = value(dst[key]) - elseif type(dst[key]) == "table" and vim.tbl_islist(dst[key]) and key ~= "dashboard_image" then + elseif type(dst[key]) == "table" and vim.islist(dst[key]) and key ~= "dashboard_image" then vim.list_extend(dst[key], value) - elseif type(dst[key]) == "table" and type(value) == "table" and not vim.tbl_islist(dst[key]) then + elseif type(dst[key]) == "table" and type(value) == "table" and not vim.islist(dst[key]) then tbl_recursive_merge(dst[key], value) else dst[key] = value diff --git a/nixos/neovim/default.nix b/nixos/neovim/default.nix index 93134d40f..420e7fac3 100644 --- a/nixos/neovim/default.nix +++ b/nixos/neovim/default.nix @@ -4,8 +4,15 @@ , pkgs , ... }: -with lib; let +let cfg = config.programs.neovim.nvimdots; + inherit (lib) flip warn const; + inherit (lib.attrsets) optionalAttrs; + inherit (lib.lists) optionals; + inherit (lib.modules) mkIf; + inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.strings) concatStringsSep versionOlder versionAtLeast; + inherit (lib.types) listOf coercedTo package functionTo; in { options = { @@ -19,6 +26,15 @@ in Bind lazy-lock.json in your repository to $XDG_CONFIG_HOME/nvim. Very powerful in terms of keeping the environment consistent, but has the following side effects. You cannot update it even if you run the Lazy command, because it binds read-only. + You need to remove lazy-lock.json before enabling this option if `mergeLazyLock` is set. + ''; + mergeLazyLock = mkEnableOption '' + Merges the managed lazy-lock.json with the existing one under $XDG_CONFIG_HOME/nvim if its hash has changed on activation. + Upstream package version changes have high priority. + This means changes to lazy-lock.json in the config directory (likely due to installing package) will be preserved. + In other words, it achieves environment consistency while remaining adaptable to changes. + You need to unlink lazy-lock.json before enabling this option if `bindLazyLock` is set. + Please refer to the wiki for details on the behavior. ''; setBuildEnv = mkEnableOption '' Sets environment variables that resolve build dependencies as required by `mason.nvim` and `nvim-treesitter` @@ -34,9 +50,11 @@ in use Haskell plugins. ''; extraHaskellPackages = mkOption { - type = with types; - let fromType = listOf package; - in coercedTo fromType + type = + let + fromType = listOf package; + in + coercedTo fromType (flip warn const '' Assigning a plain list to extraHaskellPackages is deprecated. Please assign a function taking a package set as argument, so @@ -56,7 +74,7 @@ in ''; }; extraDependentPackages = mkOption { - type = with types; listOf package; + type = listOf package; default = [ ]; example = literalExpression "[ pkgs.openssl ]"; description = "Extra build depends to add `LIBRARY_PATH` and `CPATH`."; @@ -67,33 +85,30 @@ in config = let # Inspired from https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/modules/programs/nix-ld.nix - build-dependent-pkgs = with pkgs; builtins.filter (package: !package.meta.unsupported) [ + build-dependent-pkgs = builtins.filter (package: !package.meta.unsupported) [ # manylinux - acl - attr - bzip2 - curl - glibc - libsodium - libssh - libxml2 - openssl - stdenv.cc.cc - stdenv.cc.cc.lib - systemd - util-linux - xz - zlib - zstd + pkgs.acl + pkgs.attr + pkgs.bzip2 + pkgs.curl + pkgs.glibc + pkgs.libsodium + pkgs.libssh + pkgs.libxml2 + pkgs.openssl + pkgs.stdenv.cc.cc + pkgs.stdenv.cc.cc.lib + pkgs.systemd + pkgs.util-linux + pkgs.xz + pkgs.zlib + pkgs.zstd # Packages not included in `nix-ld`'s NixOSModule - glib - libcxx + pkgs.glib + pkgs.libcxx ] ++ cfg.extraDependentPackages; - makePkgConfigPath = x: makeSearchPathOutput "dev" "lib/pkgconfig" x; - makeIncludePath = x: makeSearchPathOutput "dev" "include" x; - neovim-build-deps = pkgs.buildEnv { name = "neovim-build-deps"; paths = build-dependent-pkgs; @@ -112,19 +127,37 @@ in ]; in mkIf cfg.enable { + assertions = [ + { + assertion = ! (cfg.bindLazyLock && cfg.mergeLazyLock); + message = "bindLazyLock and mergeLazyLock cannot be enabled at the same time."; + } + ]; xdg.configFile = { "nvim/init.lua".source = ../../init.lua; "nvim/lua".source = ../../lua; "nvim/snips".source = ../../snips; "nvim/tutor".source = ../../tutor; - } // lib.optionalAttrs cfg.bindLazyLock { + } // optionalAttrs cfg.bindLazyLock { "nvim/lazy-lock.json".source = ../../lazy-lock.json; + } // optionalAttrs cfg.mergeLazyLock { + "nvim/lazy-lock.fixed.json" = { + source = ../../lazy-lock.json; + onChange = '' + if [ -f ${config.xdg.configHome}/nvim/lazy-lock.json ]; then + tmp=$(mktemp) + ${pkgs.jq}/bin/jq -r -s '.[0] * .[1]' ${config.xdg.configHome}/nvim/lazy-lock.json ${config.xdg.configFile."nvim/lazy-lock.fixed.json".source} > "''${tmp}" && mv "''${tmp}" ${config.xdg.configHome}/nvim/lazy-lock.json + else + ${pkgs.rsync}/bin/rsync --chmod 644 ${config.xdg.configFile."nvim/lazy-lock.fixed.json".source} ${config.xdg.configHome}/nvim/lazy-lock.json + fi + ''; + }; }; home = { - packages = with pkgs; [ - ripgrep + packages = [ + pkgs.ripgrep ]; - shellAliases = optionalAttrs (cfg.setBuildEnv && (lib.versionOlder config.home.stateVersion "24.05")) { + shellAliases = optionalAttrs (cfg.setBuildEnv && (versionOlder config.home.stateVersion "24.05")) { nvim = concatStringsSep " " buildEnv + " nvim"; }; }; @@ -134,33 +167,32 @@ in withNodeJs = true; withPython3 = true; - extraPackages = with pkgs; - [ - # Dependent packages used by default plugins - doq - tree-sitter - ] - ++ optionals cfg.withBuildTools [ - cargo - clang - cmake - gcc - gnumake - go - lua51Packages.luarocks - ninja - pkg-config - yarn - ] - ++ optionals cfg.withHaskell [ - (pkgs.writeShellApplication { - name = "stack"; - text = '' - exec "${pkgs.stack}/bin/stack" "--extra-include-dirs=${config.home.profileDirectory}/lib/nvim-depends/include" "--extra-lib-dirs=${config.home.profileDirectory}/lib/nvim-depends/lib" "$@" - ''; - }) - (haskellPackages.ghcWithPackages (ps: cfg.extraHaskellPackages ps)) - ]; + extraPackages = [ + # Dependent packages used by default plugins + pkgs.doq + pkgs.tree-sitter + ] + ++ optionals cfg.withBuildTools [ + pkgs.cargo + pkgs.clang + pkgs.cmake + pkgs.gcc + pkgs.gnumake + pkgs.go + pkgs.lua51Packages.luarocks + pkgs.ninja + pkgs.pkg-config + pkgs.yarn + ] + ++ optionals cfg.withHaskell [ + (pkgs.writeShellApplication { + name = "stack"; + text = '' + exec "${pkgs.stack}/bin/stack" "--extra-include-dirs=${config.home.profileDirectory}/lib/nvim-depends/include" "--extra-lib-dirs=${config.home.profileDirectory}/lib/nvim-depends/lib" "$@" + ''; + }) + (pkgs.haskellPackages.ghcWithPackages (ps: cfg.extraHaskellPackages ps)) + ]; extraPython3Packages = ps: with ps; [ docformatter @@ -168,8 +200,8 @@ in pynvim ]; } - // lib.optionalAttrs (lib.versionAtLeast config.home.stateVersion "24.05") { - extraWrapperArgs = lib.optionals cfg.setBuildEnv [ + // optionalAttrs (versionAtLeast config.home.stateVersion "24.05") { + extraWrapperArgs = optionals cfg.setBuildEnv [ "--suffix" "CPATH" ":" diff --git a/scripts/install.ps1 b/scripts/install.ps1 index 4d725c6e4..910abc8e5 100644 --- a/scripts/install.ps1 +++ b/scripts/install.ps1 @@ -8,9 +8,9 @@ Set-StrictMode -Version 3.0 $ErrorActionPreference = "Stop" # Exit when command fails # global-scope vars -$REQUIRED_NVIM_VERSION = [version]'0.9.0' -$REQUIRED_NVIM_VERSION_LEGACY = [version]'0.8.0' $USE_SSH = $True +$REQUIRED_NVIM_VERSION = [version]'0.10.0' +$REQUIRED_NVIM_VERSION_LEGACY = [version]'0.9.0' # package mgr vars $choco_package_matrix = @{ "gcc" = "mingw"; "git" = "git"; "nvim" = "neovim"; "make" = "make"; "sudo" = "psutils"; "node" = "nodejs"; "pip" = "python3"; "fzf" = "fzf"; "rg" = "ripgrep"; "go" = "go"; "curl" = "curl"; "wget" = "wget"; "tree-sitter" = "tree-sitter"; "ruby" = "ruby"; "rustc" = "rust-ms" } @@ -20,15 +20,15 @@ $installer_pkg_matrix = @{ "NodeJS" = "npm"; "Python" = "pip"; "Ruby" = "gem" } # env vars $env:XDG_CONFIG_HOME ??= $env:LOCALAPPDATA $env:CCPACK_MGR ??= 'unknown' -$env:CCLONE_BRANCH ??= 'main' -$env:CCLONE_BRANCH_LEGACY ??= '0.8' $env:CCLONE_ATTR ??= 'undef' +$env:CCLONE_BRANCH ??= 'main' +$env:CCLONE_BRANCH_LEGACY ??= '0.9' $env:CCDEST_DIR ??= "$env:XDG_CONFIG_HOME\nvim" $env:CCBACKUP_DIR = "$env:CCDEST_DIR" + "_backup-" + (Get-Date).ToUniversalTime().ToString("yyyyMMddTHHmmss") -function _abort ([Parameter(Mandatory = $True)] [string]$Msg,[Parameter(Mandatory = $True)] [string]$Type,[Parameter(Mandatory = $False)] [string]$Info_msg) { - if ($Info_msg -ne $null) { - Write-Host $Info_msg +function _abort ([Parameter(Mandatory = $True)] [string]$Msg,[Parameter(Mandatory = $True)] [string]$Type,[Parameter(Mandatory = $False)] [string]$ExtMsg) { + if ($ExtMsg -ne $null) { + Write-Host $ExtMsg } Write-Error -Message "Error: $Msg" -Category $Type exit 1 @@ -58,7 +58,7 @@ function info_ext ([Parameter(Mandatory = $True)][ValidateNotNullOrEmpty()] [str } function warn ([Parameter(Mandatory = $True)][ValidateNotNullOrEmpty()] [string]$Msg) { - Write-Host "Warning" -ForegroundColor Yellow -NoNewline; Write-Host ": $(_chomp -Str $Msg)"; + Write-Host "Warning:" -ForegroundColor Yellow -NoNewline; Write-Host " $(_chomp -Str $Msg)"; } function warn_ext ([Parameter(Mandatory = $True)][ValidateNotNullOrEmpty()] [string]$Msg) { @@ -157,7 +157,7 @@ function query_pack { info -Msg " [Detected] We'll use 'Chocolatey' as the default package mgr." $env:CCPACK_MGR = 'choco' } else { - _abort -Msg "Required executable not found." -Type "NotInstalled" -Info_msg @' + _abort -Msg "Required executable not found." -Type "NotInstalled" -ExtMsg @' You must install a modern package manager before installing this Nvim config. Available choices are: - Chocolatey @@ -292,7 +292,7 @@ function clone_repo ([Parameter(Mandatory = $True)][ValidateNotNullOrEmpty()] [s safe_execute -WithCmd { git clone --progress -b "$env:CCLONE_BRANCH_LEGACY" "$env:CCLONE_ATTR" $WithURL "$env:CCDEST_DIR" } } else { warn -Msg "You have outdated Nvim installed (< $REQUIRED_NVIM_VERSION_LEGACY)." - _abort -Msg "This Neovim distribution is no longer supported." -Type "NotImplemented" -Info_msg @" + _abort -Msg "This Neovim distribution is no longer supported." -Type "NotImplemented" -ExtMsg @" You have a legacy Neovim distribution installed. Please make sure you have nvim v$REQUIRED_NVIM_VERSION_LEGACY installed at the very least. @@ -330,7 +330,7 @@ function _main { # Check dependencies if (-not (check_in_path -WithName "nvim")) { - _abort -Msg "Required executable not found." -Type "NotInstalled" -Info_msg @' + _abort -Msg "Required executable not found." -Type "NotInstalled" -ExtMsg @' You must install Neovim before installing this Nvim config. See: https://github.com/neovim/neovim/wiki/Installing-Neovim ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ @@ -340,7 +340,7 @@ You must install Neovim before installing this Nvim config. See: } if (-not (check_in_path -WithName "git")) { - _abort -Msg "Required executable not found." -Type "NotInstalled" -Info_msg @' + _abort -Msg "Required executable not found." -Type "NotInstalled" -ExtMsg @' You must install Git before installing this Nvim config. See: https://git-scm.com/ ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ diff --git a/scripts/install.sh b/scripts/install.sh index 6796f1a0f..0d1e113bb 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -4,15 +4,15 @@ # Allow `[[ -n "$(command)" ]]`, `func "$(command)"`, pipes, etc. # shellcheck disable=SC2312 -set -u +set -uo pipefail -# global vars +# global-scope vars +REQUIRED_NVIM_VERSION=0.10.0 +REQUIRED_NVIM_VERSION_LEGACY=0.9.0 +USE_SSH=1 +CLONE_ATTR=("--progress") DEST_DIR="${HOME}/.config/nvim" BACKUP_DIR="${DEST_DIR}_backup-$(date +%Y%m%dT%H%M%S)" -CLONE_ATTR=("--progress") -REQUIRED_NVIM_VERSION=0.9.0 -REQUIRED_NVIM_VERSION_LEGACY=0.8.0 -USE_SSH=1 abort() { printf "%s\n" "$@" >&2 @@ -31,7 +31,7 @@ if [[ -n "${CI-}" && -n "${INTERACTIVE-}" ]]; then abort "Cannot run force-interactive mode in CI." fi -# string formatters +# String formatters if [[ -t 1 ]]; then tty_escape() { printf "\033[%sm" "$1"; } else @@ -82,7 +82,7 @@ info_ext() { } warn() { - printf "${tty_yellow}Warning${tty_reset}: %s\n" "$(chomp "$1")" + printf "${tty_yellow}Warning:${tty_reset} %s\n" "$(chomp "$1")" } warn_ext() { @@ -98,7 +98,7 @@ getc() { } ring_bell() { - # Use the shell's audible bell. + # Use the shell's audible bell if [[ -t 1 ]]; then printf "\a" fi @@ -106,13 +106,12 @@ ring_bell() { wait_for_user() { local c - echo + printf "\n" echo "Press ${tty_bold}RETURN${tty_reset}/${tty_bold}ENTER${tty_reset} to continue or any other key to abort..." getc c # we test for \r and \n because some stuff does \r instead - if ! [[ "${c}" == $'\r' || "${c}" == $'\n' ]]; then - echo "${tty_red}Aborted.${tty_reset}" - exit 1 + if ! [[ "$c" == $'\r' || "$c" == $'\n' ]]; then + abort "${tty_red}Aborted.${tty_reset}" fi } @@ -121,9 +120,10 @@ version_ge() { } prompt_confirm() { + local choice while true; do - read -r -p "$1 [Y/n]: " USR_CHOICE - case "${USR_CHOICE}" in + read -r -p "$1 [Y/n]: " choice + case "$choice" in [yY][eE][sS] | [yY]) return 1 ;; @@ -131,10 +131,10 @@ prompt_confirm() { return 0 ;; *) - if [[ -z "${USR_CHOICE}" ]]; then + if [[ -z "$choice" ]]; then return 1 fi - printf "${tty_red}%s\n\n${tty_reset}" "Invalid input! Please enter one of: '[y/yes] / [n/no]'" + printf "${tty_red}%s\n\n${tty_reset}" "Input invalid! Please enter one of the following: '[y/yes]' or '[n/no]'." ;; esac done @@ -175,7 +175,7 @@ clone_repo() { elif check_nvim_version "${REQUIRED_NVIM_VERSION_LEGACY}"; then warn "You have outdated Nvim installed (< ${REQUIRED_NVIM_VERSION})." info "Automatically redirecting you to the latest compatible version..." - execute "git" "clone" "-b" "0.8" "${CLONE_ATTR[@]}" "$1" "${DEST_DIR}" + execute "git" "clone" "-b" "0.9" "${CLONE_ATTR[@]}" "$1" "${DEST_DIR}" else warn "You have outdated Nvim installed (< ${REQUIRED_NVIM_VERSION_LEGACY})." abort "$( diff --git a/tutor/dots.tutor b/tutor/dots.tutor index 7def1078d..c4232b100 100644 --- a/tutor/dots.tutor +++ b/tutor/dots.tutor @@ -1,6 +1,6 @@ # Welcome to the nvimdots Tutor -Nvimdots is a [neovim](https://neovim.io/) config suite designed for extensibility, performance, and ease +Nvimdots is a [Neovim](https://neovim.io/) config suite designed for extensibility, performance, and ease of use. It provides the ability to work with text files yet feels like you are working within an IDE environment. @@ -64,7 +64,7 @@ Consequently, this segment of the status line provides insight into the context your cursor position. It's important to note that this feature relies on LSP, so it is disabled if the corresponding LSP is not attached to the current buffer. -You can press `li`{normal} to check LSP info. Upon doing so, you will notice that +You can press ``{normal}`l`{normal}`i`{normal} to check LSP info. Upon doing so, you will notice that there are two active clients attached to this buffer. Now, press [go](go) to toggle the code outline, which displays all symbols defined in @@ -85,32 +85,33 @@ to the next topic, which covers the basic workflow. # Lesson 1.2: FIND AND SEARCH -Nvimdots utilizes [telescope.nvim](https://github.com/nvim-telescope/telescope.nvim) as the primary fuzzy finder. It offers numerous -features for finding and searching. To open the file finder under the current -working directory, press `ff`{normal}. Then, input the keyword you wish to find and use -``{normal} and ``{normal} to navigate up and down the list of results. You can preview the -content of the selected file in the right window and press ``{normal} to open it -in a new buffer. - -Nvimdots also provide several additional search features. One commonly used keymap is -`fr`{normal}, especially if you frequently edit files across different projects. This -command lists files you have previously opened and sorts them by "frecency," a -concept similar to that used in Firefox's address bar. This feature utilizes "Lua -Bytecode" to permanently store the key-value pairs of file paths and their "frecency" -values at **~/.local/share/nvim/file_frecency.bin**. - -You can press `fw`{normal} to search for a word in the current working directory. This -feature utilizes [ripgrep](https://github.com/BurntSushi/ripgrep) for searching, allowing you to use it naturally as you would -with ripgrep. - -Nvimdots also provides project management features and integrates them seamlessly -with telescope. Press `fp`{normal} to open the recent project list. Please refrain from -quitting this interface; instead, you can add the current working directory to the -project list by pressing ``{normal}, and remove it by pressing ``{normal}. Typically, the -current working directory corresponds to the project directory, which is identified -by LSP and patterns such as *.git/*. However, you have the flexibility to set your own -patterns. Consequently, the project directory will automatically change when you -switch to another buffer whose file belongs to a different project. +Nvimdots utilizes [telescope.nvim](https://github.com/nvim-telescope/telescope.nvim) as the primary fuzzy finder, offering numerous +features for efficient finding and searching. To access the "file finder collection" +within the current working directory, press ``{normal}`f`{normal}`f`{normal}. Subsequently, enter the +desired keyword and use ``{normal} and ``{normal} to navigate through the list of results. The +content of the selected file can be previewed in the adjacent window, and pressing +``{normal} will open it in a new buffer. Additionally, ``{normal} and ``{normal} allow you to +switch between various tabs to locate files with different properties. For instance, +the "Frecency" and "Oldfiles" tabs enable searches based on the most frequently and +recently opened files, respectively, while the "Buffers" tab facilitates searches +among currently opened buffers. + +For pattern searches within the current working directory, press ``{normal}`f`{normal}`p`{normal}. This +functionality leverages [ripgrep](https://github.com/BurntSushi/ripgrep) for its search capabilities, making it as intuitive +to use as ripgrep itself. As with the "file finder collection", ``{normal} and ``{normal} can +be used to cycle through the search tabs. The "Word under cursor" tab displays all +instances of the word located under the current cursor position. + +Nvimdots also offers comprehensive dossier management, seamlessly integrated with +Telescope. Press ``{normal}`f`{normal}`d`{normal} to access the recent dossiers list. The first tab +presents the currently saved sessions; select a session and press ``{normal} to restore +the corresponding session. The second tab lists various projects. Instead of exiting +this interface, you can add the current working directory to the project list by +pressing ``{normal}, and remove it by pressing ``{normal}. Generally, the current working +directory corresponds to the current project's directory, identified by the LSP or +patterns such as *.git/*. You can also define your own patterns. Consequently, the +current working directory will automatically switch when you move to another buffer +containing a file from a different project. # Lesson 1.3: EDIT AND FORMAT From 14d7be72c34fa616946278595c4f0cfe41ae50d1 Mon Sep 17 00:00:00 2001 From: ayamir Date: Tue, 2 Jul 2024 08:05:07 +0800 Subject: [PATCH 13/40] docs: update startup time. (#1318) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c450710be..f4af58f74 100644 --- a/README.md +++ b/README.md @@ -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. From ba1ab457552a54c3db239dda75d86e2a8254ff31 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 01:52:53 +0000 Subject: [PATCH 14/40] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 72 ++++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 34 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index a5ecf48e1..54a9abab0 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,11 +1,12 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, - "aerial.nvim": { "branch": "master", "commit": "eb25396dae306cef5b8fffbe9ae98283d2f1c199" }, + "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, + "advanced-git-search.nvim": { "branch": "main", "commit": "198cc402af1790ab26830fdbf24a28c336a20ba6" }, + "aerial.nvim": { "branch": "master", "commit": "db0af491ff13c18a966ce2f9ac7f5211aec000a7" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "autoclose.nvim": { "branch": "main", "commit": "dc42806540dcf448ecb2bad6b67204410cfbe629" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, - "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, + "bufferline.nvim": { "branch": "main", "commit": "81820cac7c85e51e4cf179f8a66d13dbf7b032d9" }, "catppuccin": { "branch": "refactor/syntax-highlighting", "commit": "e34171a3273e6a2c881f28ae36b8b37a2c84f196" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-latex-symbols": { "branch": "main", "commit": "165fb66afdbd016eaa1570e41672c4c557b57124" }, @@ -19,53 +20,54 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, - "crates.nvim": { "branch": "main", "commit": "3ab99ade2c9a9d4291a8424c03db9a3be9862a72" }, + "crates.nvim": { "branch": "main", "commit": "c3fd47391de6999f4c939af89494d08443f71916" }, "csv.vim": { "branch": "master", "commit": "4d5255829afe3b6badb0c8a040116704c0d3213c" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, + "dropbar.nvim": { "branch": "master", "commit": "79847a78ec0c58f5e5c0360192b03d0cee803e95" }, "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" }, "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, - "fzf": { "branch": "master", "commit": "e2401aca68acb86f6dead826acf7499b11d96a10" }, + "fzf": { "branch": "master", "commit": "cfc149e99448c68f0d298fd8f99808cd2c36788e" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, - "gitsigns.nvim": { "branch": "main", "commit": "47c8e3e571376b24de62408fd0c9d12f0a9fc0a3" }, + "gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" }, "glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" }, - "go.nvim": { "branch": "master", "commit": "fca26b05699ad06c077721823a0b1a8e02539d5c" }, + "go.nvim": { "branch": "master", "commit": "cde0c7a110c0f65b9e4e6baf342654268efff371" }, "guihua.lua": { "branch": "master", "commit": "225db770e36aae6a1e9e3a65578095c8eb4038d3" }, "hop.nvim": { "branch": "master", "commit": "036462a345792279c58f2f6445756efab706f04a" }, - "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "cd6a8293430a7fadf6a093dfdfbdb1ddbaf8ae7d" }, + "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "lazy.nvim": { "branch": "main", "commit": "a9d7ade203b3f3ee3058c082c62afdf8e4bcb416" }, "local-highlight.nvim": { "branch": "master", "commit": "ae3ada3a332128b1036c84c8587b9069891c63da" }, "lsp-format-modifications.nvim": { "branch": "main", "commit": "006d4cd88f4f09fdc4375fcb75dd5b7d981a723b" }, - "lsp_signature.nvim": { "branch": "master", "commit": "52fc14a45244b04a37160b20fa938f48ccd59ef1" }, + "lsp_signature.nvim": { "branch": "master", "commit": "e6d225e27770db81346c2f2aa6c30d0e249f9e7f" }, "lspsaga.nvim": { "branch": "main", "commit": "6f920cfabddb9b7de5a3a4d0b7cd4f0774ae23e2" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "f5425eb1d0d794f0305d5eeebddabb74614683ff" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "4ba55f9755ebe8297d92c419b90a946123292ae6" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.align": { "branch": "main", "commit": "68a8d3205f0e7ce1bded057f4a851f42ef8fc584" }, - "neoconf.nvim": { "branch": "main", "commit": "83d78b9fb3729e2ce9bd4066cf62ab47f946072f" }, - "neodim": { "branch": "master", "commit": "9477da03b93f1984a81fee3b92e6ac7c6ada6aa4" }, + "mini.align": { "branch": "main", "commit": "b54d88b16bfac62ca6b3d699566135639a3ca4fa" }, + "neoconf.nvim": { "branch": "main", "commit": "94f1e5b81c440ec1fc7efde3c7f9448b7bab7776" }, + "neodim": { "branch": "master", "commit": "0543414f1205d8937d8e703a73ae1f9948940b14" }, "neoscroll.nvim": { "branch": "master", "commit": "a731f66f1d39ec6175fd201c5bf849e54abda99c" }, - "none-ls.nvim": { "branch": "main", "commit": "cc0a3c45047e3daf85d07c1571d65476cfce6480" }, + "none-ls.nvim": { "branch": "main", "commit": "0d1b3fa2ad0b371b94cb4b9a27ba6e5a1a915c91" }, "nvim-bqf": { "branch": "main", "commit": "1b24dc6050c34e8cd377b6b4cd6abe40509e0187" }, "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" }, "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, - "nvim-lspconfig": { "branch": "master", "commit": "bd7c76375a511994c9ca8d69441f134dc10ae3bd" }, + "nvim-highlight-colors": { "branch": "main", "commit": "a8f6952cb1ff7bde864a34c502f1a42c360a6662" }, + "nvim-lspconfig": { "branch": "master", "commit": "53a3c6444ec5006b567071614c83edc8ad651f6d" }, "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-scrollview": { "branch": "main", "commit": "fd334e5ad0c616987d1b9114890a59c97165cf83" }, - "nvim-spectre": { "branch": "master", "commit": "ec67d4b5370094b923dfcf6b09b39142f2964861" }, - "nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" }, + "nvim-scrollview": { "branch": "main", "commit": "965f10569d033c4e704327ef9a22d306ac20847a" }, + "nvim-spectre": { "branch": "master", "commit": "49fae98ef2bfa8342522b337892992e3495065d5" }, + "nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" }, "nvim-treehopper": { "branch": "master", "commit": "13559079e33665a310d9ccf0e43f4e9bb9f337e2" }, - "nvim-treesitter": { "branch": "master", "commit": "c29989f5d735a30b6d2350b54d5cd50be811f8b2" }, - "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" }, + "nvim-treesitter": { "branch": "master", "commit": "ffd7725102f47e7391d7a5e7621d178689602a52" }, + "nvim-treesitter-context": { "branch": "master", "commit": "1b9c756c0cad415f0a2661c858448189dd120c15" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "nvim-ts-autotag": { "branch": "main", "commit": "06fe07d7523ba8c755fac7c913fceba43b1720ee" }, + "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, "paint.nvim": { "branch": "main", "commit": "6ce64212804f425073c61ab0d9c2b034f0435260" }, @@ -73,24 +75,26 @@ "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "5c9660801ce345cd3835e1947c12b54290ab7e71" }, - "rustaceanvim": { "branch": "master", "commit": "1e7600b370db3caf37a1cd867e00aac27597a114" }, - "smart-splits.nvim": { "branch": "master", "commit": "3d9fa9e4b31c30d6b328f2447a4dc7dceffbc2ea" }, + "rustaceanvim": { "branch": "master", "commit": "d6d7620b66d74b3b16defcf85cbef7b3582795b3" }, + "search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" }, + "smart-splits.nvim": { "branch": "master", "commit": "e186518f9d7eb4b1e43fbbe0c52bf323637194d0" }, "smartyank.nvim": { "branch": "master", "commit": "d9e078fe08d6466e37ea45ac446a9f60e6866789" }, - "sniprun": { "branch": "master", "commit": "1420cff041a0582636f63960d7160f7832463c10" }, + "sniprun": { "branch": "master", "commit": "30991d81ecfb947a2c54f879b194d4ed23225d91" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "1f2e9b07ac7f927f36c17313071cc12759670767" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "f3f93253797714aecfb95ef7e25f8ff7693430b9" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "935bedf39c440de2f97ce58dbbb44a40402057c1" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "8ad632f793fd437865f99af5684f78300dac93fb" }, - "telescope-undo.nvim": { "branch": "main", "commit": "95b61c01ea3a4c9e8747731148e905bbcf0ccaee" }, + "telescope-undo.nvim": { "branch": "main", "commit": "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, - "telescope.nvim": { "branch": "master", "commit": "c392f1b78eaaf870ca584bd698e78076ed301b26" }, + "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" }, "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" }, - "toggleterm.nvim": { "branch": "main", "commit": "fee58a0473fd92b28c34f8f724e4918b15ba30a3" }, - "trouble.nvim": { "branch": "main", "commit": "58a3acfc6d8d819324dab4c87068596319032e64" }, + "toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" }, + "trouble.nvim": { "branch": "main", "commit": "e5d0e04121c662ce29190a57dd03655d43c59d44" }, "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" }, - "vim-fugitive": { "branch": "master", "commit": "64d6cafb9dcbacce18c26d7daf617ebb96b273f3" }, + "vim-fugitive": { "branch": "master", "commit": "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe" }, "vim-matchup": { "branch": "master", "commit": "1535a769d5dca851fe7d41b0be95f7c7203a4bef" }, + "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" }, "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" } -} +} \ No newline at end of file From f83d276217739c633239384c3ee81f3c6da0d59d Mon Sep 17 00:00:00 2001 From: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:00:49 +0800 Subject: [PATCH 15/40] feat(cmp): deduplicate results from `nvim-lsp` (#1321) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --- lua/modules/configs/completion/cmp.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lua/modules/configs/completion/cmp.lua b/lua/modules/configs/completion/cmp.lua index f20e7b60d..b9c8b7819 100644 --- a/lua/modules/configs/completion/cmp.lua +++ b/lua/modules/configs/completion/cmp.lua @@ -90,6 +90,7 @@ return function() vim_item.kind = string.format(" %s %s", lspkind_icons[vim_item.kind] or icons.cmp.undefined, vim_item.kind or "") + -- set up labels for completion entries vim_item.menu = setmetatable({ cmp_tabnine = "[TN]", copilot = "[CPLT]", @@ -109,12 +110,18 @@ return function() end, })[entry.source.name] + -- cut down long results local label = vim_item.abbr local truncated_label = vim.fn.strcharpart(label, 0, 80) if truncated_label ~= label then vim_item.abbr = truncated_label .. "..." end + -- deduplicate results from nvim_lsp + if entry.source.name == "nvim_lsp" then + vim_item.dup = 0 + end + return vim_item end, }, From 8377bb05a08265f36ca940bed7af4b66725a5bf9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 01:53:20 +0000 Subject: [PATCH 16/40] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 54a9abab0..4877afb34 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -24,32 +24,32 @@ "csv.vim": { "branch": "master", "commit": "4d5255829afe3b6badb0c8a040116704c0d3213c" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dropbar.nvim": { "branch": "master", "commit": "79847a78ec0c58f5e5c0360192b03d0cee803e95" }, - "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" }, - "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, - "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, - "fzf": { "branch": "master", "commit": "cfc149e99448c68f0d298fd8f99808cd2c36788e" }, + "fidget.nvim": { "branch": "main", "commit": "c12f8a58ee472ce5983c3a3f3aad0ff6c49a6a83" }, + "flash.nvim": { "branch": "main", "commit": "ec0bf2842189f65f60fd40bf3557cac1029cc932" }, + "friendly-snippets": { "branch": "main", "commit": "45a1b96e46efe5fce8af325d4bed45feb9d29d0f" }, + "fzf": { "branch": "master", "commit": "9e92b6f11e0f59272de410f56493893334071e6e" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, - "gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" }, + "gitsigns.nvim": { "branch": "main", "commit": "375c44bdfdde25585466a966f00c2e291db74f2d" }, "glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" }, "go.nvim": { "branch": "master", "commit": "cde0c7a110c0f65b9e4e6baf342654268efff371" }, "guihua.lua": { "branch": "master", "commit": "225db770e36aae6a1e9e3a65578095c8eb4038d3" }, "hop.nvim": { "branch": "master", "commit": "036462a345792279c58f2f6445756efab706f04a" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "a9d7ade203b3f3ee3058c082c62afdf8e4bcb416" }, + "lazy.nvim": { "branch": "main", "commit": "d1de92dffab5a862332fdd1892889d362369c12f" }, "local-highlight.nvim": { "branch": "master", "commit": "ae3ada3a332128b1036c84c8587b9069891c63da" }, "lsp-format-modifications.nvim": { "branch": "main", "commit": "006d4cd88f4f09fdc4375fcb75dd5b7d981a723b" }, "lsp_signature.nvim": { "branch": "master", "commit": "e6d225e27770db81346c2f2aa6c30d0e249f9e7f" }, "lspsaga.nvim": { "branch": "main", "commit": "6f920cfabddb9b7de5a3a4d0b7cd4f0774ae23e2" }, - "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, + "lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "4ba55f9755ebe8297d92c419b90a946123292ae6" }, - "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, + "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" }, "mini.align": { "branch": "main", "commit": "b54d88b16bfac62ca6b3d699566135639a3ca4fa" }, - "neoconf.nvim": { "branch": "main", "commit": "94f1e5b81c440ec1fc7efde3c7f9448b7bab7776" }, + "neoconf.nvim": { "branch": "main", "commit": "e34cf5e359500e3c5fc35d5b137335fba94ed501" }, "neodim": { "branch": "master", "commit": "0543414f1205d8937d8e703a73ae1f9948940b14" }, - "neoscroll.nvim": { "branch": "master", "commit": "a731f66f1d39ec6175fd201c5bf849e54abda99c" }, + "neoscroll.nvim": { "branch": "master", "commit": "a7f5953dbfbe7069568f2d0ed23a9709a56725ab" }, "none-ls.nvim": { "branch": "main", "commit": "0d1b3fa2ad0b371b94cb4b9a27ba6e5a1a915c91" }, "nvim-bqf": { "branch": "main", "commit": "1b24dc6050c34e8cd377b6b4cd6abe40509e0187" }, "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" }, @@ -57,44 +57,44 @@ "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, "nvim-highlight-colors": { "branch": "main", "commit": "a8f6952cb1ff7bde864a34c502f1a42c360a6662" }, - "nvim-lspconfig": { "branch": "master", "commit": "53a3c6444ec5006b567071614c83edc8ad651f6d" }, + "nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" }, "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-scrollview": { "branch": "main", "commit": "965f10569d033c4e704327ef9a22d306ac20847a" }, - "nvim-spectre": { "branch": "master", "commit": "49fae98ef2bfa8342522b337892992e3495065d5" }, - "nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" }, + "nvim-scrollview": { "branch": "main", "commit": "afc67708a5a5585553dee132ffbc4761bb135faf" }, + "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" }, + "nvim-tree.lua": { "branch": "master", "commit": "12a9a995a455d2c2466e47140663275365a5d2fc" }, "nvim-treehopper": { "branch": "master", "commit": "13559079e33665a310d9ccf0e43f4e9bb9f337e2" }, - "nvim-treesitter": { "branch": "master", "commit": "ffd7725102f47e7391d7a5e7621d178689602a52" }, - "nvim-treesitter-context": { "branch": "master", "commit": "1b9c756c0cad415f0a2661c858448189dd120c15" }, + "nvim-treesitter": { "branch": "master", "commit": "c1ad655b6a0c83ab48e55240f367e2bc0c15af31" }, + "nvim-treesitter-context": { "branch": "master", "commit": "f56a1430f21334868a86eb980b12e0af55690e98" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, + "nvim-ts-autotag": { "branch": "main", "commit": "323a3e16ed603e2e17b26b1c836d1e86c279f726" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "f1905136b99b5d706858d4c9274a3b152b4359ed" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, - "paint.nvim": { "branch": "main", "commit": "6ce64212804f425073c61ab0d9c2b034f0435260" }, - "persisted.nvim": { "branch": "main", "commit": "0a9eebf5cc92b1113a382a660ee73f21ffd62ae7" }, + "paint.nvim": { "branch": "main", "commit": "16a3be74f549da237a8b993792003dcde9b54eb5" }, + "persisted.nvim": { "branch": "main", "commit": "4df3f8a03690add1bc2f9a79b31e1c43f5e0dd05" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "5c9660801ce345cd3835e1947c12b54290ab7e71" }, - "rustaceanvim": { "branch": "master", "commit": "d6d7620b66d74b3b16defcf85cbef7b3582795b3" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "b29da4a6061a88270e875b38367d82c04c856128" }, + "rustaceanvim": { "branch": "master", "commit": "f16c6eacfb7556c69ffc229e220b8555378245f0" }, "search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" }, - "smart-splits.nvim": { "branch": "master", "commit": "e186518f9d7eb4b1e43fbbe0c52bf323637194d0" }, + "smart-splits.nvim": { "branch": "master", "commit": "95833675cd92538bf9cded1d2d58d1fc271c5428" }, "smartyank.nvim": { "branch": "master", "commit": "d9e078fe08d6466e37ea45ac446a9f60e6866789" }, "sniprun": { "branch": "master", "commit": "30991d81ecfb947a2c54f879b194d4ed23225d91" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "f3f93253797714aecfb95ef7e25f8ff7693430b9" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "935bedf39c440de2f97ce58dbbb44a40402057c1" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "631bf1af1d12468655efb472dd2b176a693803f5" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "8ad632f793fd437865f99af5684f78300dac93fb" }, "telescope-undo.nvim": { "branch": "main", "commit": "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" }, - "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" }, + "todo-comments.nvim": { "branch": "main", "commit": "313b04e5b02d29ab9275c9295ff5e2b73921b0eb" }, "toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" }, - "trouble.nvim": { "branch": "main", "commit": "e5d0e04121c662ce29190a57dd03655d43c59d44" }, + "trouble.nvim": { "branch": "main", "commit": "4453fea6bb597830fbd58d2c484612f37b97bd8c" }, "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" }, - "vim-fugitive": { "branch": "master", "commit": "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe" }, + "vim-fugitive": { "branch": "master", "commit": "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc" }, "vim-matchup": { "branch": "master", "commit": "1535a769d5dca851fe7d41b0be95f7c7203a4bef" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, - "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" }, + "which-key.nvim": { "branch": "main", "commit": "af4ded85542d40e190014c732fa051bdbf88be3d" }, "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" } } \ No newline at end of file From ecb6b79ec6b125a2af7b343a1a053821d96647da Mon Sep 17 00:00:00 2001 From: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Date: Tue, 16 Jul 2024 14:47:12 +0800 Subject: [PATCH 17/40] feat(which-key)!: support `v3` (#1324) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --- lua/modules/configs/tool/which-key.lua | 106 ++++++++++++++----------- 1 file changed, 58 insertions(+), 48 deletions(-) diff --git a/lua/modules/configs/tool/which-key.lua b/lua/modules/configs/tool/which-key.lua index c9d687ee6..721a5d6f3 100644 --- a/lua/modules/configs/tool/which-key.lua +++ b/lua/modules/configs/tool/which-key.lua @@ -6,66 +6,76 @@ return function() cmp = require("modules.utils.icons").get("cmp", true), } - require("which-key").register({ - [""] = { - b = { - name = icons.ui.Buffer .. " Buffer", - }, - d = { - name = icons.ui.Bug .. " Debug", - }, - f = { - name = icons.ui.Telescope .. " Fuzzy Find", - }, - g = { - name = icons.git.Git .. "Git", - }, - l = { - name = icons.misc.LspAvailable .. " Lsp", - }, - n = { - name = icons.ui.FolderOpen .. " Nvim Tree", - }, - p = { - name = icons.ui.Package .. " Package", - }, - s = { - name = icons.cmp.tmux .. "Session", - }, - S = { - name = icons.ui.Search .. " Search", - }, - W = { - name = icons.ui.Window .. " Window", - }, - }, - }) - require("modules.utils").load_plugin("which-key", { + preset = "classic", + delay = vim.o.timeoutlen, + modes = { + n = true, + i = true, + x = false, + s = false, + o = false, + t = false, + c = false, + }, plugins = { + marks = true, + registers = true, + spelling = { + enabled = true, + suggestions = 20, + }, presets = { - operators = false, motions = false, - text_objects = false, - windows = false, - nav = false, + operators = false, + text_objects = true, + windows = true, + nav = true, z = true, g = true, }, }, - + win = { + border = "none", + padding = { 1, 2 }, + wo = { winblend = 0 }, + }, + expand = 1, icons = { + group = "", + rules = false, + colors = false, breadcrumb = icons.ui.Separator, separator = icons.misc.Vbar, - group = "", + keys = { + C = "C-", + M = "A-", + S = "S-", + BS = " ", + CR = " ", + NL = " ", + Esc = " ", + Tab = " ", + Up = " ", + Down = " ", + Left = " ", + Right = " ", + Space = " ", + ScrollWheelUp = " ", + ScrollWheelDown = " ", + }, }, - - window = { - border = "none", - position = "bottom", - margin = { 1, 0, 1, 0 }, - padding = { 1, 1, 1, 1 }, - winblend = 0, + spec = { + { "g", group = icons.git.Git .. "Git" }, + { "d", group = icons.ui.Bug .. " Debug" }, + { "s", group = icons.cmp.tmux .. "Session" }, + { "b", group = icons.ui.Buffer .. " Buffer" }, + { "S", group = icons.ui.Search .. " Search" }, + { "W", group = icons.ui.Window .. " Window" }, + { "p", group = icons.ui.Package .. " Package" }, + { "l", group = icons.misc.LspAvailable .. " Lsp" }, + { "f", group = icons.ui.Telescope .. " Fuzzy Find" }, + { "n", group = icons.ui.FolderOpen .. " Nvim Tree" }, }, }) end From 884f64b28cbff8951227870acc1580e99e1f0430 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 01:54:41 +0000 Subject: [PATCH 18/40] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 66 +++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 4877afb34..14c2f2817 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,12 +2,12 @@ "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, "advanced-git-search.nvim": { "branch": "main", "commit": "198cc402af1790ab26830fdbf24a28c336a20ba6" }, - "aerial.nvim": { "branch": "master", "commit": "db0af491ff13c18a966ce2f9ac7f5211aec000a7" }, + "aerial.nvim": { "branch": "master", "commit": "4e77964569ef47a70f9bb76c668dcfea2d089d5a" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "autoclose.nvim": { "branch": "main", "commit": "dc42806540dcf448ecb2bad6b67204410cfbe629" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, - "bufferline.nvim": { "branch": "main", "commit": "81820cac7c85e51e4cf179f8a66d13dbf7b032d9" }, - "catppuccin": { "branch": "refactor/syntax-highlighting", "commit": "e34171a3273e6a2c881f28ae36b8b37a2c84f196" }, + "bufferline.nvim": { "branch": "main", "commit": "aa16dafdc642594c7ade7e88d31a6119feb189d6" }, + "catppuccin": { "branch": "refactor/syntax-highlighting", "commit": "87ef3315b10ddee9e82e5ec7d21bf5f24db1a20f" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-latex-symbols": { "branch": "main", "commit": "165fb66afdbd016eaa1570e41672c4c557b57124" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, @@ -23,78 +23,78 @@ "crates.nvim": { "branch": "main", "commit": "c3fd47391de6999f4c939af89494d08443f71916" }, "csv.vim": { "branch": "master", "commit": "4d5255829afe3b6badb0c8a040116704c0d3213c" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "79847a78ec0c58f5e5c0360192b03d0cee803e95" }, - "fidget.nvim": { "branch": "main", "commit": "c12f8a58ee472ce5983c3a3f3aad0ff6c49a6a83" }, - "flash.nvim": { "branch": "main", "commit": "ec0bf2842189f65f60fd40bf3557cac1029cc932" }, - "friendly-snippets": { "branch": "main", "commit": "45a1b96e46efe5fce8af325d4bed45feb9d29d0f" }, - "fzf": { "branch": "master", "commit": "9e92b6f11e0f59272de410f56493893334071e6e" }, + "dropbar.nvim": { "branch": "master", "commit": "cab5e0226bc4f90a28cadcb0dc7341d550f1bdf0" }, + "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, + "flash.nvim": { "branch": "main", "commit": "25ba3f4d1e0b080213b39518ebcfbb693a23c957" }, + "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, + "fzf": { "branch": "master", "commit": "ea23539b59d3277cdd34d0ea9ddbcf9c54f350e6" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, - "gitsigns.nvim": { "branch": "main", "commit": "375c44bdfdde25585466a966f00c2e291db74f2d" }, + "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" }, "glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" }, - "go.nvim": { "branch": "master", "commit": "cde0c7a110c0f65b9e4e6baf342654268efff371" }, + "go.nvim": { "branch": "master", "commit": "033344ddfa3cd5cfd55037903264b2bb86691619" }, "guihua.lua": { "branch": "master", "commit": "225db770e36aae6a1e9e3a65578095c8eb4038d3" }, "hop.nvim": { "branch": "master", "commit": "036462a345792279c58f2f6445756efab706f04a" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "d1de92dffab5a862332fdd1892889d362369c12f" }, + "lazy.nvim": { "branch": "main", "commit": "d731a6b005fd239e85e555bd57362382f6c1e461" }, "local-highlight.nvim": { "branch": "master", "commit": "ae3ada3a332128b1036c84c8587b9069891c63da" }, "lsp-format-modifications.nvim": { "branch": "main", "commit": "006d4cd88f4f09fdc4375fcb75dd5b7d981a723b" }, "lsp_signature.nvim": { "branch": "master", "commit": "e6d225e27770db81346c2f2aa6c30d0e249f9e7f" }, "lspsaga.nvim": { "branch": "main", "commit": "6f920cfabddb9b7de5a3a4d0b7cd4f0774ae23e2" }, - "lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" }, + "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "4ba55f9755ebe8297d92c419b90a946123292ae6" }, - "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.align": { "branch": "main", "commit": "b54d88b16bfac62ca6b3d699566135639a3ca4fa" }, - "neoconf.nvim": { "branch": "main", "commit": "e34cf5e359500e3c5fc35d5b137335fba94ed501" }, + "neoconf.nvim": { "branch": "main", "commit": "c282e6c6f5652e796f878f81b196245f03b98144" }, "neodim": { "branch": "master", "commit": "0543414f1205d8937d8e703a73ae1f9948940b14" }, "neoscroll.nvim": { "branch": "master", "commit": "a7f5953dbfbe7069568f2d0ed23a9709a56725ab" }, - "none-ls.nvim": { "branch": "main", "commit": "0d1b3fa2ad0b371b94cb4b9a27ba6e5a1a915c91" }, + "none-ls.nvim": { "branch": "main", "commit": "2870f66b1cb263f6e0bfffdb089739b874343a3a" }, "nvim-bqf": { "branch": "main", "commit": "1b24dc6050c34e8cd377b6b4cd6abe40509e0187" }, "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" }, - "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, + "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, - "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, + "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-highlight-colors": { "branch": "main", "commit": "a8f6952cb1ff7bde864a34c502f1a42c360a6662" }, - "nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" }, - "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, + "nvim-lspconfig": { "branch": "master", "commit": "01e08d4bf1c35e5126b2ad5209725e4c552289ab" }, + "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "afc67708a5a5585553dee132ffbc4761bb135faf" }, "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" }, - "nvim-tree.lua": { "branch": "master", "commit": "12a9a995a455d2c2466e47140663275365a5d2fc" }, + "nvim-tree.lua": { "branch": "master", "commit": "f9ff00bc06d7cb70548a3847d7a2a05e928bc988" }, "nvim-treehopper": { "branch": "master", "commit": "13559079e33665a310d9ccf0e43f4e9bb9f337e2" }, - "nvim-treesitter": { "branch": "master", "commit": "c1ad655b6a0c83ab48e55240f367e2bc0c15af31" }, - "nvim-treesitter-context": { "branch": "master", "commit": "f56a1430f21334868a86eb980b12e0af55690e98" }, + "nvim-treesitter": { "branch": "master", "commit": "0d5e1214a5c386a168dc8e19d7da0ceb0e0bd6f2" }, + "nvim-treesitter-context": { "branch": "master", "commit": "2aba92ceb1479485953007f4d5adf34d0b66917e" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "nvim-ts-autotag": { "branch": "main", "commit": "323a3e16ed603e2e17b26b1c836d1e86c279f726" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "f1905136b99b5d706858d4c9274a3b152b4359ed" }, + "nvim-ts-autotag": { "branch": "main", "commit": "1624866a1379fc1861797f0ed05899a9c1d2ff61" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, - "paint.nvim": { "branch": "main", "commit": "16a3be74f549da237a8b993792003dcde9b54eb5" }, + "paint.nvim": { "branch": "main", "commit": "d738db9211ef73182ffa9b92a2a5661411267123" }, "persisted.nvim": { "branch": "main", "commit": "4df3f8a03690add1bc2f9a79b31e1c43f5e0dd05" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "b29da4a6061a88270e875b38367d82c04c856128" }, - "rustaceanvim": { "branch": "master", "commit": "f16c6eacfb7556c69ffc229e220b8555378245f0" }, + "rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" }, "search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" }, - "smart-splits.nvim": { "branch": "master", "commit": "95833675cd92538bf9cded1d2d58d1fc271c5428" }, + "smart-splits.nvim": { "branch": "master", "commit": "44145a4b37217348293fe457992cc38cf3b19f33" }, "smartyank.nvim": { "branch": "master", "commit": "d9e078fe08d6466e37ea45ac446a9f60e6866789" }, - "sniprun": { "branch": "master", "commit": "30991d81ecfb947a2c54f879b194d4ed23225d91" }, + "sniprun": { "branch": "master", "commit": "f2302d4081914c3312456c91dc6965dfeec266b1" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "631bf1af1d12468655efb472dd2b176a693803f5" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "bb2c63ee5375ede81c1945b58638412af42b2d62" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "8ad632f793fd437865f99af5684f78300dac93fb" }, "telescope-undo.nvim": { "branch": "main", "commit": "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" }, - "todo-comments.nvim": { "branch": "main", "commit": "313b04e5b02d29ab9275c9295ff5e2b73921b0eb" }, + "todo-comments.nvim": { "branch": "main", "commit": "96fee098a90e7c09c9811aa7df71d773ba8b9b53" }, "toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" }, - "trouble.nvim": { "branch": "main", "commit": "4453fea6bb597830fbd58d2c484612f37b97bd8c" }, + "trouble.nvim": { "branch": "main", "commit": "bf99ea71a39e322336b7f8be965f86dbf5c65540" }, "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" }, "vim-fugitive": { "branch": "master", "commit": "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc" }, "vim-matchup": { "branch": "master", "commit": "1535a769d5dca851fe7d41b0be95f7c7203a4bef" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, - "which-key.nvim": { "branch": "main", "commit": "af4ded85542d40e190014c732fa051bdbf88be3d" }, + "which-key.nvim": { "branch": "main", "commit": "bb4e82bdaff50a4a93867e4c90938d18e7615af6" }, "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" } -} \ No newline at end of file +} From 2829a43d5a39d122e2f7b4cdaa694ecc6e0b46c7 Mon Sep 17 00:00:00 2001 From: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Date: Sat, 20 Jul 2024 17:27:37 +0800 Subject: [PATCH 19/40] fix(which-key): config option `modes` has been deprecated (#1326) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a follow-up fix for which-key's v3 rewrite. It simply restores the behaviors to match v2's default, so there shouldn't be any explicit changes. (Now the user can use which-key in visual/selection mode without the annoying box that distracts attention, which is superb 🥳) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --- lua/modules/configs/tool/which-key.lua | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lua/modules/configs/tool/which-key.lua b/lua/modules/configs/tool/which-key.lua index 721a5d6f3..e04e70117 100644 --- a/lua/modules/configs/tool/which-key.lua +++ b/lua/modules/configs/tool/which-key.lua @@ -9,14 +9,8 @@ return function() require("modules.utils").load_plugin("which-key", { preset = "classic", delay = vim.o.timeoutlen, - modes = { - n = true, - i = true, - x = false, - s = false, - o = false, - t = false, - c = false, + triggers = { + { "", mode = "nixso" }, }, plugins = { marks = true, From ea3eaac0d86c0ac8b7626a870d9cc2a20537e43b Mon Sep 17 00:00:00 2001 From: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Date: Sat, 20 Jul 2024 17:27:47 +0800 Subject: [PATCH 20/40] feat(lualine): always display BOM as part of the filetype (#1327) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --- lua/modules/configs/ui/lualine.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/modules/configs/ui/lualine.lua b/lua/modules/configs/ui/lualine.lua index 39e4b8911..916184059 100644 --- a/lua/modules/configs/ui/lualine.lua +++ b/lua/modules/configs/ui/lualine.lua @@ -311,6 +311,7 @@ return function() lualine_x = { { "encoding", + show_bomb = true, fmt = string.upper, padding = { left = 1 }, cond = conditionals.has_enough_room, From e8f85fa204e41e12af3dd701b361f50e359a34b3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 21 Jul 2024 01:56:20 +0000 Subject: [PATCH 21/40] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 14c2f2817..02e1ab0c8 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -6,7 +6,7 @@ "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "autoclose.nvim": { "branch": "main", "commit": "dc42806540dcf448ecb2bad6b67204410cfbe629" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, - "bufferline.nvim": { "branch": "main", "commit": "aa16dafdc642594c7ade7e88d31a6119feb189d6" }, + "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, "catppuccin": { "branch": "refactor/syntax-highlighting", "commit": "87ef3315b10ddee9e82e5ec7d21bf5f24db1a20f" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-latex-symbols": { "branch": "main", "commit": "165fb66afdbd016eaa1570e41672c4c557b57124" }, @@ -23,11 +23,11 @@ "crates.nvim": { "branch": "main", "commit": "c3fd47391de6999f4c939af89494d08443f71916" }, "csv.vim": { "branch": "master", "commit": "4d5255829afe3b6badb0c8a040116704c0d3213c" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "cab5e0226bc4f90a28cadcb0dc7341d550f1bdf0" }, + "dropbar.nvim": { "branch": "master", "commit": "6567d50fd792056e2001663f5cd4d8bfb6840604" }, "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, "flash.nvim": { "branch": "main", "commit": "25ba3f4d1e0b080213b39518ebcfbb693a23c957" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "fzf": { "branch": "master", "commit": "ea23539b59d3277cdd34d0ea9ddbcf9c54f350e6" }, + "fzf": { "branch": "master", "commit": "c50812518e8651fc681db3c26f37e4d143b75873" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" }, "glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" }, @@ -35,41 +35,41 @@ "guihua.lua": { "branch": "master", "commit": "225db770e36aae6a1e9e3a65578095c8eb4038d3" }, "hop.nvim": { "branch": "master", "commit": "036462a345792279c58f2f6445756efab706f04a" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "d731a6b005fd239e85e555bd57362382f6c1e461" }, + "lazy.nvim": { "branch": "main", "commit": "9a374a0fb4d3ac42dac4a129d4bead7252473c77" }, "local-highlight.nvim": { "branch": "master", "commit": "ae3ada3a332128b1036c84c8587b9069891c63da" }, "lsp-format-modifications.nvim": { "branch": "main", "commit": "006d4cd88f4f09fdc4375fcb75dd5b7d981a723b" }, "lsp_signature.nvim": { "branch": "master", "commit": "e6d225e27770db81346c2f2aa6c30d0e249f9e7f" }, "lspsaga.nvim": { "branch": "main", "commit": "6f920cfabddb9b7de5a3a4d0b7cd4f0774ae23e2" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" }, "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "4ba55f9755ebe8297d92c419b90a946123292ae6" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.align": { "branch": "main", "commit": "b54d88b16bfac62ca6b3d699566135639a3ca4fa" }, - "neoconf.nvim": { "branch": "main", "commit": "c282e6c6f5652e796f878f81b196245f03b98144" }, + "neoconf.nvim": { "branch": "main", "commit": "057b3ff0df0ef263f00d5e3003194e8998492d45" }, "neodim": { "branch": "master", "commit": "0543414f1205d8937d8e703a73ae1f9948940b14" }, "neoscroll.nvim": { "branch": "master", "commit": "a7f5953dbfbe7069568f2d0ed23a9709a56725ab" }, - "none-ls.nvim": { "branch": "main", "commit": "2870f66b1cb263f6e0bfffdb089739b874343a3a" }, + "none-ls.nvim": { "branch": "main", "commit": "2cde745aadc2c36f6860a77a556494870675771a" }, "nvim-bqf": { "branch": "main", "commit": "1b24dc6050c34e8cd377b6b4cd6abe40509e0187" }, "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" }, "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, + "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-highlight-colors": { "branch": "main", "commit": "a8f6952cb1ff7bde864a34c502f1a42c360a6662" }, - "nvim-lspconfig": { "branch": "master", "commit": "01e08d4bf1c35e5126b2ad5209725e4c552289ab" }, + "nvim-lspconfig": { "branch": "master", "commit": "e26da408cf955afa8e9ddbadd510e84ea8976cd7" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "afc67708a5a5585553dee132ffbc4761bb135faf" }, "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" }, "nvim-tree.lua": { "branch": "master", "commit": "f9ff00bc06d7cb70548a3847d7a2a05e928bc988" }, "nvim-treehopper": { "branch": "master", "commit": "13559079e33665a310d9ccf0e43f4e9bb9f337e2" }, - "nvim-treesitter": { "branch": "master", "commit": "0d5e1214a5c386a168dc8e19d7da0ceb0e0bd6f2" }, + "nvim-treesitter": { "branch": "master", "commit": "667b9dbbfa2d0071c5677c429ddcf89fb931b53f" }, "nvim-treesitter-context": { "branch": "master", "commit": "2aba92ceb1479485953007f4d5adf34d0b66917e" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "1624866a1379fc1861797f0ed05899a9c1d2ff61" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" }, - "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, + "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, "paint.nvim": { "branch": "main", "commit": "d738db9211ef73182ffa9b92a2a5661411267123" }, "persisted.nvim": { "branch": "main", "commit": "4df3f8a03690add1bc2f9a79b31e1c43f5e0dd05" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, @@ -77,7 +77,7 @@ "rainbow-delimiters.nvim": { "branch": "master", "commit": "b29da4a6061a88270e875b38367d82c04c856128" }, "rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" }, "search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" }, - "smart-splits.nvim": { "branch": "master", "commit": "44145a4b37217348293fe457992cc38cf3b19f33" }, + "smart-splits.nvim": { "branch": "master", "commit": "7697116ca807304c9d27a3d8157fe4bc78e88d0f" }, "smartyank.nvim": { "branch": "master", "commit": "d9e078fe08d6466e37ea45ac446a9f60e6866789" }, "sniprun": { "branch": "master", "commit": "f2302d4081914c3312456c91dc6965dfeec266b1" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, @@ -86,15 +86,15 @@ "telescope-live-grep-args.nvim": { "branch": "master", "commit": "8ad632f793fd437865f99af5684f78300dac93fb" }, "telescope-undo.nvim": { "branch": "main", "commit": "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, - "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" }, + "telescope.nvim": { "branch": "master", "commit": "79552ef8488cb492e0f9d2bf3b4e808f57515e35" }, "todo-comments.nvim": { "branch": "main", "commit": "96fee098a90e7c09c9811aa7df71d773ba8b9b53" }, - "toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" }, - "trouble.nvim": { "branch": "main", "commit": "bf99ea71a39e322336b7f8be965f86dbf5c65540" }, + "toggleterm.nvim": { "branch": "main", "commit": "8ed0f52006d3207ec6c94de7db62da840937ef2a" }, + "trouble.nvim": { "branch": "main", "commit": "1f71d71232173c1670ad4b9164d7f060586e2236" }, "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" }, - "vim-fugitive": { "branch": "master", "commit": "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc" }, + "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, "vim-matchup": { "branch": "master", "commit": "1535a769d5dca851fe7d41b0be95f7c7203a4bef" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, - "which-key.nvim": { "branch": "main", "commit": "bb4e82bdaff50a4a93867e4c90938d18e7615af6" }, + "which-key.nvim": { "branch": "main", "commit": "c4689ab39c1f51cac447893b05bb0266a7af1ed7" }, "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" } } From 3828f4b6a211659a9d8fbf79bf3eb36bd198c786 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 02:43:39 +0000 Subject: [PATCH 22/40] chore(lockfile): auto update flake.lock --- flake.lock | 72 ++++++++++++++---------------------------------------- 1 file changed, 19 insertions(+), 53 deletions(-) diff --git a/flake.lock b/flake.lock index c62dd92e3..82e9e0ba1 100644 --- a/flake.lock +++ b/flake.lock @@ -2,15 +2,14 @@ "nodes": { "devshell": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1717408969, - "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", + "lastModified": 1722113426, + "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", "owner": "numtide", "repo": "devshell", - "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", + "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", "type": "github" }, "original": { @@ -24,11 +23,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1719745305, - "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -37,24 +36,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -62,11 +43,11 @@ ] }, "locked": { - "lastModified": 1719677234, - "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=", + "lastModified": 1722462338, + "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=", "owner": "nix-community", "repo": "home-manager", - "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d", + "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8", "type": "github" }, "original": { @@ -77,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704161960, - "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", + "lastModified": 1722073938, + "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63143ac2c9186be6d9da6035fa22620018c85932", + "rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae", "type": "github" }, "original": { @@ -93,23 +74,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1717284937, - "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1719468428, - "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", + "lastModified": 1722415718, + "narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", + "rev": "c3392ad349a5227f4a3464dce87bcc5046692fce", "type": "github" }, "original": { @@ -126,21 +107,6 @@ "home-manager": "home-manager", "nixpkgs": "nixpkgs_2" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", From ccf046437749ca776d9539fc9cb899bf697498ba Mon Sep 17 00:00:00 2001 From: Charles Chiu Date: Fri, 9 Aug 2024 14:35:30 +0800 Subject: [PATCH 23/40] feat: add `render-markdown.nvim` for md workflow (#1336) * feat: add `render-markdown.nvim` for md workflow * feat: `` toggles the plugin Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix: add `nvim-web-devicons` as a dependency Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * perf: disable for files larger than 2 MiB Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --------- Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> Co-authored-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --- lua/keymap/lang.lua | 5 +++++ lua/modules/configs/lang/render-markdown.lua | 21 ++++++++++++++++++++ lua/modules/configs/ui/catppuccin.lua | 1 + lua/modules/plugins/lang.lua | 9 +++++++++ 4 files changed, 36 insertions(+) create mode 100644 lua/modules/configs/lang/render-markdown.lua diff --git a/lua/keymap/lang.lua b/lua/keymap/lang.lua index 46ec703ff..aef337350 100644 --- a/lua/keymap/lang.lua +++ b/lua/keymap/lang.lua @@ -5,6 +5,11 @@ local map_cr = bind.map_cr -- local map_callback = bind.map_callback local plug_map = { + -- Plugin render-markdown.nvim + ["n|"] = map_cr("RenderMarkdown toggle") + :with_noremap() + :with_silent() + :with_desc("tool: toggle markdown preview within nvim"), -- Plugin MarkdownPreview ["n|"] = map_cr("MarkdownPreviewToggle"):with_noremap():with_silent():with_desc("tool: Preview markdown"), } diff --git a/lua/modules/configs/lang/render-markdown.lua b/lua/modules/configs/lang/render-markdown.lua new file mode 100644 index 000000000..65ad80fec --- /dev/null +++ b/lua/modules/configs/lang/render-markdown.lua @@ -0,0 +1,21 @@ +return function() + require("modules.utils").load_plugin("render-markdown", { + -- Whether Markdown should be rendered by default or not + enabled = true, + -- Maximum file size (in MB) that this plugin will attempt to render + -- Any file larger than this will effectively be ignored + max_file_size = 2.0, + -- Milliseconds that must pass before updating marks, updates occur + -- within the context of the visible window, not the entire buffer + debounce = 100, + -- Vim modes that will show a rendered view of the markdown file + -- All other modes will be uneffected by this plugin + render_modes = { "n", "c", "t" }, + -- This enables hiding any added text on the line the cursor is on + -- This does have a performance penalty as we must listen to the 'CursorMoved' event + anti_conceal = { enabled = true }, + -- The level of logs to write to file: vim.fn.stdpath('state') .. '/render-markdown.log' + -- Only intended to be used for plugin development / debugging + log_level = "error", + }) +end diff --git a/lua/modules/configs/ui/catppuccin.lua b/lua/modules/configs/ui/catppuccin.lua index c0a9048b1..2af1da1c6 100644 --- a/lua/modules/configs/ui/catppuccin.lua +++ b/lua/modules/configs/ui/catppuccin.lua @@ -83,6 +83,7 @@ return function() overseer = false, pounce = false, rainbow_delimiters = true, + render_markdown = true, sandwich = false, semantic_tokens = true, symbols_outline = false, diff --git a/lua/modules/plugins/lang.lua b/lua/modules/plugins/lang.lua index 2cfc3974d..5b5bc6259 100644 --- a/lua/modules/plugins/lang.lua +++ b/lua/modules/plugins/lang.lua @@ -28,6 +28,15 @@ lang["Saecki/crates.nvim"] = { config = require("lang.crates"), dependencies = { "nvim-lua/plenary.nvim" }, } +lang["MeanderingProgrammer/render-markdown.nvim"] = { + lazy = true, + ft = "markdown", + config = require("lang.render-markdown"), + dependencies = { + "nvim-tree/nvim-web-devicons", + "nvim-treesitter/nvim-treesitter", + }, +} lang["iamcco/markdown-preview.nvim"] = { lazy = true, ft = "markdown", From c9becdfa58f78b64ee01d42371aa314770c5109a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 10 Aug 2024 01:55:15 +0000 Subject: [PATCH 24/40] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 97 +++++++++++++++++++++++++------------------------- 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 02e1ab0c8..89f61258a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,13 +1,13 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, + "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, "advanced-git-search.nvim": { "branch": "main", "commit": "198cc402af1790ab26830fdbf24a28c336a20ba6" }, - "aerial.nvim": { "branch": "master", "commit": "4e77964569ef47a70f9bb76c668dcfea2d089d5a" }, - "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "autoclose.nvim": { "branch": "main", "commit": "dc42806540dcf448ecb2bad6b67204410cfbe629" }, + "aerial.nvim": { "branch": "master", "commit": "e75a3df2c20b3a98c786f5e61587d74a7a6b61d6" }, + "alpha-nvim": { "branch": "main", "commit": "36e4baca9533ec87afa948fe20a0a1c4897a6a6e" }, + "autoclose.nvim": { "branch": "main", "commit": "b2077aa2c83df7ebc19b2a20a3a0654b24ae9c8f" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, - "catppuccin": { "branch": "refactor/syntax-highlighting", "commit": "87ef3315b10ddee9e82e5ec7d21bf5f24db1a20f" }, + "catppuccin": { "branch": "refactor/syntax-highlighting", "commit": "4ba8c8bd0c6076773dea6e3831d36fc2e40576fc" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-latex-symbols": { "branch": "main", "commit": "165fb66afdbd016eaa1570e41672c4c557b57124" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, @@ -20,81 +20,82 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, - "crates.nvim": { "branch": "main", "commit": "c3fd47391de6999f4c939af89494d08443f71916" }, - "csv.vim": { "branch": "master", "commit": "4d5255829afe3b6badb0c8a040116704c0d3213c" }, + "crates.nvim": { "branch": "main", "commit": "cd670ecc862469557b12d12e7116d7afd2fd9c0f" }, + "csv.vim": { "branch": "master", "commit": "85e6a9f24b68f213b5423a0840f2dc9831eb3edb" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "6567d50fd792056e2001663f5cd4d8bfb6840604" }, + "dropbar.nvim": { "branch": "master", "commit": "aa4c0ab1ade45ff9a3c5d4c06365c9b119f32d36" }, "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, - "flash.nvim": { "branch": "main", "commit": "25ba3f4d1e0b080213b39518ebcfbb693a23c957" }, + "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "fzf": { "branch": "master", "commit": "c50812518e8651fc681db3c26f37e4d143b75873" }, + "fzf": { "branch": "master", "commit": "c423c496a15b96cfc3c3fbd09135bcdc0c8e6b6e" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, - "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" }, + "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, "glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" }, - "go.nvim": { "branch": "master", "commit": "033344ddfa3cd5cfd55037903264b2bb86691619" }, + "go.nvim": { "branch": "master", "commit": "e66c3240d26936428cd0f320dc5ffa1eb01538b8" }, "guihua.lua": { "branch": "master", "commit": "225db770e36aae6a1e9e3a65578095c8eb4038d3" }, - "hop.nvim": { "branch": "master", "commit": "036462a345792279c58f2f6445756efab706f04a" }, - "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "9a374a0fb4d3ac42dac4a129d4bead7252473c77" }, + "hop.nvim": { "branch": "master", "commit": "8f51ef02700bb3cdcce94e92eff16170a6343c4f" }, + "indent-blankline.nvim": { "branch": "master", "commit": "dddb5d21811c319eb6e51a993d8fb44b193aae3f" }, + "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "local-highlight.nvim": { "branch": "master", "commit": "ae3ada3a332128b1036c84c8587b9069891c63da" }, "lsp-format-modifications.nvim": { "branch": "main", "commit": "006d4cd88f4f09fdc4375fcb75dd5b7d981a723b" }, "lsp_signature.nvim": { "branch": "master", "commit": "e6d225e27770db81346c2f2aa6c30d0e249f9e7f" }, - "lspsaga.nvim": { "branch": "main", "commit": "6f920cfabddb9b7de5a3a4d0b7cd4f0774ae23e2" }, + "lspsaga.nvim": { "branch": "main", "commit": "a751b92b5d765a99fe3a42b9e51c046f81385e15" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" }, "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "4ba55f9755ebe8297d92c419b90a946123292ae6" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.align": { "branch": "main", "commit": "b54d88b16bfac62ca6b3d699566135639a3ca4fa" }, - "neoconf.nvim": { "branch": "main", "commit": "057b3ff0df0ef263f00d5e3003194e8998492d45" }, - "neodim": { "branch": "master", "commit": "0543414f1205d8937d8e703a73ae1f9948940b14" }, - "neoscroll.nvim": { "branch": "master", "commit": "a7f5953dbfbe7069568f2d0ed23a9709a56725ab" }, - "none-ls.nvim": { "branch": "main", "commit": "2cde745aadc2c36f6860a77a556494870675771a" }, + "neoconf.nvim": { "branch": "main", "commit": "a6e09d22fda3ee5ce472e135a0df9b96d26706a7" }, + "neodim": { "branch": "master", "commit": "d87470828690342d0139efc2fd56ea0b29e9ecb3" }, + "neoscroll.nvim": { "branch": "master", "commit": "532dcc8cea4287c4cad6bb77532989a8217cfc7b" }, + "none-ls.nvim": { "branch": "main", "commit": "cfa65d86e21eeb60544d5e823f6db43941322a53" }, "nvim-bqf": { "branch": "main", "commit": "1b24dc6050c34e8cd377b6b4cd6abe40509e0187" }, "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" }, - "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" }, + "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, + "nvim-dap": { "branch": "master", "commit": "2b428ff2632e73295e9decbcf1c40d8e26213305" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, - "nvim-highlight-colors": { "branch": "main", "commit": "a8f6952cb1ff7bde864a34c502f1a42c360a6662" }, - "nvim-lspconfig": { "branch": "master", "commit": "e26da408cf955afa8e9ddbadd510e84ea8976cd7" }, + "nvim-highlight-colors": { "branch": "main", "commit": "a411550ef85cae467b889ba7d1a96bd78332d90e" }, + "nvim-lspconfig": { "branch": "master", "commit": "652386deae739e38fa1bcf2f06e3e7de9b3436ba" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-scrollview": { "branch": "main", "commit": "afc67708a5a5585553dee132ffbc4761bb135faf" }, - "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" }, - "nvim-tree.lua": { "branch": "master", "commit": "f9ff00bc06d7cb70548a3847d7a2a05e928bc988" }, + "nvim-scrollview": { "branch": "main", "commit": "401c0498689dcaa54b2e7483d823e33cdc051e72" }, + "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" }, + "nvim-tree.lua": { "branch": "master", "commit": "e25eb7fa83f7614bb23d762e91d2de44fcd7103b" }, "nvim-treehopper": { "branch": "master", "commit": "13559079e33665a310d9ccf0e43f4e9bb9f337e2" }, - "nvim-treesitter": { "branch": "master", "commit": "667b9dbbfa2d0071c5677c429ddcf89fb931b53f" }, - "nvim-treesitter-context": { "branch": "master", "commit": "2aba92ceb1479485953007f4d5adf34d0b66917e" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "nvim-ts-autotag": { "branch": "main", "commit": "1624866a1379fc1861797f0ed05899a9c1d2ff61" }, + "nvim-treesitter": { "branch": "master", "commit": "176e4464736c1feca190d77f481ed5972b513516" }, + "nvim-treesitter-context": { "branch": "master", "commit": "0f3332788e0bd37716fbd25f39120dcfd557c90f" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "ca93cb2c34b67ab22d01976fc90bc95627a3317f" }, + "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" }, - "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, - "paint.nvim": { "branch": "main", "commit": "d738db9211ef73182ffa9b92a2a5661411267123" }, - "persisted.nvim": { "branch": "main", "commit": "4df3f8a03690add1bc2f9a79b31e1c43f5e0dd05" }, + "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, + "paint.nvim": { "branch": "main", "commit": "ef6f717a8669619ebbd098fb72f85115d64c6c92" }, + "persisted.nvim": { "branch": "main", "commit": "e2ae8b321ef0b02eb53aacd23f4bddc19923cff8" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "b29da4a6061a88270e875b38367d82c04c856128" }, - "rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "97b8238fb6f1dd2b7d4168ee10457c277c9e6ee3" }, + "render-markdown.nvim": { "branch": "main", "commit": "aff8d09a199b263f2373c842057c87b76369084f" }, + "rustaceanvim": { "branch": "master", "commit": "cb83e412f0552df3957a5d3e5f29c1ea4b777975" }, "search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" }, - "smart-splits.nvim": { "branch": "master", "commit": "7697116ca807304c9d27a3d8157fe4bc78e88d0f" }, + "smart-splits.nvim": { "branch": "master", "commit": "dbd4d7212d6e9d180ab4197a52cee2ba31b2b749" }, "smartyank.nvim": { "branch": "master", "commit": "d9e078fe08d6466e37ea45ac446a9f60e6866789" }, - "sniprun": { "branch": "master", "commit": "f2302d4081914c3312456c91dc6965dfeec266b1" }, + "sniprun": { "branch": "master", "commit": "a29d7b1c313b00980015ad79fa0ab512a0729940" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "bb2c63ee5375ede81c1945b58638412af42b2d62" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "25d01edae8a2d74bcaa706c003b2712bce1e3301" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, - "telescope-live-grep-args.nvim": { "branch": "master", "commit": "8ad632f793fd437865f99af5684f78300dac93fb" }, + "telescope-live-grep-args.nvim": { "branch": "master", "commit": "649b662a8f476fd2c0289570764459e95ebaa3f3" }, "telescope-undo.nvim": { "branch": "main", "commit": "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a" }, - "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, - "telescope.nvim": { "branch": "master", "commit": "79552ef8488cb492e0f9d2bf3b4e808f57515e35" }, - "todo-comments.nvim": { "branch": "main", "commit": "96fee098a90e7c09c9811aa7df71d773ba8b9b53" }, - "toggleterm.nvim": { "branch": "main", "commit": "8ed0f52006d3207ec6c94de7db62da840937ef2a" }, - "trouble.nvim": { "branch": "main", "commit": "1f71d71232173c1670ad4b9164d7f060586e2236" }, + "telescope-zoxide": { "branch": "main", "commit": "6d23b6135eb01e0540ab46c838fd44351876917a" }, + "telescope.nvim": { "branch": "master", "commit": "3b1600d0fd5172ad9fae00987362ca0ef3d8895d" }, + "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, + "toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" }, + "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" }, "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, "vim-matchup": { "branch": "master", "commit": "1535a769d5dca851fe7d41b0be95f7c7203a4bef" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, - "which-key.nvim": { "branch": "main", "commit": "c4689ab39c1f51cac447893b05bb0266a7af1ed7" }, + "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }, "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" } } From c9dea9d49ab232acb0b07bc29fe5a49c30b4b482 Mon Sep 17 00:00:00 2001 From: Charles Chiu Date: Mon, 12 Aug 2024 17:43:52 +0800 Subject: [PATCH 25/40] fix(core): disable rtp plugins via `lazy.nvim`, #1339 (#1340) * fix(core): disable rtp plugins via `lazy.nvim` * chore(core): add notes for disabled rtp plugins --- lua/core/init.lua | 53 ----------------------------------------------- lua/core/pack.lua | 22 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 53 deletions(-) diff --git a/lua/core/init.lua b/lua/core/init.lua index a5fa32813..85ba8bff3 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -22,58 +22,6 @@ local createdir = function() end end -local disable_distribution_plugins = function() - -- Disable menu loading - vim.g.did_install_default_menus = 1 - vim.g.did_install_syntax_menu = 1 - - -- Comment this if you define your own filetypes in `after/ftplugin` - -- vim.g.did_load_filetypes = 1 - - -- Do not load native syntax completion - vim.g.loaded_syntax_completion = 1 - - -- Do not load spell files - vim.g.loaded_spellfile_plugin = 1 - - -- Whether to load netrw by default - -- vim.g.loaded_netrw = 1 - -- vim.g.loaded_netrwFileHandlers = 1 - -- vim.g.loaded_netrwPlugin = 1 - -- vim.g.loaded_netrwSettings = 1 - -- newtrw liststyle: https://medium.com/usevim/the-netrw-style-options-3ebe91d42456 - vim.g.netrw_liststyle = 3 - - -- Do not load tohtml.vim - vim.g.loaded_2html_plugin = 1 - - -- Do not load zipPlugin.vim, gzip.vim and tarPlugin.vim (all of these plugins are - -- related to reading files inside compressed containers) - vim.g.loaded_gzip = 1 - vim.g.loaded_tar = 1 - vim.g.loaded_tarPlugin = 1 - vim.g.loaded_vimball = 1 - vim.g.loaded_vimballPlugin = 1 - vim.g.loaded_zip = 1 - vim.g.loaded_zipPlugin = 1 - - -- Do not use builtin matchit.vim and matchparen.vim because we're using vim-matchup - vim.g.loaded_matchit = 1 - vim.g.loaded_matchparen = 1 - - -- Disable sql omni completion - vim.g.loaded_sql_completion = 1 - - -- Set this to 0 in order to disable native EditorConfig support - vim.g.editorconfig = 1 - - -- Disable remote plugins - -- NOTE: - -- > Disabling rplugin.vim will make `wilder.nvim` complain about missing rplugins during :checkhealth, - -- > but since it's config doesn't require python rtp (strictly), it's fine to ignore that for now. - -- vim.g.loaded_remote_plugins = 1 -end - local leader_map = function() vim.g.mapleader = " " -- NOTE: @@ -148,7 +96,6 @@ end local load_core = function() createdir() - disable_distribution_plugins() leader_map() gui_config() diff --git a/lua/core/pack.lua b/lua/core/pack.lua index 326bf3df9..d326b15bb 100644 --- a/lua/core/pack.lua +++ b/lua/core/pack.lua @@ -124,6 +124,28 @@ function Lazy:load_lazy() reset = true, -- reset the runtime path to $VIMRUNTIME and the config directory ---@type string[] paths = {}, -- add any custom paths here that you want to include in the rtp + disabled_plugins = { + -- Do not use builtin matchit.vim and matchparen.vim because we're using vim-matchup + "matchit", + "matchparen", + -- Do not load builtin netrw + "netrwPlugin", + -- Do not load tohtml.vim + "tohtml", + -- Do not load zipPlugin.vim, gzip.vim and tarPlugin.vim (all of these plugins are + -- related to reading files inside compressed containers) + "gzip", + "tarPlugin", + "tutor", + "zipPlugin", + -- Disable remote plugins + -- NOTE: + -- > Disabling rplugin.vim will make `wilder.nvim` complain about missing rplugins during :checkhealth, + -- > but since it's config doesn't require python rtp (strictly), it's fine to ignore that for now. + "rplugin", + -- Do not load spell files + "spellfile", + }, }, }, } From fb942c5f5da222cdbdeae774e16ea4768961ef9a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 01:56:08 +0000 Subject: [PATCH 26/40] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 89f61258a..c059e1909 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,8 +2,8 @@ "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, "advanced-git-search.nvim": { "branch": "main", "commit": "198cc402af1790ab26830fdbf24a28c336a20ba6" }, - "aerial.nvim": { "branch": "master", "commit": "e75a3df2c20b3a98c786f5e61587d74a7a6b61d6" }, - "alpha-nvim": { "branch": "main", "commit": "36e4baca9533ec87afa948fe20a0a1c4897a6a6e" }, + "aerial.nvim": { "branch": "master", "commit": "263beeb92961c15882b7853805f0ae2024f2e903" }, + "alpha-nvim": { "branch": "main", "commit": "355fbb81a59637a8963cf5847074f8c44dbef11f" }, "autoclose.nvim": { "branch": "main", "commit": "b2077aa2c83df7ebc19b2a20a3a0654b24ae9c8f" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, @@ -27,7 +27,7 @@ "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "fzf": { "branch": "master", "commit": "c423c496a15b96cfc3c3fbd09135bcdc0c8e6b6e" }, + "fzf": { "branch": "master", "commit": "e28f5aa45baf20ffdba469e11a998d3016c8cb42" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, "glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" }, @@ -40,7 +40,7 @@ "lsp-format-modifications.nvim": { "branch": "main", "commit": "006d4cd88f4f09fdc4375fcb75dd5b7d981a723b" }, "lsp_signature.nvim": { "branch": "master", "commit": "e6d225e27770db81346c2f2aa6c30d0e249f9e7f" }, "lspsaga.nvim": { "branch": "main", "commit": "a751b92b5d765a99fe3a42b9e51c046f81385e15" }, - "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, + "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" }, "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, @@ -57,16 +57,16 @@ "nvim-dap": { "branch": "master", "commit": "2b428ff2632e73295e9decbcf1c40d8e26213305" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-highlight-colors": { "branch": "main", "commit": "a411550ef85cae467b889ba7d1a96bd78332d90e" }, - "nvim-lspconfig": { "branch": "master", "commit": "652386deae739e38fa1bcf2f06e3e7de9b3436ba" }, + "nvim-lspconfig": { "branch": "master", "commit": "ff97d376b1d22b2eaf9274605531babf0cd0cf21" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "401c0498689dcaa54b2e7483d823e33cdc051e72" }, "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" }, - "nvim-tree.lua": { "branch": "master", "commit": "e25eb7fa83f7614bb23d762e91d2de44fcd7103b" }, + "nvim-tree.lua": { "branch": "master", "commit": "ad0b95dee55955817af635fa121f6e2486b10583" }, "nvim-treehopper": { "branch": "master", "commit": "13559079e33665a310d9ccf0e43f4e9bb9f337e2" }, - "nvim-treesitter": { "branch": "master", "commit": "176e4464736c1feca190d77f481ed5972b513516" }, + "nvim-treesitter": { "branch": "master", "commit": "e5a05ba5e298cc1e1dad8eb8095b8d4d89a7f793" }, "nvim-treesitter-context": { "branch": "master", "commit": "0f3332788e0bd37716fbd25f39120dcfd557c90f" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "ca93cb2c34b67ab22d01976fc90bc95627a3317f" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "ced6375723b20616282f9f6a1018a63ae19b106a" }, "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" }, "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, @@ -74,20 +74,20 @@ "persisted.nvim": { "branch": "main", "commit": "e2ae8b321ef0b02eb53aacd23f4bddc19923cff8" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "97b8238fb6f1dd2b7d4168ee10457c277c9e6ee3" }, - "render-markdown.nvim": { "branch": "main", "commit": "aff8d09a199b263f2373c842057c87b76369084f" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "ea4a2da7d14c948b909bead6e41f77d26cf8e3da" }, + "render-markdown.nvim": { "branch": "main", "commit": "72688baea4ef0ed605033bf654b54d801b6a5f01" }, "rustaceanvim": { "branch": "master", "commit": "cb83e412f0552df3957a5d3e5f29c1ea4b777975" }, "search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" }, - "smart-splits.nvim": { "branch": "master", "commit": "dbd4d7212d6e9d180ab4197a52cee2ba31b2b749" }, + "smart-splits.nvim": { "branch": "master", "commit": "b518cfb5283a2da43fa9935e850ba9d77873453d" }, "smartyank.nvim": { "branch": "master", "commit": "d9e078fe08d6466e37ea45ac446a9f60e6866789" }, "sniprun": { "branch": "master", "commit": "a29d7b1c313b00980015ad79fa0ab512a0729940" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "25d01edae8a2d74bcaa706c003b2712bce1e3301" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "39f70a87a271bbb76c86c73816597478dd6ad0a4" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "649b662a8f476fd2c0289570764459e95ebaa3f3" }, "telescope-undo.nvim": { "branch": "main", "commit": "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a" }, "telescope-zoxide": { "branch": "main", "commit": "6d23b6135eb01e0540ab46c838fd44351876917a" }, - "telescope.nvim": { "branch": "master", "commit": "3b1600d0fd5172ad9fae00987362ca0ef3d8895d" }, + "telescope.nvim": { "branch": "master", "commit": "43c47ebc49ba601c7f0d06d65ce61d6aa8e670ab" }, "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, "toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, From 6c3f197d675a87ab7d91984f418d50706da4012c Mon Sep 17 00:00:00 2001 From: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Date: Tue, 13 Aug 2024 16:49:16 +0800 Subject: [PATCH 27/40] feat(persisted): update for recent code rewrite (#1338) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --- lua/modules/configs/editor/persisted.lua | 26 ++++++++---------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/lua/modules/configs/editor/persisted.lua b/lua/modules/configs/editor/persisted.lua index 003d8cb9d..2f1f43492 100644 --- a/lua/modules/configs/editor/persisted.lua +++ b/lua/modules/configs/editor/persisted.lua @@ -1,23 +1,13 @@ return function() require("modules.utils").load_plugin("persisted", { - save_dir = vim.fn.expand(vim.fn.stdpath("data") .. "/sessions/"), -- directory where session files are saved - silent = false, -- silent nvim message when sourcing session file - use_git_branch = true, -- create session files based on the branch of the git enabled repository - autosave = true, -- automatically save session files when exiting Neovim - should_autosave = function() - if vim.bo.filetype == "alpha" then - return false - end - return true - end, -- function to determine if a session should be autosaved + save_dir = vim.fn.expand(vim.fn.stdpath("data") .. "/sessions/"), + autostart = true, -- Set `lazy = false` in `plugins/editor.lua` to enable this - autoload = false, -- automatically load the session for the cwd on Neovim startup - on_autoload_no_session = nil, -- function to run when `autoload = true` but there is no session to load - follow_cwd = true, -- change session file name to match current working directory if it changes - allowed_dirs = nil, -- table of dirs that the plugin will auto-save and auto-load from - ignored_dirs = nil, -- table of dirs that are ignored when auto-saving and auto-loading - telescope = { -- options for the telescope extension - reset_prompt_after_deletion = true, -- whether to reset prompt after session deleted - }, + autoload = false, + follow_cwd = true, + use_git_branch = true, + should_save = function() + return vim.bo.filetype == "alpha" and false or true + end, }) end From 8d81c66efe75604e8ec7de4238f72122da0a3065 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 01:54:58 +0000 Subject: [PATCH 28/40] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index c059e1909..da4e9d401 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -27,7 +27,7 @@ "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "fzf": { "branch": "master", "commit": "e28f5aa45baf20ffdba469e11a998d3016c8cb42" }, + "fzf": { "branch": "master", "commit": "d90a969c00401a11d86a238eef29048dea42398a" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, "glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" }, @@ -42,7 +42,7 @@ "lspsaga.nvim": { "branch": "main", "commit": "a751b92b5d765a99fe3a42b9e51c046f81385e15" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "f2acd4a21db1ca0a12559e7a9f7cdace3bdbfb09" }, "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, @@ -57,14 +57,14 @@ "nvim-dap": { "branch": "master", "commit": "2b428ff2632e73295e9decbcf1c40d8e26213305" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-highlight-colors": { "branch": "main", "commit": "a411550ef85cae467b889ba7d1a96bd78332d90e" }, - "nvim-lspconfig": { "branch": "master", "commit": "ff97d376b1d22b2eaf9274605531babf0cd0cf21" }, + "nvim-lspconfig": { "branch": "master", "commit": "a67bc39aaa4f1e13212c5022a561120846eaef27" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "401c0498689dcaa54b2e7483d823e33cdc051e72" }, "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" }, "nvim-tree.lua": { "branch": "master", "commit": "ad0b95dee55955817af635fa121f6e2486b10583" }, "nvim-treehopper": { "branch": "master", "commit": "13559079e33665a310d9ccf0e43f4e9bb9f337e2" }, - "nvim-treesitter": { "branch": "master", "commit": "e5a05ba5e298cc1e1dad8eb8095b8d4d89a7f793" }, + "nvim-treesitter": { "branch": "master", "commit": "047ce49ccf9a2dce22e1cf3843bef3b5682a8144" }, "nvim-treesitter-context": { "branch": "master", "commit": "0f3332788e0bd37716fbd25f39120dcfd557c90f" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ced6375723b20616282f9f6a1018a63ae19b106a" }, "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, @@ -74,9 +74,9 @@ "persisted.nvim": { "branch": "main", "commit": "e2ae8b321ef0b02eb53aacd23f4bddc19923cff8" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "ea4a2da7d14c948b909bead6e41f77d26cf8e3da" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "0543d6ff37d3178e37131dfd5486e8a75d52f696" }, "render-markdown.nvim": { "branch": "main", "commit": "72688baea4ef0ed605033bf654b54d801b6a5f01" }, - "rustaceanvim": { "branch": "master", "commit": "cb83e412f0552df3957a5d3e5f29c1ea4b777975" }, + "rustaceanvim": { "branch": "master", "commit": "7cba8e599deca98d4b44cac1bcbd720c62937d90" }, "search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" }, "smart-splits.nvim": { "branch": "master", "commit": "b518cfb5283a2da43fa9935e850ba9d77873453d" }, "smartyank.nvim": { "branch": "master", "commit": "d9e078fe08d6466e37ea45ac446a9f60e6866789" }, @@ -87,7 +87,7 @@ "telescope-live-grep-args.nvim": { "branch": "master", "commit": "649b662a8f476fd2c0289570764459e95ebaa3f3" }, "telescope-undo.nvim": { "branch": "main", "commit": "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a" }, "telescope-zoxide": { "branch": "main", "commit": "6d23b6135eb01e0540ab46c838fd44351876917a" }, - "telescope.nvim": { "branch": "master", "commit": "43c47ebc49ba601c7f0d06d65ce61d6aa8e670ab" }, + "telescope.nvim": { "branch": "master", "commit": "159b8b79666e17c8de0378d5c9dc1bc8c7afabcf" }, "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, "toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, From 360ec25387f17e0b7262bf0f41fb8b6a33de2325 Mon Sep 17 00:00:00 2001 From: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Date: Wed, 21 Aug 2024 18:24:04 +0800 Subject: [PATCH 29/40] fix: some vim plugins get disabled by mistake (#1341) * fix: some vim plugins get disabled by mistake This commit addresses a few regressions introduced by #1340: * The `tutor` plugin was accidentally disabled. * netrw, along with its configuration, was mistakenly disabled. * EditorConfig is now being implicitly disabled, which wasn't intended before #1340. Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * clean up * fix: EditorConfig should have been disabled Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> * fix: disable `editorconfig` via `lazy.nvim` * chore: move netrw_liststyle to `core/options.lua` --------- Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> Co-authored-by: CharlesChiuGit --- lua/core/options.lua | 3 +++ lua/core/pack.lua | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lua/core/options.lua b/lua/core/options.lua index d025abf07..72751e022 100644 --- a/lua/core/options.lua +++ b/lua/core/options.lua @@ -125,4 +125,7 @@ local function load_options() end end +-- Newtrw liststyle: https://medium.com/usevim/the-netrw-style-options-3ebe91d42456 +vim.g.netrw_liststyle = 3 + load_options() diff --git a/lua/core/pack.lua b/lua/core/pack.lua index d326b15bb..5f3f5a7ed 100644 --- a/lua/core/pack.lua +++ b/lua/core/pack.lua @@ -125,26 +125,27 @@ function Lazy:load_lazy() ---@type string[] paths = {}, -- add any custom paths here that you want to include in the rtp disabled_plugins = { + -- Set this to true in order to enable native EditorConfig support + -- WARN: Sleuth.vim already includes all the features provided by this plugin. + -- Do NOT enable both at the same time, or you risk breaking the entire detection system. + "editorconfig", + -- Do not load spell files + "spellfile", -- Do not use builtin matchit.vim and matchparen.vim because we're using vim-matchup "matchit", "matchparen", - -- Do not load builtin netrw - "netrwPlugin", -- Do not load tohtml.vim "tohtml", -- Do not load zipPlugin.vim, gzip.vim and tarPlugin.vim (all of these plugins are -- related to reading files inside compressed containers) "gzip", "tarPlugin", - "tutor", "zipPlugin", -- Disable remote plugins -- NOTE: -- > Disabling rplugin.vim will make `wilder.nvim` complain about missing rplugins during :checkhealth, -- > but since it's config doesn't require python rtp (strictly), it's fine to ignore that for now. - "rplugin", - -- Do not load spell files - "spellfile", + -- "rplugin", }, }, }, From 88b841d16a38bb0c0e4d64e145461442bedb1ab2 Mon Sep 17 00:00:00 2001 From: TonyWu20 Date: Wed, 21 Aug 2024 21:27:45 +0800 Subject: [PATCH 30/40] Zen-mode --- lua/modules/configs/editor/zen-mode.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/modules/configs/editor/zen-mode.lua b/lua/modules/configs/editor/zen-mode.lua index bd41637d0..7add28f10 100644 --- a/lua/modules/configs/editor/zen-mode.lua +++ b/lua/modules/configs/editor/zen-mode.lua @@ -3,12 +3,12 @@ return function() window = { backdrop = 0.95, width = 85, - height = 0.8, + height = 1.0, options = { list = false, -- foldcolumn = "0", -- signcolumn = "no", - cursorcolumn = false, + cursorcolumn = true, cursorline = false, }, }, From 05663e8f4f9ce9ba75c63ce5c979d956b1f98ff2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 01:56:17 +0000 Subject: [PATCH 31/40] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index da4e9d401..800e9ef80 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,9 +1,9 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, - "advanced-git-search.nvim": { "branch": "main", "commit": "198cc402af1790ab26830fdbf24a28c336a20ba6" }, - "aerial.nvim": { "branch": "master", "commit": "263beeb92961c15882b7853805f0ae2024f2e903" }, - "alpha-nvim": { "branch": "main", "commit": "355fbb81a59637a8963cf5847074f8c44dbef11f" }, + "LuaSnip": { "branch": "master", "commit": "7ad2eaeaca56d6ed63acacbfc114b99f1f67b982" }, + "advanced-git-search.nvim": { "branch": "main", "commit": "36ea105a7b7063a6879ac3b8afffe6fb326e27b1" }, + "aerial.nvim": { "branch": "master", "commit": "bb95e7fed7e3d3dc0714722ef6ef57ea1b708a6a" }, + "alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" }, "autoclose.nvim": { "branch": "main", "commit": "b2077aa2c83df7ebc19b2a20a3a0654b24ae9c8f" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, @@ -20,74 +20,74 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, - "crates.nvim": { "branch": "main", "commit": "cd670ecc862469557b12d12e7116d7afd2fd9c0f" }, - "csv.vim": { "branch": "master", "commit": "85e6a9f24b68f213b5423a0840f2dc9831eb3edb" }, + "crates.nvim": { "branch": "main", "commit": "891063a2dc8471501b9742406a514be62a20c138" }, + "csv.vim": { "branch": "master", "commit": "bddfcbadd788ab11eb3dbba4550a38a412fe3705" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "aa4c0ab1ade45ff9a3c5d4c06365c9b119f32d36" }, + "dropbar.nvim": { "branch": "master", "commit": "d26bf92161cd70e049dc138b44ffa0246dbf7178" }, "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "fzf": { "branch": "master", "commit": "d90a969c00401a11d86a238eef29048dea42398a" }, + "fzf": { "branch": "master", "commit": "8cb59e6fcac3dce8dfa44b678fdc94cf81efa11b" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, "glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" }, - "go.nvim": { "branch": "master", "commit": "e66c3240d26936428cd0f320dc5ffa1eb01538b8" }, + "go.nvim": { "branch": "master", "commit": "81d8d0d90d3f6bcb44181800da3ed43356a26c1b" }, "guihua.lua": { "branch": "master", "commit": "225db770e36aae6a1e9e3a65578095c8eb4038d3" }, "hop.nvim": { "branch": "master", "commit": "8f51ef02700bb3cdcce94e92eff16170a6343c4f" }, - "indent-blankline.nvim": { "branch": "master", "commit": "dddb5d21811c319eb6e51a993d8fb44b193aae3f" }, + "indent-blankline.nvim": { "branch": "master", "commit": "db926997af951da38e5004ec7b9fbdc480b48f5d" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "local-highlight.nvim": { "branch": "master", "commit": "ae3ada3a332128b1036c84c8587b9069891c63da" }, "lsp-format-modifications.nvim": { "branch": "main", "commit": "006d4cd88f4f09fdc4375fcb75dd5b7d981a723b" }, "lsp_signature.nvim": { "branch": "master", "commit": "e6d225e27770db81346c2f2aa6c30d0e249f9e7f" }, - "lspsaga.nvim": { "branch": "main", "commit": "a751b92b5d765a99fe3a42b9e51c046f81385e15" }, + "lspsaga.nvim": { "branch": "main", "commit": "4ce44df854f447cf0a8972e5387b3aeb5efc798b" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "f2acd4a21db1ca0a12559e7a9f7cdace3bdbfb09" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "482350b050bd413931c2cdd4857443c3da7d57cb" }, "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.align": { "branch": "main", "commit": "b54d88b16bfac62ca6b3d699566135639a3ca4fa" }, - "neoconf.nvim": { "branch": "main", "commit": "a6e09d22fda3ee5ce472e135a0df9b96d26706a7" }, + "neoconf.nvim": { "branch": "main", "commit": "59b5aa97496b074ebee43b97cfd9beb57ea1a312" }, "neodim": { "branch": "master", "commit": "d87470828690342d0139efc2fd56ea0b29e9ecb3" }, "neoscroll.nvim": { "branch": "master", "commit": "532dcc8cea4287c4cad6bb77532989a8217cfc7b" }, "none-ls.nvim": { "branch": "main", "commit": "cfa65d86e21eeb60544d5e823f6db43941322a53" }, "nvim-bqf": { "branch": "main", "commit": "1b24dc6050c34e8cd377b6b4cd6abe40509e0187" }, "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-dap": { "branch": "master", "commit": "2b428ff2632e73295e9decbcf1c40d8e26213305" }, + "nvim-dap": { "branch": "master", "commit": "281a2e4cd1e7a17cea7ecb1745d84a8ab1249925" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-highlight-colors": { "branch": "main", "commit": "a411550ef85cae467b889ba7d1a96bd78332d90e" }, - "nvim-lspconfig": { "branch": "master", "commit": "a67bc39aaa4f1e13212c5022a561120846eaef27" }, + "nvim-lspconfig": { "branch": "master", "commit": "b21c166bbf337734f2a39734a905c1c3e298205c" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "401c0498689dcaa54b2e7483d823e33cdc051e72" }, "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" }, "nvim-tree.lua": { "branch": "master", "commit": "ad0b95dee55955817af635fa121f6e2486b10583" }, "nvim-treehopper": { "branch": "master", "commit": "13559079e33665a310d9ccf0e43f4e9bb9f337e2" }, - "nvim-treesitter": { "branch": "master", "commit": "047ce49ccf9a2dce22e1cf3843bef3b5682a8144" }, + "nvim-treesitter": { "branch": "master", "commit": "0b8b78f9d08dc338a146eb4cd4bcbed8dd36a783" }, "nvim-treesitter-context": { "branch": "master", "commit": "0f3332788e0bd37716fbd25f39120dcfd557c90f" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "ced6375723b20616282f9f6a1018a63ae19b106a" }, - "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "41e3abf6bfd9a9a681eb1f788bdeba91c9004b2b" }, + "nvim-ts-autotag": { "branch": "main", "commit": "0cb76eea80e9c73b88880f0ca78fbd04c5bdcac7" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "375c2d86cee6674afd75b4f727ce3a80065552f7" }, "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "paint.nvim": { "branch": "main", "commit": "ef6f717a8669619ebbd098fb72f85115d64c6c92" }, - "persisted.nvim": { "branch": "main", "commit": "e2ae8b321ef0b02eb53aacd23f4bddc19923cff8" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "persisted.nvim": { "branch": "main", "commit": "5593b1b8f1e2d579fe4513b4686993da6fa388cb" }, + "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "0543d6ff37d3178e37131dfd5486e8a75d52f696" }, - "render-markdown.nvim": { "branch": "main", "commit": "72688baea4ef0ed605033bf654b54d801b6a5f01" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "9f3d10e66a79e8975926f8cb930856e4930d9da4" }, + "render-markdown.nvim": { "branch": "main", "commit": "277ae65ab14c23525ce3dbc9b812244c1976049e" }, "rustaceanvim": { "branch": "master", "commit": "7cba8e599deca98d4b44cac1bcbd720c62937d90" }, "search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" }, "smart-splits.nvim": { "branch": "master", "commit": "b518cfb5283a2da43fa9935e850ba9d77873453d" }, "smartyank.nvim": { "branch": "master", "commit": "d9e078fe08d6466e37ea45ac446a9f60e6866789" }, "sniprun": { "branch": "master", "commit": "a29d7b1c313b00980015ad79fa0ab512a0729940" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "39f70a87a271bbb76c86c73816597478dd6ad0a4" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "673585ee997b40d2600eb86c3693d552e4f5d79f" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "649b662a8f476fd2c0289570764459e95ebaa3f3" }, "telescope-undo.nvim": { "branch": "main", "commit": "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a" }, "telescope-zoxide": { "branch": "main", "commit": "6d23b6135eb01e0540ab46c838fd44351876917a" }, - "telescope.nvim": { "branch": "master", "commit": "159b8b79666e17c8de0378d5c9dc1bc8c7afabcf" }, + "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" }, "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, "toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, From 7bac911c111eaffc658ef9deacb05be5984ffcef Mon Sep 17 00:00:00 2001 From: TonyWu20 Date: Sat, 24 Aug 2024 16:06:31 +0800 Subject: [PATCH 32/40] Try to add wgsl_analyzer config --- lua/modules/configs/completion/servers/wgsl_analyzer.lua | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 lua/modules/configs/completion/servers/wgsl_analyzer.lua diff --git a/lua/modules/configs/completion/servers/wgsl_analyzer.lua b/lua/modules/configs/completion/servers/wgsl_analyzer.lua new file mode 100644 index 000000000..de468c86e --- /dev/null +++ b/lua/modules/configs/completion/servers/wgsl_analyzer.lua @@ -0,0 +1,3 @@ +return function(options) + require("lspconfig").wgsl_analyzer.setup({ settings = {} }) +end From a00b281d0010387792993de1243de491d9196b67 Mon Sep 17 00:00:00 2001 From: TonyWu20 Date: Sat, 24 Aug 2024 16:21:21 +0800 Subject: [PATCH 33/40] Merged from `ayamir/nvimdots` --- lua/modules/configs/completion/servers/wgsl_analyzer.lua | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 lua/modules/configs/completion/servers/wgsl_analyzer.lua diff --git a/lua/modules/configs/completion/servers/wgsl_analyzer.lua b/lua/modules/configs/completion/servers/wgsl_analyzer.lua deleted file mode 100644 index de468c86e..000000000 --- a/lua/modules/configs/completion/servers/wgsl_analyzer.lua +++ /dev/null @@ -1,3 +0,0 @@ -return function(options) - require("lspconfig").wgsl_analyzer.setup({ settings = {} }) -end From 13b25a57af23ce924ff5cadcca4d3ba48093749b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 1 Sep 2024 02:47:44 +0000 Subject: [PATCH 34/40] chore(lockfile): auto update flake.lock --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 82e9e0ba1..444568f60 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1725024810, + "narHash": "sha256-ODYRm8zHfLTH3soTFWE452ydPYz2iTvr9T8ftDMUQ3E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "af510d4a62d071ea13925ce41c95e3dec816c01d", "type": "github" }, "original": { @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1722462338, - "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -74,23 +74,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1719876945, - "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "lastModified": 1722555339, + "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1722415718, - "narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=", + "lastModified": 1725099143, + "narHash": "sha256-CHgumPZaC7z+WYx72WgaLt2XF0yUVzJS60rO4GZ7ytY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3392ad349a5227f4a3464dce87bcc5046692fce", + "rev": "5629520edecb69630a3f4d17d3d33fc96c13f6fe", "type": "github" }, "original": { From 99e136e5cf78d639ea664fccae774b3c2e81bdd3 Mon Sep 17 00:00:00 2001 From: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Date: Sat, 7 Sep 2024 11:36:47 +0800 Subject: [PATCH 35/40] feat(lsp): `tsserver` renamed to `ts_ls` (#1346) As per: https://github.com/neovim/nvim-lspconfig/commit/bdbc65aadc708ce528efb22bca5f82a7cca6b54d Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --- lua/core/settings.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/core/settings.lua b/lua/core/settings.lua index 125416008..5d47dd9a8 100644 --- a/lua/core/settings.lua +++ b/lua/core/settings.lua @@ -46,9 +46,9 @@ settings["formatter_block_list"] = { -- Servers in this list will skip setting formatting capabilities if rhs is true. ---@type table settings["server_formatting_block_list"] = { - lua_ls = true, - tsserver = true, clangd = true, + lua_ls = true, + ts_ls = true, } -- Set it to false if you want to turn off LSP Inlay Hints From 709bff0440ee5353066fec8dc202ce4532f5ee98 Mon Sep 17 00:00:00 2001 From: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Date: Sat, 7 Sep 2024 21:29:22 +0800 Subject: [PATCH 36/40] feat(clang_format): disable formatting for all Java files (#1347) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --- lua/modules/configs/completion/null-ls.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/modules/configs/completion/null-ls.lua b/lua/modules/configs/completion/null-ls.lua index 72982d6ea..d699e556b 100644 --- a/lua/modules/configs/completion/null-ls.lua +++ b/lua/modules/configs/completion/null-ls.lua @@ -17,7 +17,7 @@ return function() -- Don't specify any config here if you are using the default one. local sources = { btns.formatting.clang_format.with({ - filetypes = { "c", "cpp", "objc", "objcpp", "cs", "java", "cuda", "proto" }, + filetypes = { "c", "cpp", "objc", "objcpp", "cs", "cuda", "proto" }, extra_args = formatter_args("clang_format"), }), btns.formatting.prettier.with({ From 233a53d3e1ecfc069b0a2815a8aac3d26fe93a30 Mon Sep 17 00:00:00 2001 From: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Date: Sat, 7 Sep 2024 21:29:35 +0800 Subject: [PATCH 37/40] fix(pack): inconsistent docstring (#1348) Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --- lua/core/pack.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/core/pack.lua b/lua/core/pack.lua index 5f3f5a7ed..28e21d539 100644 --- a/lua/core/pack.lua +++ b/lua/core/pack.lua @@ -125,7 +125,7 @@ function Lazy:load_lazy() ---@type string[] paths = {}, -- add any custom paths here that you want to include in the rtp disabled_plugins = { - -- Set this to true in order to enable native EditorConfig support + -- Comment out `"editorconfig"` to enable native EditorConfig support -- WARN: Sleuth.vim already includes all the features provided by this plugin. -- Do NOT enable both at the same time, or you risk breaking the entire detection system. "editorconfig", From 1e2f49806f500fd2c8299d147c0a356f618e0525 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 8 Sep 2024 02:02:17 +0000 Subject: [PATCH 38/40] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 70 +++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 800e9ef80..32192dda3 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,8 +1,8 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "7ad2eaeaca56d6ed63acacbfc114b99f1f67b982" }, - "advanced-git-search.nvim": { "branch": "main", "commit": "36ea105a7b7063a6879ac3b8afffe6fb326e27b1" }, - "aerial.nvim": { "branch": "master", "commit": "bb95e7fed7e3d3dc0714722ef6ef57ea1b708a6a" }, + "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" }, + "advanced-git-search.nvim": { "branch": "main", "commit": "1c5a10f5c838cfad2c17d7464311d6fb416cb319" }, + "aerial.nvim": { "branch": "master", "commit": "b59e01e4380932b375ecff165b48a9400c4af929" }, "alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" }, "autoclose.nvim": { "branch": "main", "commit": "b2077aa2c83df7ebc19b2a20a3a0654b24ae9c8f" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, @@ -20,22 +20,22 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, - "crates.nvim": { "branch": "main", "commit": "891063a2dc8471501b9742406a514be62a20c138" }, + "crates.nvim": { "branch": "main", "commit": "b3b9ac6ed9618955b24bf9adede7530ef608495b" }, "csv.vim": { "branch": "master", "commit": "bddfcbadd788ab11eb3dbba4550a38a412fe3705" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "d26bf92161cd70e049dc138b44ffa0246dbf7178" }, + "dropbar.nvim": { "branch": "master", "commit": "6156e07759fd8c7cbf764414f583aa7e47470368" }, "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "fzf": { "branch": "master", "commit": "8cb59e6fcac3dce8dfa44b678fdc94cf81efa11b" }, + "fzf": { "branch": "master", "commit": "a0f28583e733c4daa776aed6ebc3a6e3b65dd8cb" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, - "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, + "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, "glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" }, - "go.nvim": { "branch": "master", "commit": "81d8d0d90d3f6bcb44181800da3ed43356a26c1b" }, + "go.nvim": { "branch": "master", "commit": "8389adb56ab124b75d858df5f87b741eaca7b8b3" }, "guihua.lua": { "branch": "master", "commit": "225db770e36aae6a1e9e3a65578095c8eb4038d3" }, "hop.nvim": { "branch": "master", "commit": "8f51ef02700bb3cdcce94e92eff16170a6343c4f" }, - "indent-blankline.nvim": { "branch": "master", "commit": "db926997af951da38e5004ec7b9fbdc480b48f5d" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, + "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, "local-highlight.nvim": { "branch": "master", "commit": "ae3ada3a332128b1036c84c8587b9069891c63da" }, "lsp-format-modifications.nvim": { "branch": "main", "commit": "006d4cd88f4f09fdc4375fcb75dd5b7d981a723b" }, "lsp_signature.nvim": { "branch": "master", "commit": "e6d225e27770db81346c2f2aa6c30d0e249f9e7f" }, @@ -46,56 +46,56 @@ "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.align": { "branch": "main", "commit": "b54d88b16bfac62ca6b3d699566135639a3ca4fa" }, - "neoconf.nvim": { "branch": "main", "commit": "59b5aa97496b074ebee43b97cfd9beb57ea1a312" }, + "mini.align": { "branch": "main", "commit": "26111a737494bc39576ad67b52bbc2638ca23553" }, + "neoconf.nvim": { "branch": "main", "commit": "8ee287dccee562857b0abe9fe3acd6ad147f8a70" }, "neodim": { "branch": "master", "commit": "d87470828690342d0139efc2fd56ea0b29e9ecb3" }, - "neoscroll.nvim": { "branch": "master", "commit": "532dcc8cea4287c4cad6bb77532989a8217cfc7b" }, - "none-ls.nvim": { "branch": "main", "commit": "cfa65d86e21eeb60544d5e823f6db43941322a53" }, + "neoscroll.nvim": { "branch": "master", "commit": "4e0428a41c6ec191df543fc95349f6e1c598e53f" }, + "none-ls.nvim": { "branch": "main", "commit": "9b98991e15dce8fc502993e23caac2528b8b667f" }, "nvim-bqf": { "branch": "main", "commit": "1b24dc6050c34e8cd377b6b4cd6abe40509e0187" }, "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-dap": { "branch": "master", "commit": "281a2e4cd1e7a17cea7ecb1745d84a8ab1249925" }, - "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, + "nvim-dap": { "branch": "master", "commit": "20a4859ebde1c9bc8e96f8cc11a20667e7fdd516" }, + "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" }, "nvim-highlight-colors": { "branch": "main", "commit": "a411550ef85cae467b889ba7d1a96bd78332d90e" }, - "nvim-lspconfig": { "branch": "master", "commit": "b21c166bbf337734f2a39734a905c1c3e298205c" }, + "nvim-lspconfig": { "branch": "master", "commit": "bdbc65aadc708ce528efb22bca5f82a7cca6b54d" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "401c0498689dcaa54b2e7483d823e33cdc051e72" }, "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" }, - "nvim-tree.lua": { "branch": "master", "commit": "ad0b95dee55955817af635fa121f6e2486b10583" }, + "nvim-tree.lua": { "branch": "master", "commit": "ea55ef12036897fdc4476b115a395d2a34965c82" }, "nvim-treehopper": { "branch": "master", "commit": "13559079e33665a310d9ccf0e43f4e9bb9f337e2" }, - "nvim-treesitter": { "branch": "master", "commit": "0b8b78f9d08dc338a146eb4cd4bcbed8dd36a783" }, - "nvim-treesitter-context": { "branch": "master", "commit": "0f3332788e0bd37716fbd25f39120dcfd557c90f" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "41e3abf6bfd9a9a681eb1f788bdeba91c9004b2b" }, - "nvim-ts-autotag": { "branch": "main", "commit": "0cb76eea80e9c73b88880f0ca78fbd04c5bdcac7" }, + "nvim-treesitter": { "branch": "master", "commit": "58030e6d6f1d6609b43dcb765d54539dcc6a1a76" }, + "nvim-treesitter-context": { "branch": "master", "commit": "e6cc783b74606d97ca9eff6494e3f5c2ca603a50" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "fe3deb7f67ce0cc4ebfe2ea6c1c7ae1c7a939d73" }, + "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "375c2d86cee6674afd75b4f727ce3a80065552f7" }, - "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, + "nvim-web-devicons": { "branch": "master", "commit": "9793801f974bba70e4ac5d7eae6c4f5659993d8e" }, "paint.nvim": { "branch": "main", "commit": "ef6f717a8669619ebbd098fb72f85115d64c6c92" }, - "persisted.nvim": { "branch": "main", "commit": "5593b1b8f1e2d579fe4513b4686993da6fa388cb" }, + "persisted.nvim": { "branch": "main", "commit": "1673a295db295999aaf8de7c7a3afd45e0b83a46" }, "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "9f3d10e66a79e8975926f8cb930856e4930d9da4" }, - "render-markdown.nvim": { "branch": "main", "commit": "277ae65ab14c23525ce3dbc9b812244c1976049e" }, - "rustaceanvim": { "branch": "master", "commit": "7cba8e599deca98d4b44cac1bcbd720c62937d90" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "5f73b24aeb94f5274c218955573153c69ce4d1ee" }, + "render-markdown.nvim": { "branch": "main", "commit": "2f9d4f0be8784ed4fef5960eb7b80bf60c5fdf56" }, + "rustaceanvim": { "branch": "master", "commit": "3fd3e5c187ad7155d8bf1a689fa5b651407ab22e" }, "search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" }, - "smart-splits.nvim": { "branch": "master", "commit": "b518cfb5283a2da43fa9935e850ba9d77873453d" }, + "smart-splits.nvim": { "branch": "master", "commit": "99216f4cdbd4a690e10fabafd7f6defcb25e97b2" }, "smartyank.nvim": { "branch": "master", "commit": "d9e078fe08d6466e37ea45ac446a9f60e6866789" }, "sniprun": { "branch": "master", "commit": "a29d7b1c313b00980015ad79fa0ab512a0729940" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "673585ee997b40d2600eb86c3693d552e4f5d79f" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "dbca328c590a1aea6efb0dcfd6f594794a348b05" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "649b662a8f476fd2c0289570764459e95ebaa3f3" }, "telescope-undo.nvim": { "branch": "main", "commit": "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a" }, - "telescope-zoxide": { "branch": "main", "commit": "6d23b6135eb01e0540ab46c838fd44351876917a" }, + "telescope-zoxide": { "branch": "main", "commit": "54bfe630bad08dc9891ec78c7cf8db38dd725c97" }, "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" }, - "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, + "todo-comments.nvim": { "branch": "main", "commit": "319c01b99b7a8c9ac2066bf0efd4d6ec68fef444" }, "toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" }, - "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, - "vim-matchup": { "branch": "master", "commit": "1535a769d5dca851fe7d41b0be95f7c7203a4bef" }, + "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }, + "vim-matchup": { "branch": "master", "commit": "f89858a5ab87feb752c860d396022ae7b13070c2" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, - "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, - "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }, + "vim-sleuth": { "branch": "master", "commit": "cd9d382e33bb817abe7f10cdc3a606bf1d491d75" }, + "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" }, "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" } } From 28c4cdecf5c46ecd506703ffa80efc21d3b48c23 Mon Sep 17 00:00:00 2001 From: jint_lzxy_ <50296129+Jint-lzxy@users.noreply.github.com> Date: Tue, 10 Sep 2024 21:34:46 +0800 Subject: [PATCH 39/40] fix(core): correct GUI detection post v0.10.2 (#1349) This commit resolves the change in behavior for the `has("gui_running")` check introduced after v0.10.2, which now only verifies if a real GUI (not a TUI) is running. Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com> --- lua/modules/plugins/editor.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/modules/plugins/editor.lua b/lua/modules/plugins/editor.lua index f396fc0ad..ce5767d65 100644 --- a/lua/modules/plugins/editor.lua +++ b/lua/modules/plugins/editor.lua @@ -100,7 +100,7 @@ editor["mrjones2014/smart-splits.nvim"] = { editor["nvim-treesitter/nvim-treesitter"] = { lazy = true, build = function() - if vim.fn.has("gui_running") == 1 then + if #vim.api.nvim_list_uis() > 0 then vim.api.nvim_command([[TSUpdate]]) end end, From 6c1933580ed297cdcfc2094abb815cbb1473e996 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 01:58:14 +0000 Subject: [PATCH 40/40] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 32192dda3..89c956510 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,7 +2,7 @@ "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" }, "advanced-git-search.nvim": { "branch": "main", "commit": "1c5a10f5c838cfad2c17d7464311d6fb416cb319" }, - "aerial.nvim": { "branch": "master", "commit": "b59e01e4380932b375ecff165b48a9400c4af929" }, + "aerial.nvim": { "branch": "master", "commit": "fa75fd0286788c6c5a65ec46aafbfaf7b7826b74" }, "alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" }, "autoclose.nvim": { "branch": "main", "commit": "b2077aa2c83df7ebc19b2a20a3a0654b24ae9c8f" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, @@ -19,7 +19,7 @@ "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, - "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, + "copilot.lua": { "branch": "master", "commit": "f9e2c140643bd4519a4517a78a51f6ae8b8b2a95" }, "crates.nvim": { "branch": "main", "commit": "b3b9ac6ed9618955b24bf9adede7530ef608495b" }, "csv.vim": { "branch": "master", "commit": "bddfcbadd788ab11eb3dbba4550a38a412fe3705" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, @@ -27,11 +27,11 @@ "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "fzf": { "branch": "master", "commit": "a0f28583e733c4daa776aed6ebc3a6e3b65dd8cb" }, + "fzf": { "branch": "master", "commit": "2286edb3296a5d50f048bf950163ef4c3a0651fa" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, "glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" }, - "go.nvim": { "branch": "master", "commit": "8389adb56ab124b75d858df5f87b741eaca7b8b3" }, + "go.nvim": { "branch": "master", "commit": "b427985274d218066f76e4e5345ce6101f72cf06" }, "guihua.lua": { "branch": "master", "commit": "225db770e36aae6a1e9e3a65578095c8eb4038d3" }, "hop.nvim": { "branch": "master", "commit": "8f51ef02700bb3cdcce94e92eff16170a6343c4f" }, "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, @@ -39,15 +39,15 @@ "local-highlight.nvim": { "branch": "master", "commit": "ae3ada3a332128b1036c84c8587b9069891c63da" }, "lsp-format-modifications.nvim": { "branch": "main", "commit": "006d4cd88f4f09fdc4375fcb75dd5b7d981a723b" }, "lsp_signature.nvim": { "branch": "master", "commit": "e6d225e27770db81346c2f2aa6c30d0e249f9e7f" }, - "lspsaga.nvim": { "branch": "main", "commit": "4ce44df854f447cf0a8972e5387b3aeb5efc798b" }, + "lspsaga.nvim": { "branch": "main", "commit": "e64351d0e6335eadf089aa2b9f17221e54ca10a4" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "482350b050bd413931c2cdd4857443c3da7d57cb" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.align": { "branch": "main", "commit": "26111a737494bc39576ad67b52bbc2638ca23553" }, - "neoconf.nvim": { "branch": "main", "commit": "8ee287dccee562857b0abe9fe3acd6ad147f8a70" }, + "neoconf.nvim": { "branch": "main", "commit": "206f6c0d96ff7ca1698e17cfe84d5b531050282e" }, "neodim": { "branch": "master", "commit": "d87470828690342d0139efc2fd56ea0b29e9ecb3" }, "neoscroll.nvim": { "branch": "master", "commit": "4e0428a41c6ec191df543fc95349f6e1c598e53f" }, "none-ls.nvim": { "branch": "main", "commit": "9b98991e15dce8fc502993e23caac2528b8b667f" }, @@ -57,16 +57,16 @@ "nvim-dap": { "branch": "master", "commit": "20a4859ebde1c9bc8e96f8cc11a20667e7fdd516" }, "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" }, "nvim-highlight-colors": { "branch": "main", "commit": "a411550ef85cae467b889ba7d1a96bd78332d90e" }, - "nvim-lspconfig": { "branch": "master", "commit": "bdbc65aadc708ce528efb22bca5f82a7cca6b54d" }, + "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "401c0498689dcaa54b2e7483d823e33cdc051e72" }, "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" }, - "nvim-tree.lua": { "branch": "master", "commit": "ea55ef12036897fdc4476b115a395d2a34965c82" }, + "nvim-tree.lua": { "branch": "master", "commit": "d41b4ca013ed89e41b9c0ecbdae5f1633e42f7fa" }, "nvim-treehopper": { "branch": "master", "commit": "13559079e33665a310d9ccf0e43f4e9bb9f337e2" }, - "nvim-treesitter": { "branch": "master", "commit": "58030e6d6f1d6609b43dcb765d54539dcc6a1a76" }, + "nvim-treesitter": { "branch": "master", "commit": "6a3c6a42a6e24414bdf337b05a84a0ea013dd155" }, "nvim-treesitter-context": { "branch": "master", "commit": "e6cc783b74606d97ca9eff6494e3f5c2ca603a50" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "fe3deb7f67ce0cc4ebfe2ea6c1c7ae1c7a939d73" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "bf8d2ad35d1d1a687eae6c065c3d524f7ab61b23" }, "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "375c2d86cee6674afd75b4f727ce3a80065552f7" }, "nvim-web-devicons": { "branch": "master", "commit": "9793801f974bba70e4ac5d7eae6c4f5659993d8e" }, @@ -75,25 +75,25 @@ "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "5f73b24aeb94f5274c218955573153c69ce4d1ee" }, - "render-markdown.nvim": { "branch": "main", "commit": "2f9d4f0be8784ed4fef5960eb7b80bf60c5fdf56" }, - "rustaceanvim": { "branch": "master", "commit": "3fd3e5c187ad7155d8bf1a689fa5b651407ab22e" }, + "render-markdown.nvim": { "branch": "main", "commit": "a5e2d0b1215814c3d033be1fd8eccf59ce366399" }, + "rustaceanvim": { "branch": "master", "commit": "5d0cec60d3ff20587c77e0851c919f89068da355" }, "search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" }, - "smart-splits.nvim": { "branch": "master", "commit": "99216f4cdbd4a690e10fabafd7f6defcb25e97b2" }, + "smart-splits.nvim": { "branch": "master", "commit": "f002d5dd6478a2171de08d2ca32db00d238d6976" }, "smartyank.nvim": { "branch": "master", "commit": "d9e078fe08d6466e37ea45ac446a9f60e6866789" }, "sniprun": { "branch": "master", "commit": "a29d7b1c313b00980015ad79fa0ab512a0729940" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "dbca328c590a1aea6efb0dcfd6f594794a348b05" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "f67baca08423a6fd00167801a54db38e0b878063" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "649b662a8f476fd2c0289570764459e95ebaa3f3" }, "telescope-undo.nvim": { "branch": "main", "commit": "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a" }, "telescope-zoxide": { "branch": "main", "commit": "54bfe630bad08dc9891ec78c7cf8db38dd725c97" }, - "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" }, + "telescope.nvim": { "branch": "master", "commit": "fe999db6e0c39c8984519ead75660e0e2d3245d3" }, "todo-comments.nvim": { "branch": "main", "commit": "319c01b99b7a8c9ac2066bf0efd4d6ec68fef444" }, "toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" }, "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }, - "vim-matchup": { "branch": "master", "commit": "f89858a5ab87feb752c860d396022ae7b13070c2" }, + "vim-matchup": { "branch": "master", "commit": "8522c9b3ba6c92ac64a609fa792134ce6ba9c4bc" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, "vim-sleuth": { "branch": "master", "commit": "cd9d382e33bb817abe7f10cdc3a606bf1d491d75" }, "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" },