From 60ece3ad6c36ad82196d58fc0e5caaa3bb002561 Mon Sep 17 00:00:00 2001 From: Cyberczy <109653523+Cyberczy@users.noreply.github.com> Date: Tue, 30 Jan 2024 15:33:54 +0800 Subject: [PATCH 01/15] chore(ci): bump deps versions (#1159) see https://github.com/andstor/file-existence-action/pull/144 Signed-off-by: Cyberczy <109653523+Cyberczy@users.noreply.github.com> --- .github/workflows/update_lockfile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_lockfile.yml b/.github/workflows/update_lockfile.yml index 7e1992a0c..200e01994 100644 --- a/.github/workflows/update_lockfile.yml +++ b/.github/workflows/update_lockfile.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 # Required to count the commits - - uses: andstor/file-existence-action@v2 + - uses: andstor/file-existence-action@v3 id: check_lockfile with: files: "lazy-lock.json" From 1c4373f18a23fb6b68db68ef3cd6c9814270bd27 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 01:47:45 +0000 Subject: [PATCH 02/15] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 54 +++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index d16c32f11..693121ea6 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,12 +3,12 @@ "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, "accelerated-jk.nvim": { "branch": "main", "commit": "8fb5dad4ccc1811766cebf16b544038aeeb7806f" }, "aerial.nvim": { "branch": "master", "commit": "e9661d4f739508377f42528fd08a85c4c8feba6e" }, - "alpha-nvim": { "branch": "main", "commit": "4b36c1ca9ea475bdc006896657cf1ccc486aeffa" }, + "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, "autoclose.nvim": { "branch": "main", "commit": "37e11589aac55b0e8810dc5865f898f9cb36fef6" }, "better-escape.nvim": { "branch": "master", "commit": "7e86edafb8c7e73699e0320f225464a298b96d12" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, - "bufferline.nvim": { "branch": "main", "commit": "167c0b8c5340972a249068c1a5b3edf57806d6d3" }, - "catppuccin": { "branch": "refactor/syntax-highlighting", "commit": "30c67cd06f97a6327fa8686a43f68bf611a4c9b2" }, + "bufferline.nvim": { "branch": "main", "commit": "b15c6daf5a64426c69732b31a951f4e438cb6590" }, + "catppuccin": { "branch": "refactor/syntax-highlighting", "commit": "b6f54c74f8aea460b395c4b0ede9392dbab60424" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-latex-symbols": { "branch": "main", "commit": "165fb66afdbd016eaa1570e41672c4c557b57124" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, @@ -21,72 +21,72 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, - "crates.nvim": { "branch": "main", "commit": "e4e5d141812c9e84992e329fb4526ca2656c03f2" }, + "crates.nvim": { "branch": "main", "commit": "f2a169840e97a8ed2048abb507d2742c3895c85b" }, "csv.vim": { "branch": "master", "commit": "962f88787ec6873eba1c7dbbd81d2723f1ee3c4b" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "fidget.nvim": { "branch": "main", "commit": "3a93300c076109d86c7ce35ec67a8034ae6ba9db" }, + "fidget.nvim": { "branch": "main", "commit": "1d1042d418ee8cb70d68f1e38db639844331c093" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, - "friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" }, - "fzf": { "branch": "master", "commit": "62a916bc24ce519a414c617737286ae034c1b8e2" }, + "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, + "fzf": { "branch": "master", "commit": "dd886d22f0b95700ece24954ac00f6e2628226f1" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, - "gitsigns.nvim": { "branch": "main", "commit": "c5ff7628e19a47ec14d3657294cc074ecae27b99" }, + "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, "hop.nvim": { "branch": "master", "commit": "6d853addd6e11df8338b26e869a29b36f2c3e893" }, "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, - "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, + "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lsp-format-modifications.nvim": { "branch": "main", "commit": "006d4cd88f4f09fdc4375fcb75dd5b7d981a723b" }, "lsp_signature.nvim": { "branch": "master", "commit": "f09644c0390ba49cfe60eafc1f19849dc4c2e814" }, "lspsaga.nvim": { "branch": "main", "commit": "2198c07124bef27ef81335be511c8abfd75db933" }, - "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, + "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "3ba1b92b771f33256b4969d696b82c8ae7075364" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" }, "mason-null-ls.nvim": { "branch": "main", "commit": "558de4372d23bd432cc3594666c4d812cd071bbf" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" }, - "mason.nvim": { "branch": "main", "commit": "9c9416817c9f4e6f333c749327a1ed5355cfab61" }, + "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "neodim": { "branch": "master", "commit": "9477da03b93f1984a81fee3b92e6ac7c6ada6aa4" }, "neoscroll.nvim": { "branch": "master", "commit": "be4ebf855a52f71ca4338694a5696675d807eff9" }, - "none-ls.nvim": { "branch": "main", "commit": "0258d435e4e3354f81bd3d124676b9991c0012fd" }, + "none-ls.nvim": { "branch": "main", "commit": "912f81829e9ab4ee3d54c3ea5a304c264f0003bc" }, "nvim-bqf": { "branch": "main", "commit": "bdc2a4e5bb670b3c0e33ada9c0eec636d93a0748" }, "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, - "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, + "nvim-lspconfig": { "branch": "master", "commit": "d9e87768466f91c071375517b170da5fad7b41f5" }, "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, "nvim-scrollview": { "branch": "main", "commit": "2bc1d94174a977e7147e845156d3c4c12ac06b67" }, - "nvim-tree.lua": { "branch": "master", "commit": "7bdb220d0fe604a77361e92cdbc7af1b8a412126" }, + "nvim-tree.lua": { "branch": "master", "commit": "f39f7b6fcd3865ac2146de4cb4045286308f2935" }, "nvim-treehopper": { "branch": "master", "commit": "5a28bff46c05d28bdb4bcaef67e046eb915a9390" }, - "nvim-treesitter": { "branch": "master", "commit": "cd4e0909948eb33d3959e133c16f837e4db122c6" }, - "nvim-treesitter-context": { "branch": "master", "commit": "85cf977181fb8e816e47ac05df7f756e9cb72caf" }, + "nvim-treesitter": { "branch": "master", "commit": "ba6454783493ac3a5dd209c25e491640b07bd8de" }, + "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, - "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" }, - "nvim-web-devicons": { "branch": "master", "commit": "140edfcf25093e8b321d13e154cbce89ee868ca0" }, + "nvim-web-devicons": { "branch": "master", "commit": "aaec87dbdaa776bfa0a13c8694bec9bcb7454719" }, "paint.nvim": { "branch": "main", "commit": "6ce64212804f425073c61ab0d9c2b034f0435260" }, "persisted.nvim": { "branch": "main", "commit": "edd8aa41cd87f9da1b6ef0c584068dea192f65b7" }, - "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, + "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "35530b4ad48f01bdaa852da34e4de9930fb54c89" }, - "rustaceanvim": { "branch": "master", "commit": "94dbc3479630b79f1fc05bad91dfeede50b9036c" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "6c7d918621e93a045671e8f85c6dcc01783b82d0" }, + "rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" }, "smartyank.nvim": { "branch": "master", "commit": "b048fec8c6b7d122adab6f78606057d59975ece7" }, "sniprun": { "branch": "master", "commit": "0079f9c4675a6825f84e108bbff866f67dd8762f" }, "specs.nvim": { "branch": "main", "commit": "2743e412bbe21c9d73954c403d01e8de7377890d" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "tabout.nvim": { "branch": "master", "commit": "0d275c8d25f32457e67b5c66d6ae43f26a61bce5" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "1189184484e3153533af66b219f9ed59263a403c" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "a61ede8740643f09e1a7706fbb49b152e8f25d42" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "731a046da7dd3adff9de871a42f9b7fb85f60f47" }, "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, - "telescope.nvim": { "branch": "master", "commit": "20efb3864903fb854a85faf57513ffd80582275b" }, + "telescope.nvim": { "branch": "master", "commit": "e54fbf4ab2b64640b639b75c006c23b4bc51c86f" }, "toggleterm.nvim": { "branch": "main", "commit": "b49df5cdce67a8964d1b027dae94bde212092b51" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" }, "vim-easy-align": { "branch": "master", "commit": "12dd6316974f71ce333e360c0260b4e1f81169c3" }, - "vim-fugitive": { "branch": "master", "commit": "854a8df0d06b8d3fcb30fa7f2b08c62b553eee3b" }, - "vim-go": { "branch": "master", "commit": "ca6c532753e70e4fb093e755773cc6f250a3b4b3" }, - "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" }, + "vim-fugitive": { "branch": "master", "commit": "f116dcc8e21021e6fbfb6b0a9f8f7b9566d933f4" }, + "vim-go": { "branch": "master", "commit": "18171a41a18dfc59fb0475a00d5c1e9ddb3d22d4" }, + "vim-illuminate": { "branch": "master", "commit": "97c1265ff0b67064b6cfdc15bafc50202a537ae2" }, "vim-matchup": { "branch": "master", "commit": "e2cca1747ab175b8d839a5d28679427564643a57" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" } From 559f90fcdf85bea235e74db1cb6af22f72fa937b Mon Sep 17 00:00:00 2001 From: Cyberczy <109653523+Cyberczy@users.noreply.github.com> Date: Sat, 3 Feb 2024 21:36:05 +0800 Subject: [PATCH 03/15] fix(scrollview): omit the `scrollview_` prefix (#1162) https://github.com/dstein64/nvim-scrollview?tab=readme-ov-file#lua-example A Lua `setup()` function is provided for convenience, to set globally scoped options (the 'scrollview_' prefix is omitted). Signed-off-by: Cyberczy <109653523+Cyberczy@users.noreply.github.com> --- lua/modules/configs/ui/scrollview.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/modules/configs/ui/scrollview.lua b/lua/modules/configs/ui/scrollview.lua index 40678d089..d3a821d53 100644 --- a/lua/modules/configs/ui/scrollview.lua +++ b/lua/modules/configs/ui/scrollview.lua @@ -2,7 +2,7 @@ return function() local icons = { diagnostics = require("modules.utils.icons").get("diagnostics", true) } require("modules.utils").load_plugin("scrollview", { - scrollview_mode = "virtual", + mode = "virtual", excluded_filetypes = { "NvimTree", "terminal", "nofile", "aerial" }, winblend = 0, signs_on_startup = { "diagnostics", "folds", "marks", "search", "spell" }, From f6584ad6e148bebe47a8e66b30dbbee411d76fbc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 4 Feb 2024 01:48:43 +0000 Subject: [PATCH 04/15] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 693121ea6..2da23f8b6 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,7 +2,7 @@ "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, "accelerated-jk.nvim": { "branch": "main", "commit": "8fb5dad4ccc1811766cebf16b544038aeeb7806f" }, - "aerial.nvim": { "branch": "master", "commit": "e9661d4f739508377f42528fd08a85c4c8feba6e" }, + "aerial.nvim": { "branch": "master", "commit": "d21482d3be3228dde594aba31106db428292742c" }, "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, "autoclose.nvim": { "branch": "main", "commit": "37e11589aac55b0e8810dc5865f898f9cb36fef6" }, "better-escape.nvim": { "branch": "master", "commit": "7e86edafb8c7e73699e0320f225464a298b96d12" }, @@ -20,14 +20,14 @@ "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, - "crates.nvim": { "branch": "main", "commit": "f2a169840e97a8ed2048abb507d2742c3895c85b" }, + "copilot.lua": { "branch": "master", "commit": "71382c2efec76647287d46a4fbe0ec8c9809e2ee" }, + "crates.nvim": { "branch": "main", "commit": "2bd990871f0aef159933bd5fe6da421690a832b9" }, "csv.vim": { "branch": "master", "commit": "962f88787ec6873eba1c7dbbd81d2723f1ee3c4b" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "fidget.nvim": { "branch": "main", "commit": "1d1042d418ee8cb70d68f1e38db639844331c093" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, - "fzf": { "branch": "master", "commit": "dd886d22f0b95700ece24954ac00f6e2628226f1" }, + "fzf": { "branch": "master", "commit": "1a43259989fc84c0be85829f71ae21815e8d4620" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, @@ -39,35 +39,35 @@ "lspsaga.nvim": { "branch": "main", "commit": "2198c07124bef27ef81335be511c8abfd75db933" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" }, - "mason-null-ls.nvim": { "branch": "main", "commit": "558de4372d23bd432cc3594666c4d812cd071bbf" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "2b3d247fce06f53934174f5dfe0362c42d65c00c" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "a1e19bf9baa86e8a43dd86cf9689ca9f71b4d1da" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "neodim": { "branch": "master", "commit": "9477da03b93f1984a81fee3b92e6ac7c6ada6aa4" }, "neoscroll.nvim": { "branch": "master", "commit": "be4ebf855a52f71ca4338694a5696675d807eff9" }, - "none-ls.nvim": { "branch": "main", "commit": "912f81829e9ab4ee3d54c3ea5a304c264f0003bc" }, + "none-ls.nvim": { "branch": "main", "commit": "c10b7be7751aee820a02f2d1fafe76bc316fe223" }, "nvim-bqf": { "branch": "main", "commit": "bdc2a4e5bb670b3c0e33ada9c0eec636d93a0748" }, "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" }, - "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, + "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, - "nvim-lspconfig": { "branch": "master", "commit": "d9e87768466f91c071375517b170da5fad7b41f5" }, + "nvim-lspconfig": { "branch": "master", "commit": "9a6279953c82d01b58825a46ede032ab246a5983" }, "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, "nvim-scrollview": { "branch": "main", "commit": "2bc1d94174a977e7147e845156d3c4c12ac06b67" }, "nvim-tree.lua": { "branch": "master", "commit": "f39f7b6fcd3865ac2146de4cb4045286308f2935" }, "nvim-treehopper": { "branch": "master", "commit": "5a28bff46c05d28bdb4bcaef67e046eb915a9390" }, - "nvim-treesitter": { "branch": "master", "commit": "ba6454783493ac3a5dd209c25e491640b07bd8de" }, + "nvim-treesitter": { "branch": "master", "commit": "4fbf150a1621d52f17b099506e1a32f107079210" }, "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "8edd5a6d96936bdff23333d3bc177481388839e5" }, "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, "nvim-web-devicons": { "branch": "master", "commit": "aaec87dbdaa776bfa0a13c8694bec9bcb7454719" }, "paint.nvim": { "branch": "main", "commit": "6ce64212804f425073c61ab0d9c2b034f0435260" }, "persisted.nvim": { "branch": "main", "commit": "edd8aa41cd87f9da1b6ef0c584068dea192f65b7" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "6c7d918621e93a045671e8f85c6dcc01783b82d0" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "ca8d5ee2b4ee1eec491040a7601d366ddc8a2e02" }, "rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" }, "smartyank.nvim": { "branch": "master", "commit": "b048fec8c6b7d122adab6f78606057d59975ece7" }, "sniprun": { "branch": "master", "commit": "0079f9c4675a6825f84e108bbff866f67dd8762f" }, @@ -79,15 +79,15 @@ "telescope-live-grep-args.nvim": { "branch": "master", "commit": "731a046da7dd3adff9de871a42f9b7fb85f60f47" }, "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, - "telescope.nvim": { "branch": "master", "commit": "e54fbf4ab2b64640b639b75c006c23b4bc51c86f" }, + "telescope.nvim": { "branch": "master", "commit": "7b5c5f56a21e82fdcfe5b250278b8dfc4b1cbab4" }, "toggleterm.nvim": { "branch": "main", "commit": "b49df5cdce67a8964d1b027dae94bde212092b51" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" }, "vim-easy-align": { "branch": "master", "commit": "12dd6316974f71ce333e360c0260b4e1f81169c3" }, - "vim-fugitive": { "branch": "master", "commit": "f116dcc8e21021e6fbfb6b0a9f8f7b9566d933f4" }, + "vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" }, "vim-go": { "branch": "master", "commit": "18171a41a18dfc59fb0475a00d5c1e9ddb3d22d4" }, "vim-illuminate": { "branch": "master", "commit": "97c1265ff0b67064b6cfdc15bafc50202a537ae2" }, - "vim-matchup": { "branch": "master", "commit": "e2cca1747ab175b8d839a5d28679427564643a57" }, + "vim-matchup": { "branch": "master", "commit": "7f81ae12542b2a35819f0324895df9bd8626c8ba" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" } } \ No newline at end of file From 4ea1fe997bad58c93d5aa1187b16cd05ee345f3e Mon Sep 17 00:00:00 2001 From: Mohu Date: Fri, 9 Feb 2024 16:32:07 +0800 Subject: [PATCH 05/15] feat: make diffview configurable. (#1170) Signed-off-by: ayamir --- lua/modules/configs/editor/diffview.lua | 574 ++++++++++++++++++++++++ lua/modules/plugins/editor.lua | 1 + 2 files changed, 575 insertions(+) create mode 100644 lua/modules/configs/editor/diffview.lua diff --git a/lua/modules/configs/editor/diffview.lua b/lua/modules/configs/editor/diffview.lua new file mode 100644 index 000000000..9e1e07680 --- /dev/null +++ b/lua/modules/configs/editor/diffview.lua @@ -0,0 +1,574 @@ +return function() + local actions = require("diffview.actions") + + require("modules.utils").load_plugin("diffview", { + diff_binaries = false, -- Show diffs for binaries + enhanced_diff_hl = false, -- See ':h diffview-config-enhanced_diff_hl' + git_cmd = { "git" }, -- The git executable followed by default args. + hg_cmd = { "hg" }, -- The hg executable followed by default args. + use_icons = true, -- Requires nvim-web-devicons + show_help_hints = true, -- Show hints for how to open the help panel + watch_index = true, -- Update views and index buffers when the git index changes. + icons = { -- Only applies when use_icons is true. + folder_closed = "", + folder_open = "", + }, + signs = { + fold_closed = "", + fold_open = "", + done = "✓", + }, + view = { + -- Configure the layout and behavior of different types of views. + -- Available layouts: + -- 'diff1_plain' + -- |'diff2_horizontal' + -- |'diff2_vertical' + -- |'diff3_horizontal' + -- |'diff3_vertical' + -- |'diff3_mixed' + -- |'diff4_mixed' + -- For more info, see ':h diffview-config-view.x.layout'. + default = { + -- Config for changed files, and staged files in diff views. + layout = "diff2_horizontal", + winbar_info = false, -- See ':h diffview-config-view.x.winbar_info' + }, + merge_tool = { + -- Config for conflicted files in diff views during a merge or rebase. + layout = "diff3_horizontal", + disable_diagnostics = true, -- Temporarily disable diagnostics for conflict buffers while in the view. + winbar_info = true, -- See ':h diffview-config-view.x.winbar_info' + }, + file_history = { + -- Config for changed files in file history views. + layout = "diff2_horizontal", + winbar_info = false, -- See ':h diffview-config-view.x.winbar_info' + }, + }, + file_panel = { + listing_style = "tree", -- One of 'list' or 'tree' + tree_options = { -- Only applies when listing_style is 'tree' + flatten_dirs = true, -- Flatten dirs that only contain one single dir + folder_statuses = "only_folded", -- One of 'never', 'only_folded' or 'always'. + }, + win_config = { -- See ':h diffview-config-win_config' + position = "left", + width = 35, + win_opts = {}, + }, + }, + file_history_panel = { + log_options = { -- See ':h diffview-config-log_options' + git = { + single_file = { + diff_merges = "combined", + }, + multi_file = { + diff_merges = "first-parent", + }, + }, + hg = { + single_file = {}, + multi_file = {}, + }, + }, + win_config = { -- See ':h diffview-config-win_config' + position = "bottom", + height = 16, + win_opts = {}, + }, + }, + commit_log_panel = { + win_config = { -- See ':h diffview-config-win_config' + win_opts = {}, + }, + }, + default_args = { -- Default args prepended to the arg-list for the listed commands + DiffviewOpen = {}, + DiffviewFileHistory = {}, + }, + hooks = {}, -- See ':h diffview-config-hooks' + keymaps = { + disable_defaults = false, -- Disable the default keymaps + view = { + -- The `view` bindings are active in the diff buffers, only when the current + -- tabpage is a Diffview. + { + "n", + "", + actions.select_next_entry, + { desc = "diffview: Open the diff for the next file" }, + }, + { + "n", + "", + actions.select_prev_entry, + { desc = "diffview: Open the diff for the previous file" }, + }, + { + "n", + "gf", + actions.goto_file_edit, + { desc = "diffview: Open the file in the previous tabpage" }, + }, + { + "n", + "", + actions.goto_file_split, + { desc = "diffview: Open the file in a new split" }, + }, + { + "n", + "gf", + actions.goto_file_tab, + { desc = "diffview: Open the file in a new tabpage" }, + }, + { + "n", + "e", + actions.focus_files, + { desc = "diffview: Bring focus to the file panel" }, + }, + { + "n", + "b", + actions.toggle_files, + { desc = "diffview: Toggle the file panel." }, + }, + { + "n", + "g", + actions.cycle_layout, + { desc = "diffview: Cycle through available layouts." }, + }, + { + "n", + "[x", + actions.prev_conflict, + { desc = "diffview: In the merge-tool: jump to the previous conflict" }, + }, + { + "n", + "]x", + actions.next_conflict, + { desc = "diffview: In the merge-tool: jump to the next conflict" }, + }, + { + "n", + "co", + actions.conflict_choose("ours"), + { desc = "diffview: Choose the OURS version of a conflict" }, + }, + { + "n", + "ct", + actions.conflict_choose("theirs"), + { desc = "diffview: Choose the THEIRS version of a conflict" }, + }, + { + "n", + "cb", + actions.conflict_choose("base"), + { desc = "diffview: Choose the BASE version of a conflict" }, + }, + { + "n", + "ca", + actions.conflict_choose("all"), + { desc = "diffview: Choose all the versions of a conflict" }, + }, + { + "n", + "dx", + actions.conflict_choose("none"), + { desc = "diffview: Delete the conflict region" }, + }, + { + "n", + "cO", + actions.conflict_choose_all("ours"), + { desc = "diffview: Choose the OURS version of a conflict for the whole file" }, + }, + { + "n", + "cT", + actions.conflict_choose_all("theirs"), + { desc = "diffview: Choose the THEIRS version of a conflict for the whole file" }, + }, + { + "n", + "cB", + actions.conflict_choose_all("base"), + { desc = "diffview: Choose the BASE version of a conflict for the whole file" }, + }, + { + "n", + "cA", + actions.conflict_choose_all("all"), + { desc = "diffview: Choose all the versions of a conflict for the whole file" }, + }, + { + "n", + "dX", + actions.conflict_choose_all("none"), + { desc = "diffview: Delete the conflict region for the whole file" }, + }, + }, + diff1 = { + -- Mappings in single window diff layouts + { + "n", + "g?", + actions.help({ "view", "diff1" }), + { desc = "diffview: Open the help panel" }, + }, + }, + diff2 = { + -- Mappings in 2-way diff layouts + { + "n", + "g?", + actions.help({ "view", "diff2" }), + { desc = "diffview: Open the help panel" }, + }, + }, + diff3 = { + -- Mappings in 3-way diff layouts + { + { "n", "x" }, + "2do", + actions.diffget("ours"), + { desc = "diffview: Obtain the diff hunk from the OURS version of the file" }, + }, + { + { "n", "x" }, + "3do", + actions.diffget("theirs"), + { desc = "diffview: Obtain the diff hunk from the THEIRS version of the file" }, + }, + { + "n", + "g?", + actions.help({ "view", "diff3" }), + { desc = "diffview: Open the help panel" }, + }, + }, + diff4 = { + -- Mappings in 4-way diff layouts + { + { "n", "x" }, + "1do", + actions.diffget("base"), + { desc = "diffview: Obtain the diff hunk from the BASE version of the file" }, + }, + { + { "n", "x" }, + "2do", + actions.diffget("ours"), + { desc = "diffview: Obtain the diff hunk from the OURS version of the file" }, + }, + { + { "n", "x" }, + "3do", + actions.diffget("theirs"), + { desc = "diffview: Obtain the diff hunk from the THEIRS version of the file" }, + }, + { + "n", + "g?", + actions.help({ "view", "diff4" }), + { desc = "diffview: Open the help panel" }, + }, + }, + file_panel = { + { + "n", + "j", + actions.next_entry, + { desc = "diffview: Bring the cursor to the next file entry" }, + }, + { + "n", + "", + actions.next_entry, + { desc = "diffview: Bring the cursor to the next file entry" }, + }, + { + "n", + "k", + actions.prev_entry, + { desc = "diffview: Bring the cursor to the previous file entry" }, + }, + { + "n", + "", + actions.prev_entry, + { desc = "diffview: Bring the cursor to the previous file entry" }, + }, + { + "n", + "", + actions.select_entry, + { desc = "diffview: Open the diff for the selected entry" }, + }, + { + "n", + "o", + actions.select_entry, + { desc = "diffview: Open the diff for the selected entry" }, + }, + { + "n", + "l", + actions.select_entry, + { desc = "diffview: Open the diff for the selected entry" }, + }, + { + "n", + "<2-LeftMouse>", + actions.select_entry, + { desc = "diffview: Open the diff for the selected entry" }, + }, + { + "n", + "-", + actions.toggle_stage_entry, + { desc = "diffview: Stage / unstage the selected entry" }, + }, + { + "n", + "s", + actions.toggle_stage_entry, + { desc = "diffview: Stage / unstage the selected entry" }, + }, + { "n", "S", actions.stage_all, { desc = "diffview: Stage all entries" } }, + { "n", "U", actions.unstage_all, { desc = "diffview: Unstage all entries" } }, + { + "n", + "X", + actions.restore_entry, + { desc = "diffview: Restore entry to the state on the left side" }, + }, + { + "n", + "L", + actions.open_commit_log, + { desc = "diffview: Open the commit log panel" }, + }, + { "n", "zo", actions.open_fold, { desc = "diffview: Expand fold" } }, + { "n", "h", actions.close_fold, { desc = "diffview: Collapse fold" } }, + { "n", "zc", actions.close_fold, { desc = "diffview: Collapse fold" } }, + { "n", "za", actions.toggle_fold, { desc = "diffview: Toggle fold" } }, + { "n", "zR", actions.open_all_folds, { desc = "diffview: Expand all folds" } }, + { "n", "zM", actions.close_all_folds, { desc = "diffview: Collapse all folds" } }, + { "n", "", actions.scroll_view(-0.25), { desc = "diffview: Scroll the view up" } }, + { "n", "", actions.scroll_view(0.25), { desc = "diffview: Scroll the view down" } }, + { + "n", + "", + actions.select_next_entry, + { desc = "diffview: Open the diff for the next file" }, + }, + { + "n", + "", + actions.select_prev_entry, + { desc = "diffview: Open the diff for the previous file" }, + }, + { + "n", + "gf", + actions.goto_file_edit, + { desc = "diffview: Open the file in the previous tabpage" }, + }, + { + "n", + "", + actions.goto_file_split, + { desc = "diffview: Open the file in a new split" }, + }, + { + "n", + "gf", + actions.goto_file_tab, + { desc = "diffview: Open the file in a new tabpage" }, + }, + { + "n", + "i", + actions.listing_style, + { desc = "diffview: Toggle between 'list' and 'tree' views" }, + }, + { + "n", + "f", + actions.toggle_flatten_dirs, + { desc = "diffview: Flatten empty subdirectories in tree listing style" }, + }, + { + "n", + "R", + actions.refresh_files, + { desc = "diffview: Update stats and entries in the file list" }, + }, + { + "n", + "e", + actions.focus_files, + { desc = "diffview: Bring focus to the file panel" }, + }, + { "n", "b", actions.toggle_files, { desc = "diffview: Toggle the file panel" } }, + { "n", "g", actions.cycle_layout, { desc = "diffview: Cycle available layouts" } }, + { + "n", + "[x", + actions.prev_conflict, + { desc = "diffview: Go to the previous conflict" }, + }, + { "n", "]x", actions.next_conflict, { desc = "diffview: Go to the next conflict" } }, + { "n", "g?", actions.help("file_panel"), { desc = "diffview: Open the help panel" } }, + { + "n", + "cO", + actions.conflict_choose_all("ours"), + { desc = "diffview: Choose the OURS version of a conflict for the whole file" }, + }, + { + "n", + "cT", + actions.conflict_choose_all("theirs"), + { desc = "diffview: Choose the THEIRS version of a conflict for the whole file" }, + }, + { + "n", + "cB", + actions.conflict_choose_all("base"), + { desc = "diffview: Choose the BASE version of a conflict for the whole file" }, + }, + { + "n", + "cA", + actions.conflict_choose_all("all"), + { desc = "diffview: Choose all the versions of a conflict for the whole file" }, + }, + { + "n", + "dX", + actions.conflict_choose_all("none"), + { desc = "diffview: Delete the conflict region for the whole file" }, + }, + }, + file_history_panel = { + { "n", "g!", actions.options, { desc = "diffview: Open the option panel" } }, + { + "n", + "", + actions.open_in_diffview, + { desc = "diffview: Open the entry under the cursor in a diffview" }, + }, + { + "n", + "y", + actions.copy_hash, + { desc = "diffview: Copy the commit hash of the entry under the cursor" }, + }, + { "n", "L", actions.open_commit_log, { desc = "diffview: Show commit details" } }, + { "n", "zR", actions.open_all_folds, { desc = "diffview: Expand all folds" } }, + { "n", "zM", actions.close_all_folds, { desc = "diffview: Collapse all folds" } }, + { + "n", + "j", + actions.next_entry, + { desc = "diffview: Bring the cursor to the next file entry" }, + }, + { + "n", + "", + actions.next_entry, + { desc = "diffview: Bring the cursor to the next file entry" }, + }, + { + "n", + "k", + actions.prev_entry, + { desc = "diffview: Bring the cursor to the previous file entry." }, + }, + { + "n", + "", + actions.prev_entry, + { desc = "diffview: Bring the cursor to the previous file entry." }, + }, + { + "n", + "", + actions.select_entry, + { desc = "diffview: Open the diff for the selected entry." }, + }, + { + "n", + "o", + actions.select_entry, + { desc = "diffview: Open the diff for the selected entry." }, + }, + { + "n", + "<2-LeftMouse>", + actions.select_entry, + { desc = "diffview: Open the diff for the selected entry." }, + }, + { "n", "", actions.scroll_view(-0.25), { desc = "diffview: Scroll the view up" } }, + { "n", "", actions.scroll_view(0.25), { desc = "diffview: Scroll the view down" } }, + { + "n", + "", + actions.select_next_entry, + { desc = "diffview: Open the diff for the next file" }, + }, + { + "n", + "", + actions.select_prev_entry, + { desc = "diffview: Open the diff for the previous file" }, + }, + { + "n", + "gf", + actions.goto_file_edit, + { desc = "diffview: Open the file in the previous tabpage" }, + }, + { + "n", + "", + actions.goto_file_split, + { desc = "diffview: Open the file in a new split" }, + }, + { + "n", + "gf", + actions.goto_file_tab, + { desc = "diffview: Open the file in a new tabpage" }, + }, + { + "n", + "e", + actions.focus_files, + { desc = "diffview: Bring focus to the file panel" }, + }, + { "n", "b", actions.toggle_files, { desc = "diffview: Toggle the file panel" } }, + { "n", "g", actions.cycle_layout, { desc = "diffview: Cycle available layouts" } }, + { "n", "g?", actions.help("file_history_panel"), { desc = "diffview: Open the help panel" } }, + }, + option_panel = { + { "n", "", actions.select_entry, { desc = "diffview: Change the current option" } }, + { "n", "q", actions.close, { desc = "diffview: Close the panel" } }, + { "n", "g?", actions.help("option_panel"), { desc = "diffview: Open the help panel" } }, + }, + help_panel = { + { "n", "q", actions.close, { desc = "diffview: Close help menu" } }, + { "n", "", actions.close, { desc = "diffview: Close help menu" } }, + }, + }, + }) +end diff --git a/lua/modules/plugins/editor.lua b/lua/modules/plugins/editor.lua index 8d8b2d58d..75a7b03bf 100644 --- a/lua/modules/plugins/editor.lua +++ b/lua/modules/plugins/editor.lua @@ -58,6 +58,7 @@ editor["numToStr/Comment.nvim"] = { editor["sindrets/diffview.nvim"] = { lazy = true, cmd = { "DiffviewOpen", "DiffviewClose" }, + config = require("editor.diffview"), } editor["junegunn/vim-easy-align"] = { lazy = true, From 2e6f2991c3e408982bdaa49cbb3f5adff63755a5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 10 Feb 2024 01:46:13 +0000 Subject: [PATCH 06/15] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 2da23f8b6..4d50811b1 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,7 +2,7 @@ "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, "accelerated-jk.nvim": { "branch": "main", "commit": "8fb5dad4ccc1811766cebf16b544038aeeb7806f" }, - "aerial.nvim": { "branch": "master", "commit": "d21482d3be3228dde594aba31106db428292742c" }, + "aerial.nvim": { "branch": "master", "commit": "3748e87a316a68754341cdffcef44fee61dee51c" }, "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, "autoclose.nvim": { "branch": "main", "commit": "37e11589aac55b0e8810dc5865f898f9cb36fef6" }, "better-escape.nvim": { "branch": "master", "commit": "7e86edafb8c7e73699e0320f225464a298b96d12" }, @@ -20,14 +20,14 @@ "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "71382c2efec76647287d46a4fbe0ec8c9809e2ee" }, - "crates.nvim": { "branch": "main", "commit": "2bd990871f0aef159933bd5fe6da421690a832b9" }, + "copilot.lua": { "branch": "master", "commit": "03f825956ec49e550d07875d867ea6e7c4dc8c00" }, + "crates.nvim": { "branch": "main", "commit": "ec2b04a380c9f3a8e6ca38c230e4990d71978143" }, "csv.vim": { "branch": "master", "commit": "962f88787ec6873eba1c7dbbd81d2723f1ee3c4b" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "fidget.nvim": { "branch": "main", "commit": "1d1042d418ee8cb70d68f1e38db639844331c093" }, + "fidget.nvim": { "branch": "main", "commit": "ad8873c16faa123fe3f9fd6539c41dfb0f97a9e9" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, - "fzf": { "branch": "master", "commit": "1a43259989fc84c0be85829f71ae21815e8d4620" }, + "fzf": { "branch": "master", "commit": "90b818788249bb080f9eddcc4b36ad4080b55c5c" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, @@ -39,30 +39,30 @@ "lspsaga.nvim": { "branch": "main", "commit": "2198c07124bef27ef81335be511c8abfd75db933" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "2b3d247fce06f53934174f5dfe0362c42d65c00c" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, "mason-null-ls.nvim": { "branch": "main", "commit": "a1e19bf9baa86e8a43dd86cf9689ca9f71b4d1da" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "neodim": { "branch": "master", "commit": "9477da03b93f1984a81fee3b92e6ac7c6ada6aa4" }, - "neoscroll.nvim": { "branch": "master", "commit": "be4ebf855a52f71ca4338694a5696675d807eff9" }, + "neoscroll.nvim": { "branch": "master", "commit": "6e3546751076890304428150e53bd59198a4505d" }, "none-ls.nvim": { "branch": "main", "commit": "c10b7be7751aee820a02f2d1fafe76bc316fe223" }, "nvim-bqf": { "branch": "main", "commit": "bdc2a4e5bb670b3c0e33ada9c0eec636d93a0748" }, "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, - "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, + "nvim-dap": { "branch": "master", "commit": "780fd4dd06b0744b235a520d71660c45279d9447" }, "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, - "nvim-lspconfig": { "branch": "master", "commit": "9a6279953c82d01b58825a46ede032ab246a5983" }, + "nvim-lspconfig": { "branch": "master", "commit": "f12f1b9e877b1e6e2ef7eae1a524d8253af4243d" }, "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, "nvim-scrollview": { "branch": "main", "commit": "2bc1d94174a977e7147e845156d3c4c12ac06b67" }, - "nvim-tree.lua": { "branch": "master", "commit": "f39f7b6fcd3865ac2146de4cb4045286308f2935" }, + "nvim-tree.lua": { "branch": "master", "commit": "8cbb1db8e90b62fc56f379992e622e9f919792ce" }, "nvim-treehopper": { "branch": "master", "commit": "5a28bff46c05d28bdb4bcaef67e046eb915a9390" }, - "nvim-treesitter": { "branch": "master", "commit": "4fbf150a1621d52f17b099506e1a32f107079210" }, + "nvim-treesitter": { "branch": "master", "commit": "841dde702ce2e58ffc3724808f3dbea2edee57d5" }, "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "8edd5a6d96936bdff23333d3bc177481388839e5" }, - "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "dd0b2036c3a27cb6e6486f8bd24188c6ca43af0b" }, + "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, - "nvim-web-devicons": { "branch": "master", "commit": "aaec87dbdaa776bfa0a13c8694bec9bcb7454719" }, + "nvim-web-devicons": { "branch": "master", "commit": "7f30f2da3c3641841ceb0e2c150281f624445e8f" }, "paint.nvim": { "branch": "main", "commit": "6ce64212804f425073c61ab0d9c2b034f0435260" }, "persisted.nvim": { "branch": "main", "commit": "edd8aa41cd87f9da1b6ef0c584068dea192f65b7" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, @@ -79,14 +79,14 @@ "telescope-live-grep-args.nvim": { "branch": "master", "commit": "731a046da7dd3adff9de871a42f9b7fb85f60f47" }, "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, - "telescope.nvim": { "branch": "master", "commit": "7b5c5f56a21e82fdcfe5b250278b8dfc4b1cbab4" }, + "telescope.nvim": { "branch": "master", "commit": "0f865f17af4f9bc1587a0132414cdfd32d91852e" }, "toggleterm.nvim": { "branch": "main", "commit": "b49df5cdce67a8964d1b027dae94bde212092b51" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" }, "vim-easy-align": { "branch": "master", "commit": "12dd6316974f71ce333e360c0260b4e1f81169c3" }, - "vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" }, - "vim-go": { "branch": "master", "commit": "18171a41a18dfc59fb0475a00d5c1e9ddb3d22d4" }, - "vim-illuminate": { "branch": "master", "commit": "97c1265ff0b67064b6cfdc15bafc50202a537ae2" }, + "vim-fugitive": { "branch": "master", "commit": "fab00f7c0f3a08e860e39c7adeb8fbe849921a98" }, + "vim-go": { "branch": "master", "commit": "76cab3355fee04e750f69ccd34787b2570c6de7a" }, + "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, "vim-matchup": { "branch": "master", "commit": "7f81ae12542b2a35819f0324895df9bd8626c8ba" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" } From d5df3577d38ef9744d934613b553ec1a127d859f Mon Sep 17 00:00:00 2001 From: Cyberczy <109653523+Cyberczy@users.noreply.github.com> Date: Sun, 11 Feb 2024 23:06:49 +0800 Subject: [PATCH 07/15] chore(ci): bump deps versions (#1173) Signed-off-by: Cyberczy <109653523+Cyberczy@users.noreply.github.com> --- .github/workflows/style_check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/style_check.yml b/.github/workflows/style_check.yml index 82b142cdd..3c7936d9a 100644 --- a/.github/workflows/style_check.yml +++ b/.github/workflows/style_check.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: JohnnyMorganz/stylua-action@v3 + - uses: JohnnyMorganz/stylua-action@v4 with: token: ${{ secrets.GITHUB_TOKEN }} version: latest From c1110985a313700538336b91ed97cfc3ff4119e3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 01:47:08 +0000 Subject: [PATCH 08/15] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 4d50811b1..cb005d3d0 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -27,7 +27,7 @@ "fidget.nvim": { "branch": "main", "commit": "ad8873c16faa123fe3f9fd6539c41dfb0f97a9e9" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, - "fzf": { "branch": "master", "commit": "90b818788249bb080f9eddcc4b36ad4080b55c5c" }, + "fzf": { "branch": "master", "commit": "a4f6c8f9907c4234343c2efe8a1f4b6903568ddb" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, @@ -40,7 +40,7 @@ "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, - "mason-null-ls.nvim": { "branch": "main", "commit": "a1e19bf9baa86e8a43dd86cf9689ca9f71b4d1da" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "d123aaa92734c99760ab75c89fdf8d7387f87a76" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "neodim": { "branch": "master", "commit": "9477da03b93f1984a81fee3b92e6ac7c6ada6aa4" }, @@ -52,13 +52,13 @@ "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-dap": { "branch": "master", "commit": "780fd4dd06b0744b235a520d71660c45279d9447" }, "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, - "nvim-lspconfig": { "branch": "master", "commit": "f12f1b9e877b1e6e2ef7eae1a524d8253af4243d" }, + "nvim-lspconfig": { "branch": "master", "commit": "41f40dc4b86f3e166cf08115f621001972565a20" }, "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, - "nvim-scrollview": { "branch": "main", "commit": "2bc1d94174a977e7147e845156d3c4c12ac06b67" }, - "nvim-tree.lua": { "branch": "master", "commit": "8cbb1db8e90b62fc56f379992e622e9f919792ce" }, + "nvim-scrollview": { "branch": "main", "commit": "07915b4f32d7a7d75762a98e90ccb7378a0926cc" }, + "nvim-tree.lua": { "branch": "master", "commit": "4a87b8b46b4a30107971871df3cb7f4c30fdd5d0" }, "nvim-treehopper": { "branch": "master", "commit": "5a28bff46c05d28bdb4bcaef67e046eb915a9390" }, - "nvim-treesitter": { "branch": "master", "commit": "841dde702ce2e58ffc3724808f3dbea2edee57d5" }, - "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" }, + "nvim-treesitter": { "branch": "master", "commit": "10e8dffb7961fae98cf83efa0e170c22ae2cd33a" }, + "nvim-treesitter-context": { "branch": "master", "commit": "f2ef98cd18fca352448756d3feb6e58d82583274" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "dd0b2036c3a27cb6e6486f8bd24188c6ca43af0b" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, @@ -67,7 +67,7 @@ "persisted.nvim": { "branch": "main", "commit": "edd8aa41cd87f9da1b6ef0c584068dea192f65b7" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "ca8d5ee2b4ee1eec491040a7601d366ddc8a2e02" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "48c579c0079ef34189924d86a3908e29e275ee40" }, "rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" }, "smartyank.nvim": { "branch": "master", "commit": "b048fec8c6b7d122adab6f78606057d59975ece7" }, "sniprun": { "branch": "master", "commit": "0079f9c4675a6825f84e108bbff866f67dd8762f" }, @@ -84,7 +84,7 @@ "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" }, "vim-easy-align": { "branch": "master", "commit": "12dd6316974f71ce333e360c0260b4e1f81169c3" }, - "vim-fugitive": { "branch": "master", "commit": "fab00f7c0f3a08e860e39c7adeb8fbe849921a98" }, + "vim-fugitive": { "branch": "master", "commit": "2a388ef5ba55fd7d50cbefe5767c0e7b65708eef" }, "vim-go": { "branch": "master", "commit": "76cab3355fee04e750f69ccd34787b2570c6de7a" }, "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, "vim-matchup": { "branch": "master", "commit": "7f81ae12542b2a35819f0324895df9bd8626c8ba" }, From 45a53eecfe7b44626fbccb066f35cc92f6378948 Mon Sep 17 00:00:00 2001 From: Cyberczy <109653523+Cyberczy@users.noreply.github.com> Date: Tue, 13 Feb 2024 09:24:48 +0800 Subject: [PATCH 09/15] feat(ci): use dependabot to bump deps versions (#1174) Signed-off-by: Cyberczy <109653523+Cyberczy@users.noreply.github.com> --- .github/dependabot.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..48a4e9aad --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,8 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" + reviewers: + - "ayamir" From 9e79468bb3a2aeff2b5348ce2c185880d2864129 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 01:47:29 +0000 Subject: [PATCH 10/15] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index cb005d3d0..8d0a3748f 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -26,8 +26,8 @@ "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "fidget.nvim": { "branch": "main", "commit": "ad8873c16faa123fe3f9fd6539c41dfb0f97a9e9" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, - "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, - "fzf": { "branch": "master", "commit": "a4f6c8f9907c4234343c2efe8a1f4b6903568ddb" }, + "friendly-snippets": { "branch": "main", "commit": "5cc1f45c6aac699ad008fb85f6ae03236062667d" }, + "fzf": { "branch": "master", "commit": "3b5b52d89ae07f7d63ef60f8c75468d46967198e" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, @@ -52,12 +52,12 @@ "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-dap": { "branch": "master", "commit": "780fd4dd06b0744b235a520d71660c45279d9447" }, "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, - "nvim-lspconfig": { "branch": "master", "commit": "41f40dc4b86f3e166cf08115f621001972565a20" }, + "nvim-lspconfig": { "branch": "master", "commit": "a367cab50457558b71151b3652d3732ca40c8fee" }, "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, - "nvim-scrollview": { "branch": "main", "commit": "07915b4f32d7a7d75762a98e90ccb7378a0926cc" }, - "nvim-tree.lua": { "branch": "master", "commit": "4a87b8b46b4a30107971871df3cb7f4c30fdd5d0" }, + "nvim-scrollview": { "branch": "main", "commit": "d2f104d903e67aba865d1cbd53215f19366a1c9c" }, + "nvim-tree.lua": { "branch": "master", "commit": "863cf832ceb0b2377c913b7696dd7d64f4978941" }, "nvim-treehopper": { "branch": "master", "commit": "5a28bff46c05d28bdb4bcaef67e046eb915a9390" }, - "nvim-treesitter": { "branch": "master", "commit": "10e8dffb7961fae98cf83efa0e170c22ae2cd33a" }, + "nvim-treesitter": { "branch": "master", "commit": "10d79b5dbbdffc3edf307b189284fb62e2e79a3e" }, "nvim-treesitter-context": { "branch": "master", "commit": "f2ef98cd18fca352448756d3feb6e58d82583274" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "dd0b2036c3a27cb6e6486f8bd24188c6ca43af0b" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, @@ -67,25 +67,25 @@ "persisted.nvim": { "branch": "main", "commit": "edd8aa41cd87f9da1b6ef0c584068dea192f65b7" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "48c579c0079ef34189924d86a3908e29e275ee40" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "586f44d21ef687a4d41b5b24c1566d686ae84250" }, "rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" }, "smartyank.nvim": { "branch": "master", "commit": "b048fec8c6b7d122adab6f78606057d59975ece7" }, "sniprun": { "branch": "master", "commit": "0079f9c4675a6825f84e108bbff866f67dd8762f" }, "specs.nvim": { "branch": "main", "commit": "2743e412bbe21c9d73954c403d01e8de7377890d" }, "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "tabout.nvim": { "branch": "master", "commit": "0d275c8d25f32457e67b5c66d6ae43f26a61bce5" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "a61ede8740643f09e1a7706fbb49b152e8f25d42" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "5c5302372b6e1b690c2fb3fc67dfdf782edc121f" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "731a046da7dd3adff9de871a42f9b7fb85f60f47" }, "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, "telescope.nvim": { "branch": "master", "commit": "0f865f17af4f9bc1587a0132414cdfd32d91852e" }, - "toggleterm.nvim": { "branch": "main", "commit": "b49df5cdce67a8964d1b027dae94bde212092b51" }, + "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" }, "vim-easy-align": { "branch": "master", "commit": "12dd6316974f71ce333e360c0260b4e1f81169c3" }, - "vim-fugitive": { "branch": "master", "commit": "2a388ef5ba55fd7d50cbefe5767c0e7b65708eef" }, - "vim-go": { "branch": "master", "commit": "76cab3355fee04e750f69ccd34787b2570c6de7a" }, + "vim-fugitive": { "branch": "master", "commit": "9f92ff14d9d1169e08f197a2250fcaea88e9c767" }, + "vim-go": { "branch": "master", "commit": "0e975560df38be387cca1d7d33df7a4744091303" }, "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, "vim-matchup": { "branch": "master", "commit": "7f81ae12542b2a35819f0324895df9bd8626c8ba" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, From 6c12318614ca2c0954db0704205844dced178bc3 Mon Sep 17 00:00:00 2001 From: Mohu Date: Tue, 13 Feb 2024 16:45:01 +0800 Subject: [PATCH 11/15] Revert "feat(ci): use dependabot to bump deps versions (#1174)" (#1176) --- .github/dependabot.yml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 48a4e9aad..000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" - reviewers: - - "ayamir" From 75689aea34fca8785325c63cf2806cd1feb202bd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Feb 2024 01:47:44 +0000 Subject: [PATCH 12/15] 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 8d0a3748f..d54a1b2b9 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -32,7 +32,7 @@ "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, "hop.nvim": { "branch": "master", "commit": "6d853addd6e11df8338b26e869a29b36f2c3e893" }, - "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, + "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lsp-format-modifications.nvim": { "branch": "main", "commit": "006d4cd88f4f09fdc4375fcb75dd5b7d981a723b" }, "lsp_signature.nvim": { "branch": "master", "commit": "f09644c0390ba49cfe60eafc1f19849dc4c2e814" }, @@ -45,19 +45,19 @@ "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "neodim": { "branch": "master", "commit": "9477da03b93f1984a81fee3b92e6ac7c6ada6aa4" }, "neoscroll.nvim": { "branch": "master", "commit": "6e3546751076890304428150e53bd59198a4505d" }, - "none-ls.nvim": { "branch": "main", "commit": "c10b7be7751aee820a02f2d1fafe76bc316fe223" }, + "none-ls.nvim": { "branch": "main", "commit": "34b1311bd07bd3741e60e06b34d0709d6e5a9f0f" }, "nvim-bqf": { "branch": "main", "commit": "bdc2a4e5bb670b3c0e33ada9c0eec636d93a0748" }, "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, - "nvim-dap": { "branch": "master", "commit": "780fd4dd06b0744b235a520d71660c45279d9447" }, + "nvim-dap": { "branch": "master", "commit": "3b4bdea2c0e9ed356d8cffbf974f3d0af891bbea" }, "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, - "nvim-lspconfig": { "branch": "master", "commit": "a367cab50457558b71151b3652d3732ca40c8fee" }, + "nvim-lspconfig": { "branch": "master", "commit": "ae91a303a2258cb9cd9501e9d20c2dc92792d362" }, "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, - "nvim-scrollview": { "branch": "main", "commit": "d2f104d903e67aba865d1cbd53215f19366a1c9c" }, + "nvim-scrollview": { "branch": "main", "commit": "1852d8927e3e4c53df8c675a8a271175483c6ede" }, "nvim-tree.lua": { "branch": "master", "commit": "863cf832ceb0b2377c913b7696dd7d64f4978941" }, "nvim-treehopper": { "branch": "master", "commit": "5a28bff46c05d28bdb4bcaef67e046eb915a9390" }, - "nvim-treesitter": { "branch": "master", "commit": "10d79b5dbbdffc3edf307b189284fb62e2e79a3e" }, + "nvim-treesitter": { "branch": "master", "commit": "7e9139db685ae88bf55e224a7b68e02b5dcfcb88" }, "nvim-treesitter-context": { "branch": "master", "commit": "f2ef98cd18fca352448756d3feb6e58d82583274" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "dd0b2036c3a27cb6e6486f8bd24188c6ca43af0b" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, @@ -84,7 +84,7 @@ "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" }, "vim-easy-align": { "branch": "master", "commit": "12dd6316974f71ce333e360c0260b4e1f81169c3" }, - "vim-fugitive": { "branch": "master", "commit": "9f92ff14d9d1169e08f197a2250fcaea88e9c767" }, + "vim-fugitive": { "branch": "master", "commit": "011cf4fcb93a9649ffc6dcdff56ef948f5d0f7cc" }, "vim-go": { "branch": "master", "commit": "0e975560df38be387cca1d7d33df7a4744091303" }, "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, "vim-matchup": { "branch": "master", "commit": "7f81ae12542b2a35819f0324895df9bd8626c8ba" }, From ccd5eda2471e6690d443b8d88eee527e16548b7e Mon Sep 17 00:00:00 2001 From: Mohu Date: Thu, 15 Feb 2024 18:24:08 +0800 Subject: [PATCH 13/15] feat: search with selection text. (#1175) * feat: search with selection text. Signed-off-by: ayamir * chore(ci): ignore linting --------- Signed-off-by: ayamir Co-authored-by: CharlesChiuGit --- lua/keymap/helpers.lua | 12 ++++++++++++ lua/keymap/tool.lua | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/lua/keymap/helpers.lua b/lua/keymap/helpers.lua index b411bcd79..94dbf54b9 100644 --- a/lua/keymap/helpers.lua +++ b/lua/keymap/helpers.lua @@ -38,3 +38,15 @@ _G._toggle_lazygit = function() vim.notify("Command [lazygit] not found!", vim.log.levels.ERROR, { title = "toggleterm.nvim" }) end end + +_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 fcb5307d3..d95d8c63e 100644 --- a/lua/keymap/tool.lua +++ b/lua/keymap/tool.lua @@ -132,6 +132,12 @@ local plug_map = { :with_desc("edit: Change current direrctory 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() }) -- luacheck: ignore + end) + :with_noremap() + :with_silent() + :with_desc("find: Selection text"), ["n|fd"] = map_cu("Telescope persisted"):with_noremap():with_silent():with_desc("find: Session"), -- Plugin: dap From 45562ddae4d9288acca7f69dda15a415cb566879 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 01:47:04 +0000 Subject: [PATCH 14/15] chore(lockfile): auto update lazy-lock.json --- lazy-lock.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index d54a1b2b9..226665611 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,6 +1,6 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" }, "accelerated-jk.nvim": { "branch": "main", "commit": "8fb5dad4ccc1811766cebf16b544038aeeb7806f" }, "aerial.nvim": { "branch": "master", "commit": "3748e87a316a68754341cdffcef44fee61dee51c" }, "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, @@ -24,10 +24,10 @@ "crates.nvim": { "branch": "main", "commit": "ec2b04a380c9f3a8e6ca38c230e4990d71978143" }, "csv.vim": { "branch": "master", "commit": "962f88787ec6873eba1c7dbbd81d2723f1ee3c4b" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "fidget.nvim": { "branch": "main", "commit": "ad8873c16faa123fe3f9fd6539c41dfb0f97a9e9" }, + "fidget.nvim": { "branch": "main", "commit": "4e854f3299e21d1c18279add340428a97520fc44" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, "friendly-snippets": { "branch": "main", "commit": "5cc1f45c6aac699ad008fb85f6ae03236062667d" }, - "fzf": { "branch": "master", "commit": "3b5b52d89ae07f7d63ef60f8c75468d46967198e" }, + "fzf": { "branch": "master", "commit": "7a72f1a2531d728d14faf5f61909f9ffa63c8dd3" }, "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, @@ -36,11 +36,11 @@ "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lsp-format-modifications.nvim": { "branch": "main", "commit": "006d4cd88f4f09fdc4375fcb75dd5b7d981a723b" }, "lsp_signature.nvim": { "branch": "master", "commit": "f09644c0390ba49cfe60eafc1f19849dc4c2e814" }, - "lspsaga.nvim": { "branch": "main", "commit": "2198c07124bef27ef81335be511c8abfd75db933" }, + "lspsaga.nvim": { "branch": "main", "commit": "db74412e0282505ea1e63a42060728fb74c1968e" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, - "mason-null-ls.nvim": { "branch": "main", "commit": "d123aaa92734c99760ab75c89fdf8d7387f87a76" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "fe4cce44dec93c69be17dad79b21de867dde118a" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "bfaa24b899233385c92364f95856e6280bddef30" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "neodim": { "branch": "master", "commit": "9477da03b93f1984a81fee3b92e6ac7c6ada6aa4" }, @@ -50,15 +50,15 @@ "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, - "nvim-dap": { "branch": "master", "commit": "3b4bdea2c0e9ed356d8cffbf974f3d0af891bbea" }, + "nvim-dap": { "branch": "master", "commit": "0406598c8079c5441b96ff4a2f245acc085ebcd6" }, "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, - "nvim-lspconfig": { "branch": "master", "commit": "ae91a303a2258cb9cd9501e9d20c2dc92792d362" }, - "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, + "nvim-lspconfig": { "branch": "master", "commit": "114bf1875c4adef7c39c86ef538246478b4af87c" }, + "nvim-notify": { "branch": "master", "commit": "7138c86b28de61b6866c8cae60289136f0d539fa" }, "nvim-scrollview": { "branch": "main", "commit": "1852d8927e3e4c53df8c675a8a271175483c6ede" }, "nvim-tree.lua": { "branch": "master", "commit": "863cf832ceb0b2377c913b7696dd7d64f4978941" }, "nvim-treehopper": { "branch": "master", "commit": "5a28bff46c05d28bdb4bcaef67e046eb915a9390" }, - "nvim-treesitter": { "branch": "master", "commit": "7e9139db685ae88bf55e224a7b68e02b5dcfcb88" }, - "nvim-treesitter-context": { "branch": "master", "commit": "f2ef98cd18fca352448756d3feb6e58d82583274" }, + "nvim-treesitter": { "branch": "master", "commit": "d49a8f82f107b43b7cdded278dab4873024a6f36" }, + "nvim-treesitter-context": { "branch": "master", "commit": "f33905bf5aec67e59a14d2cc0e67d80ac5aa5bd8" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "dd0b2036c3a27cb6e6486f8bd24188c6ca43af0b" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, @@ -79,7 +79,7 @@ "telescope-live-grep-args.nvim": { "branch": "master", "commit": "731a046da7dd3adff9de871a42f9b7fb85f60f47" }, "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, - "telescope.nvim": { "branch": "master", "commit": "0f865f17af4f9bc1587a0132414cdfd32d91852e" }, + "telescope.nvim": { "branch": "master", "commit": "45d61cc8da213e4052cf698653692b6a4c961760" }, "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" }, From 79914139d8d6adb5a92317fd9035e471c9c656a0 Mon Sep 17 00:00:00 2001 From: TonyWu20 Date: Fri, 16 Feb 2024 16:21:42 +0800 Subject: [PATCH 15/15] Configure ltex --- lua/modules/configs/completion/lsp.lua | 8 ++-- lua/modules/plugins/lang.lua | 4 ++ spell/en.uft-8.add | 54 +++++++++++++++++++++++++ spell/en.uft-8.add.spl | Bin 523 -> 1189 bytes 4 files changed, 63 insertions(+), 3 deletions(-) diff --git a/lua/modules/configs/completion/lsp.lua b/lua/modules/configs/completion/lsp.lua index b661130ae..5ba617157 100644 --- a/lua/modules/configs/completion/lsp.lua +++ b/lua/modules/configs/completion/lsp.lua @@ -12,9 +12,11 @@ return function() table.insert(words, word) end nvim_lsp.ltex.setup({ - ltex = { - dictionary = { - ["en-US"] = words, + settings = { + ltex = { + dictionary = { + ["en-US"] = words, + }, }, }, }) diff --git a/lua/modules/plugins/lang.lua b/lua/modules/plugins/lang.lua index 6793710af..ae48564ea 100644 --- a/lua/modules/plugins/lang.lua +++ b/lua/modules/plugins/lang.lua @@ -50,4 +50,8 @@ lang["chomosuke/typst-preview.nvim"] = { require("typst-preview").update() end, } +lang["kaarmu/typst.vim"]={ + ft = "typst", + lazy = false, +} return lang diff --git a/spell/en.uft-8.add b/spell/en.uft-8.add index dad01d8d6..a8a9a0ec3 100644 --- a/spell/en.uft-8.add +++ b/spell/en.uft-8.add @@ -34,3 +34,57 @@ electrochemistry OER H2 electroreduction +Interquartile +Zig +zag +heatmaps +compressive +zig +preliminarily +interlayer +bondlengths +interatomic +bondings +overlappings +boxplots +interquartile +IQRs +bondlength +biaxially +biaxial +bondlegths +IQR +et al. +monometallic +HEA +adjustability +Pt3Ni +Pt3Fe +PtNiCo +PtPdFeNiCo +O2 +adsorbate +bifunctional +anisotropic +ASEs +efficiencies +nanoparticles +topologies +Nørskov +microstrain +Chattot +nanoparticle +macrostrain +morphologies +reactivities +fcc +eV +SACs +MOF +graphene +monodispersed +thermochemical +nanosheets +electrocatalysts +electrocatalysts +electroreduction diff --git a/spell/en.uft-8.add.spl b/spell/en.uft-8.add.spl index 6cddd03cdbe862bd3e1b06a75983502e85548144..758580414583a403fe81058310efd82341c4ff16 100644 GIT binary patch literal 1189 zcmZWov2N5r5cRB&f+mXi0)F5)>8?U3MHD4Uia3D;_j~sGY}m8S+IQlpkkTSiT+avO z3%HseNKYM6BY)iD)IRBvXMv{2|z47XCjHBNrzAexJRIo79P<|98mKaa3h(XChSbr z7+c6kAXdCq7<;s;k<#5aZrTDuZrHr z*b<4DNj9bfl4x+t-~qIfrBuwm$tWs}G5O?}{O{brCbc}*60~11>oPNWpmDcBpq0|( z4m>yD2>CG`Li2ir_imbj5i?t{u_2UpJ=&_8+g1wm2%7o>C^!itTX>o(UBb+a1#Y;S z4H95a0vKA%&)s1ASDx=C#J1vExpB@Dw2REB;D1<5Qbi5ip;?8H(nuTJfz>% literal 523 zcmX|8K~BRk5cDkN0^-mIpsL~r$*D(Ffm(?I2gKbtPGc!eqBuc{#DPC?;&m|VQZDxH z&g|@X{kq-7&ewJJV+c7ho5WTmTDD9Q6R-$_7{wy>^>$P{Ac%|PX`xQishv=P z@ozwz&_;@0gVjWOhl+%N2@Sj$ky++^fJkC=N5MRzB*Gp>4aGg3m&Ba1K7t}&nXP() ztvD~XKY8Xd2rdQ=h^fY`uF2bTC`TqKjaXmq^~`fUS85TL>OMb?$w%=@>i)OKjh!~k zWfA*6P^d_fjvLoM(YG~ps-CsGFvi@RuQ!j+FL>gg7`fZxR-udJbbgOb%JMXMo#Ii? J`Hro|`~rQFS}gzo