Skip to content

Commit dbf61a2

Browse files
committed
Merge branch 'main' into nvchad
2 parents 9ee43c0 + d25d036 commit dbf61a2

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

lazy-lock.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
"faster.nvim": { "branch": "main", "commit": "c3a5286765b43263791eb736affeb6fdff81e4ef" },
2929
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
3030
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
31-
"fzf": { "branch": "master", "commit": "e5cd7f0a3a73ef598267c1e9f29b0fe9a80925ab" },
31+
"fzf": { "branch": "master", "commit": "1afd14381079a35eac0a4c2a5cacb86e2a3f476b" },
3232
"fzy-lua-native": { "branch": "master", "commit": "9d720745d5c2fb563c0d86c17d77612a3519c506" },
33-
"gitsigns.nvim": { "branch": "main", "commit": "736f51d2bb684c06f39a2032f064d7244f549981" },
33+
"gitsigns.nvim": { "branch": "main", "commit": "c7d37ca22b461f64e26f8f6701b2586128ed0bef" },
3434
"glance.nvim": { "branch": "master", "commit": "bf86d8b79dce808e65fdb6e9269d0b4ed6d2eefc" },
3535
"go.nvim": { "branch": "master", "commit": "3279d15d146ab2eae6ad9bc930f3c8fc62a3697b" },
3636
"grug-far.nvim": { "branch": "main", "commit": "385d1949dc21d0c39e7a74b4f4a25da18817bc86" },
@@ -50,7 +50,7 @@
5050
"mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
5151
"mini.align": { "branch": "main", "commit": "0202e1662a7a03a95cefd6851795ceae5e87b9b3" },
5252
"mini.cursorword": { "branch": "main", "commit": "52834085b4ad175a050343cd96c4517def711cc5" },
53-
"neoconf.nvim": { "branch": "main", "commit": "99b2f7524e783389a51decc4c9bfc7c11e554a50" },
53+
"neoconf.nvim": { "branch": "main", "commit": "b516f1ca1943de917e476224e7aa6b9151961991" },
5454
"neoscroll.nvim": { "branch": "master", "commit": "f957373912e88579e26fdaea4735450ff2ef5c9c" },
5555
"none-ls.nvim": { "branch": "main", "commit": "5fcb73913a9290f78097e34420fe0e6130c5c33c" },
5656
"nvim-bqf": { "branch": "main", "commit": "17680cda3538913e88dd4c6456c837db9ace40ae" },
@@ -59,11 +59,11 @@
5959
"nvim-dap": { "branch": "master", "commit": "a479e25ed5b5d331fb46ee4b9e160ff02ac64310" },
6060
"nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
6161
"nvim-highlight-colors": { "branch": "main", "commit": "b42a5ccec7457b44e89f7ed3b3afb1b375bb2093" },
62-
"nvim-lspconfig": { "branch": "master", "commit": "9141be4c1332afc83bdf1b0278dbb030f75ff8e3" },
62+
"nvim-lspconfig": { "branch": "master", "commit": "d6dc63670d3dc5204b1e874af4cbf340cb5d9d18" },
6363
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
6464
"nvim-notify": { "branch": "master", "commit": "397c7c1184745fca649e5104de659e6392ef5a4d" },
6565
"nvim-scrollview": { "branch": "main", "commit": "8cc50e5e9af861c15778947677aba87cdded66cc" },
66-
"nvim-tree.lua": { "branch": "master", "commit": "dd2364d6802f7f57a98acb8b545ed484c6697626" },
66+
"nvim-tree.lua": { "branch": "master", "commit": "9b289abd6998e30fd24cbc9919e0b0cbed6364ce" },
6767
"nvim-treehopper": { "branch": "master", "commit": "e3861c0231631c6af317d6746bb78fdb428a58f3" },
6868
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
6969
"nvim-treesitter-context": { "branch": "master", "commit": "dca8726fea2c14e1ce6adbaa76a04816fbfaff61" },
@@ -74,12 +74,12 @@
7474
"paint.nvim": { "branch": "main", "commit": "ef6f717a8669619ebbd098fb72f85115d64c6c92" },
7575
"persisted.nvim": { "branch": "main", "commit": "d35a3ed973e17defd8800acd46a0c893498a2671" },
7676
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
77-
"project.nvim": { "branch": "main", "commit": "4f93db87b8df4446a24d3209efdfb78d0774ee8d" },
77+
"project.nvim": { "branch": "main", "commit": "21d6d3d0e2910f67239af56acdb5242b83965934" },
7878
"rainbow-delimiters.nvim": { "branch": "master", "commit": "97bf4b8ef9298644a29fcd9dd41a0210cf08cac7" },
79-
"render-markdown.nvim": { "branch": "main", "commit": "3d84dbc1f80a2a02e560ddbd5ab29f99f88bbeda" },
79+
"render-markdown.nvim": { "branch": "main", "commit": "3da7bb459f6cff03980dd1e106c46f3e62ff4d9f" },
8080
"rustaceanvim": { "branch": "master", "commit": "eb606eb3785f6c6e31ef675c32b706694b76923b" },
8181
"search.nvim": { "branch": "main", "commit": "d2d177769b7816e49faba5131ee155ce65930313" },
82-
"smart-splits.nvim": { "branch": "master", "commit": "938aa35e047515d026f3d74d0d57e4c8817babbe" },
82+
"smart-splits.nvim": { "branch": "master", "commit": "52ee119752ee7e98a2a62f0f172926b5fbbc28a5" },
8383
"smartyank.nvim": { "branch": "master", "commit": "c4e53e0d9316ca790a6f5d78aad73206a763873b" },
8484
"sniprun": { "branch": "master", "commit": "a90c65846c3c18efc3f799d8b6dc26af9d4a69ed" },
8585
"sqlite.lua": { "branch": "master", "commit": "50092d60feb242602d7578398c6eb53b4a8ffe7b" },

lua/core/event.lua

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,17 @@ vim.api.nvim_create_autocmd("LspAttach", {
5757
end,
5858
})
5959

60+
-- Autojump to last edit
61+
vim.api.nvim_create_autocmd("BufReadPost", {
62+
callback = function()
63+
local mark = vim.api.nvim_buf_get_mark(0, '"')
64+
local lcount = vim.api.nvim_buf_line_count(0)
65+
if mark[1] > 0 and mark[1] <= lcount then
66+
pcall(vim.api.nvim_win_set_cursor, 0, mark)
67+
end
68+
end,
69+
})
70+
6071
function autocmd.nvim_create_augroups(definitions)
6172
for group_name, definition in pairs(definitions) do
6273
-- Prepend an underscore to avoid name clashes
@@ -91,12 +102,6 @@ function autocmd.load_autocmds()
91102
{ "BufWritePre", "MERGE_MSG", "setlocal noundofile" },
92103
{ "BufWritePre", "description", "setlocal noundofile" },
93104
{ "BufWritePre", "COMMIT_EDITMSG", "setlocal noundofile" },
94-
-- Auto place to last edit
95-
{
96-
"BufReadPost",
97-
"*",
98-
[[if line("'\"") > 1 && line("'\"") <= line("$") | execute "normal! g'\"" | endif]],
99-
},
100105
-- Auto change directory
101106
-- { "BufEnter", "*", "silent! lcd %:p:h" },
102107
-- Auto toggle fcitx5

0 commit comments

Comments
 (0)