mirror of
https://github.com/jdhao/nvim-config.git
synced 2025-06-08 14:14:33 +02:00
Compare commits
3 Commits
v0.10.3
...
7f53743255
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7f53743255 | ||
|
|
94497c0a73 | ||
|
|
70e9943aac |
@@ -10,7 +10,7 @@
|
|||||||
<img alt="Windows" src="https://img.shields.io/badge/Windows-%23.svg?style=flat-square&logo=windows&color=0078D6&logoColor=white" />
|
<img alt="Windows" src="https://img.shields.io/badge/Windows-%23.svg?style=flat-square&logo=windows&color=0078D6&logoColor=white" />
|
||||||
</a>
|
</a>
|
||||||
<a href="https://github.com/neovim/neovim/releases/tag/stable">
|
<a href="https://github.com/neovim/neovim/releases/tag/stable">
|
||||||
<img src="https://img.shields.io/badge/Neovim-0.10.3-blueviolet.svg?style=flat-square&logo=Neovim&logoColor=green" alt="Neovim minimum version"/>
|
<img src="https://img.shields.io/badge/Neovim-0.10.4-blueviolet.svg?style=flat-square&logo=Neovim&logoColor=green" alt="Neovim minimum version"/>
|
||||||
</a>
|
</a>
|
||||||
<a href="https://github.com/jdhao/nvim-config/releases/latest">
|
<a href="https://github.com/jdhao/nvim-config/releases/latest">
|
||||||
<img alt="Latest release" src="https://img.shields.io/github/v/release/jdhao/nvim-config" />
|
<img alt="Latest release" src="https://img.shields.io/github/v/release/jdhao/nvim-config" />
|
||||||
@@ -21,9 +21,6 @@
|
|||||||
<a href="https://github.com/jdhao/nvim-config/graphs/commit-activity">
|
<a href="https://github.com/jdhao/nvim-config/graphs/commit-activity">
|
||||||
<img src="https://img.shields.io/github/commit-activity/m/jdhao/nvim-config?style=flat-square" />
|
<img src="https://img.shields.io/github/commit-activity/m/jdhao/nvim-config?style=flat-square" />
|
||||||
</a>
|
</a>
|
||||||
<a href="https://github.com/jdhao/nvim-config/releases/tag/v0.10.2">
|
|
||||||
<img src="https://img.shields.io/github/commits-since/jdhao/nvim-config/v0.10.2?style=flat-square" />
|
|
||||||
</a>
|
|
||||||
<a href="https://github.com/jdhao/nvim-config/graphs/contributors">
|
<a href="https://github.com/jdhao/nvim-config/graphs/contributors">
|
||||||
<img src="https://img.shields.io/github/contributors/jdhao/nvim-config?style=flat-square" />
|
<img src="https://img.shields.io/github/contributors/jdhao/nvim-config?style=flat-square" />
|
||||||
</a>
|
</a>
|
||||||
|
|||||||
2
init.lua
2
init.lua
@@ -13,7 +13,7 @@ vim.loader.enable()
|
|||||||
|
|
||||||
local utils = require("utils")
|
local utils = require("utils")
|
||||||
|
|
||||||
local expected_version = "0.10.3"
|
local expected_version = "0.10.4"
|
||||||
utils.is_compatible_version(expected_version)
|
utils.is_compatible_version(expected_version)
|
||||||
|
|
||||||
local config_dir = vim.fn.stdpath("config")
|
local config_dir = vim.fn.stdpath("config")
|
||||||
|
|||||||
@@ -135,49 +135,6 @@ api.nvim_create_autocmd("TermOpen", {
|
|||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
-- Return to last cursor position when opening a file, note that here we cannot use BufReadPost
|
|
||||||
-- as event. It seems that when BufReadPost is triggered, FileType event is still not run.
|
|
||||||
-- So the filetype for this buffer is empty string.
|
|
||||||
api.nvim_create_autocmd("FileType", {
|
|
||||||
group = api.nvim_create_augroup("resume_cursor_position", { clear = true }),
|
|
||||||
pattern = "*",
|
|
||||||
callback = function(ev)
|
|
||||||
local mark_pos = api.nvim_buf_get_mark(ev.buf, '"')
|
|
||||||
local last_cursor_line = mark_pos[1]
|
|
||||||
|
|
||||||
local max_line = vim.fn.line("$")
|
|
||||||
local buf_filetype = api.nvim_get_option_value("filetype", { buf = ev.buf })
|
|
||||||
local buftype = api.nvim_get_option_value("buftype", { buf = ev.buf })
|
|
||||||
|
|
||||||
-- only handle normal files
|
|
||||||
if buf_filetype == "" or buftype ~= "" then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Only resume last cursor position when there is no go-to-line command (something like '+23').
|
|
||||||
if vim.fn.match(vim.v.argv, [[\v^\+(\d){1,}$]]) ~= -1 then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
if last_cursor_line > 1 and last_cursor_line <= max_line then
|
|
||||||
-- vim.print(string.format("mark_pos: %s", vim.inspect(mark_pos)))
|
|
||||||
-- it seems that without vim.schedule, the cursor position can not be set correctly
|
|
||||||
vim.schedule(function()
|
|
||||||
local status, result = pcall(api.nvim_win_set_cursor, 0, mark_pos)
|
|
||||||
if not status then
|
|
||||||
api.nvim_err_writeln(
|
|
||||||
string.format("Failed to resume cursor position. Context %s, error: %s", vim.inspect(ev), result)
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
-- the following two ways also seem to work,
|
|
||||||
-- ref: https://www.reddit.com/r/neovim/comments/104lc26/how_can_i_press_escape_key_using_lua/
|
|
||||||
-- vim.api.nvim_feedkeys("g`\"", "n", true)
|
|
||||||
-- vim.fn.execute("normal! g`\"")
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
|
|
||||||
local number_toggle_group = api.nvim_create_augroup("numbertoggle", { clear = true })
|
local number_toggle_group = api.nvim_create_augroup("numbertoggle", { clear = true })
|
||||||
api.nvim_create_autocmd({ "BufEnter", "FocusGained", "InsertLeave", "WinEnter" }, {
|
api.nvim_create_autocmd({ "BufEnter", "FocusGained", "InsertLeave", "WinEnter" }, {
|
||||||
pattern = "*",
|
pattern = "*",
|
||||||
|
|||||||
@@ -278,15 +278,9 @@ local plugin_specs = {
|
|||||||
-- Multiple cursor plugin like Sublime Text?
|
-- Multiple cursor plugin like Sublime Text?
|
||||||
-- 'mg979/vim-visual-multi'
|
-- 'mg979/vim-visual-multi'
|
||||||
|
|
||||||
-- Autosave files on certain events
|
|
||||||
{ "907th/vim-auto-save", event = "InsertEnter" },
|
|
||||||
|
|
||||||
-- Show undo history visually
|
-- Show undo history visually
|
||||||
{ "simnalamburt/vim-mundo", cmd = { "MundoToggle", "MundoShow" } },
|
{ "simnalamburt/vim-mundo", cmd = { "MundoToggle", "MundoShow" } },
|
||||||
|
|
||||||
-- better UI for some nvim actions
|
|
||||||
{ "stevearc/dressing.nvim" },
|
|
||||||
|
|
||||||
-- Manage your yank history
|
-- Manage your yank history
|
||||||
{
|
{
|
||||||
"gbprod/yanky.nvim",
|
"gbprod/yanky.nvim",
|
||||||
@@ -513,7 +507,23 @@ local plugin_specs = {
|
|||||||
require("config.which-key")
|
require("config.which-key")
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"folke/snacks.nvim",
|
||||||
|
priority = 1000,
|
||||||
|
lazy = false,
|
||||||
|
opts = {
|
||||||
|
-- more beautiful vim.ui.input
|
||||||
|
input = {
|
||||||
|
enabled = true,
|
||||||
|
win = {
|
||||||
|
relative = "cursor",
|
||||||
|
backdrop = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
-- more beautiful vim.ui.select
|
||||||
|
picker = { enabled = true },
|
||||||
|
},
|
||||||
|
},
|
||||||
-- show and trim trailing whitespaces
|
-- show and trim trailing whitespaces
|
||||||
{ "jdhao/whitespace.nvim", event = "VeryLazy" },
|
{ "jdhao/whitespace.nvim", event = "VeryLazy" },
|
||||||
|
|
||||||
|
|||||||
@@ -384,6 +384,3 @@ function! s:wilder_init() abort
|
|||||||
echohl Error |echomsg "Wilder.nvim missing"| echohl None
|
echohl Error |echomsg "Wilder.nvim missing"| echohl None
|
||||||
endtry
|
endtry
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
""""""""""""""""""""""""""""""vim-auto-save settings""""""""""""""""""""""""""""""
|
|
||||||
let g:auto_save = 1 " enable AutoSave on Vim startup
|
|
||||||
|
|||||||
Reference in New Issue
Block a user