Merge branch 'nvim-lua:master' into master

This commit is contained in:
KasperSternberg 2024-03-06 08:35:42 +01:00 committed by GitHub
commit ea89c3f4b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 13 deletions

View File

@ -87,9 +87,7 @@ information about extending and exploring Neovim.
### Getting Started ### Getting Started
See [Effective Neovim: Instant IDE](https://youtu.be/stqUbv-5u2s), covering the [The Only Video You Need to Get Started with Neovim](https://youtu.be/m8C0Cq9Uv9o)
previous version. Note: The install via init.lua is outdated, please follow the
install instructions in this file instead. An updated video is coming soon.
### Recommended Steps ### Recommended Steps
@ -214,5 +212,3 @@ choco install -y neovim git ripgrep wget fd unzip gzip mingw make
``` ```
Then continue with the [Install Kickstart](#Install-Kickstart) step. Then continue with the [Install Kickstart](#Install-Kickstart) step.

View File

@ -725,7 +725,9 @@ require('lazy').setup {
lazy = false, -- make sure we load this during startup if it is your main colorscheme lazy = false, -- make sure we load this during startup if it is your main colorscheme
priority = 1000, -- make sure to load this before all the other start plugins priority = 1000, -- make sure to load this before all the other start plugins
config = function() config = function()
-- Load the colorscheme here -- Load the colorscheme here.
-- Like many other themes, this one has different styles, and you could load
-- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
vim.cmd.colorscheme 'tokyonight-night' vim.cmd.colorscheme 'tokyonight-night'
-- You can configure highlights by doing something like -- You can configure highlights by doing something like
@ -761,11 +763,11 @@ require('lazy').setup {
statusline.setup() statusline.setup()
-- You can configure sections in the statusline by overriding their -- You can configure sections in the statusline by overriding their
-- default behavior. For example, here we disable the section for -- default behavior. For example, here we set the section for
-- cursor information because line numbers are already enabled -- cursor location to LINE:COLUMN
---@diagnostic disable-next-line: duplicate-set-field ---@diagnostic disable-next-line: duplicate-set-field
statusline.section_location = function() statusline.section_location = function()
return '' return '%2l:%-2v'
end end
-- ... and there is more! -- ... and there is more!