Skip to content

Commit

Permalink
chore: bump lazy.nvim startup and rustaceanvim
Browse files Browse the repository at this point in the history
  • Loading branch information
jiangyinzuo committed Sep 22, 2024
1 parent a3d0b6a commit cd11299
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 13 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[wiki](https://github.com/jiangyinzuo/vimrc/wiki)

My personal vim/neovim configuration files, dotfiles, docs and other scripts.
My personal Vim/Neovim configuration files, dotfiles, docs and other scripts.

## Requirements and Installation

Expand All @@ -11,7 +11,7 @@ OS: Linux, WSL
Vim/Neovim requirements:

- vim 9.1+ (full features)
- vim 7.4.629+ (minimal)
- vim 7.4.629+ (minimal, tested in CentOS 7)
- neovim 0.11.0+

See [install/README.md](./install/README.md) for more details.
Expand Down
20 changes: 12 additions & 8 deletions root/.config/nvim/lazy.lua
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
-- Linux: ~/.local/share/nvim/lazy/lazy.nvim
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not (vim.uv or vim.loop).fs_stat(lazypath) then
vim.fn.system({
"git",
"clone",
"--filter=blob:none",
"https://github.com/folke/lazy.nvim.git",
"--branch=stable", -- latest stable release
lazypath,
})
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
if vim.v.shell_error ~= 0 then
vim.api.nvim_echo({
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
{ out, "WarningMsg" },
{ "\nPress any key to exit..." },
}, true, {})
vim.fn.getchar()
os.exit(1)
end
end
vim.opt.rtp:prepend(lazypath)

Expand Down
8 changes: 5 additions & 3 deletions root/.config/nvim/lua/plugins/lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,8 @@ if vim.g.vimrc_lsp == "nvim-lsp" then
},
{
"mrcjkb/rustaceanvim",
version = "^4", -- Recommended
version = "^5", -- Recommended
lazy = false, -- This plugin is already lazy
ft = { "rust" },
},
{
Expand All @@ -227,14 +228,15 @@ if vim.g.vimrc_lsp == "nvim-lsp" then
require("go").setup({
-- debug
verbose = false,
lsp_semantic_highlights = false, -- do not use highlights from gopls so we can use treesitter highlight injection
lsp_keymaps = false, -- true: use default keymaps defined in go/lsp.lua
lsp_cfg = {
capabilities = require("lsp").get_capabilities(),
settings = {
gopls = {
semanticTokens = false, -- disable semantic string tokens so we can use treesitter highlight injection
}
}
},
},
},
-- after go.nvim's on_attach is called, then this on_attach will be called
lsp_on_client_start = function(client, bufnr)
Expand Down

0 comments on commit cd11299

Please sign in to comment.