Manually add some changes from upstream

Author: ests

init.lua

@@ -16,65 +16,66 @@ vim.g.maplocalleader = '\\'
 vim.g.have_nerd_font = true
 
 -- [[ Setting options ]]
--- See `:help vim.opt`
+-- See `:help vim.o`
 -- NOTE: You can change these options as you wish!
 --  For more options, you can see `:help option-list`
 
 -- new in 0.11+
 -- vim.o.winborder = 'rounded'
 
 -- Make line numbers default
-vim.opt.number = true
+vim.o.number = true
 -- You can also add relative line numbers, to help with jumping.
 --  Experiment for yourself to see if you like it!
--- vim.opt.relativenumber = true
+-- vim.o.relativenumber = true
 
 -- Enable mouse mode, can be useful for resizing splits for example!
-vim.opt.mouse = 'a'
+vim.o.mouse = 'a'
 
 -- Don't show the mode, since it's already in the status line
-vim.opt.showmode = false
+vim.o.showmode = false
 
 vim.opt.completeopt = { 'menu', 'menuone', 'noselect', 'noinsert', 'popup' }
 
 -- Use system clipboard for copy/yank operations, but don't override it when pasting
 vim.opt.clipboard:append 'unnamed' -- use * register
--- vim.opt.clipboard:append('unnamedplus') -- use + register (not needed on macOS as * and + are the same)
+-- vim.o.clipboard:append('unnamedplus') -- use + register (not needed on macOS as * and + are the same)
 
 -- Preserve clipboard when pasting in visual mode
 vim.keymap.set('x', 'p', '"_dP')
 
 -- views can only be fully collapsed with the global statusline
-vim.opt.laststatus = 3
+vim.o.laststatus = 3
 
 -- Enable break indent
-vim.opt.breakindent = true
+vim.o.breakindent = true
 
 -- Save undo history
-vim.opt.undofile = true
-vim.opt.ul = 500 -- undolevel
+vim.o.undofile = true
+vim.o.ul = 500 -- undolevel
 
 -- Case-insensitive searching UNLESS \C or one or more capital letters in the search term
-vim.opt.ignorecase = true
-vim.opt.smartcase = true
+vim.o.ignorecase = true
+vim.o.smartcase = true
 
 -- Keep signcolumn on by default
-vim.opt.signcolumn = 'yes'
+vim.o.signcolumn = 'yes'
 
 -- Decrease update time
-vim.opt.updatetime = 250
+vim.o.updatetime = 250
 
 -- Decrease mapped sequence wait time
-vim.opt.timeoutlen = 300
+vim.o.timeoutlen = 300
 
 -- Configure how new splits should be opened
-vim.opt.splitright = true
-vim.opt.splitbelow = true
-
--- Sets how neovim will display certain whitespace characters in the editor.
---  See `:help 'list'`
---  and `:help 'listchars'`
-vim.opt.list = true
+vim.o.splitright = true
+vim.o.splitbelow = true
+
+--  Notice listchars is set using `vim.opt` instead of `vim.o`.
+--  It is very similar to `vim.o` but offers an interface for conveniently interacting with tables.
+--   See `:help lua-options`
+--   and `:help lua-options-guide`vim.o.list = true
+vim.o.list = true
 vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
 
 vim.opt_local.tabstop = 2
@@ -85,10 +86,10 @@ vim.opt_local.expandtab = true
 vim.api.nvim_create_autocmd('FileType', {
   pattern = 'go',
   callback = function()
-    vim.opt_local.tabstop = 4
-    vim.opt_local.shiftwidth = 4
-    vim.opt_local.expandtab = false
-    vim.opt.listchars = { tab = '  ', trail = '·', nbsp = '␣' }
+    vim.o_local.tabstop = 4
+    vim.o_local.shiftwidth = 4
+    vim.o_local.expandtab = false
+    vim.o.listchars = { tab = '  ', trail = '·', nbsp = '␣' }
     vim.cmd 'iabbrev dl :='
   end,
 })
@@ -97,45 +98,45 @@ vim.api.nvim_create_autocmd('FileType', {
 vim.api.nvim_create_autocmd('FileType', {
   pattern = 'json',
   callback = function()
-    vim.opt_local.tabstop = 2
-    vim.opt_local.shiftwidth = 2
-    vim.opt_local.expandtab = false
+    vim.o_local.tabstop = 2
+    vim.o_local.shiftwidth = 2
+    vim.o_local.expandtab = false
   end,
 })
 
 -- But Ruby is no better
 vim.api.nvim_create_autocmd('FileType', {
   pattern = 'ruby',
   callback = function()
-    vim.opt_local.indentkeys:remove { '.', '0{' }
+    vim.o_local.indentkeys:remove { '.', '0{' }
   end,
 })
 
 -- Preview substitutions live, as you type!
-vim.opt.inccommand = 'split'
+vim.o.inccommand = 'split'
 
 -- Show which line your cursor is on
-vim.opt.cursorline = false
+vim.o.cursorline = false
 
 -- Minimal number of screen lines to keep above and below the cursor.
-vim.opt.scrolloff = 10
+vim.o.scrolloff = 10
 
 -- ests sefalsettings
-vim.opt.directory = '/tmp/vim/swap'
-vim.opt.writebackup = true
-vim.opt.backup = true
-vim.opt.backupcopy = 'auto'
-vim.opt.backupdir = '/tmp/vim/backup'
-vim.opt.undofile = true
-vim.opt.undodir = '/tmp/vim/undo'
-vim.opt.viewdir = '/tmp/vim/viewdir'
-vim.opt.conceallevel = 0
+vim.o.directory = '/tmp/vim/swap'
+vim.o.writebackup = true
+vim.o.backup = true
+vim.o.backupcopy = 'auto'
+vim.o.backupdir = '/tmp/vim/backup'
+vim.o.undofile = true
+vim.o.undodir = '/tmp/vim/undo'
+vim.o.viewdir = '/tmp/vim/viewdir'
+vim.o.conceallevel = 0
 -- hybrid relativenumbers
 vim.o.relativenumber = true
 -- if performing an operation that would fail due to unsaved changes in the buffer (like `:q`),
 -- instead raise a dialog asking if you wish to save the current file(s)
 -- See `:help 'confirm'`
-vim.opt.confirm = true
+vim.o.confirm = true
 
 -- [[ Basic Keymaps ]]
 --  See `:help vim.keymap.set()`
@@ -187,12 +188,12 @@ vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper win
 
 -- Highlight when yanking (copying) text
 --  Try it with `yap` in normal mode
---  See `:help vim.highlight.on_yank()`
+--  See `:help vim.hl.on_yank()`
 vim.api.nvim_create_autocmd('TextYankPost', {
   desc = 'Highlight when yanking (copying) text',
   group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }),
   callback = function()
-    vim.highlight.on_yank()
+    vim.hl.on_yank()
   end,
 })
 
@@ -205,8 +206,11 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
   if vim.v.shell_error ~= 0 then
     error('Error cloning lazy.nvim:\n' .. out)
   end
-end ---@diagnostic disable-next-line: undefined-field
-vim.opt.rtp:prepend(lazypath)
+end
+
+---@type vim.Option
+local rtp = vim.opt.rtp
+rtp:prepend(lazypath)
 
 -- [[ Configure and install plugins ]]
 --
@@ -279,7 +283,7 @@ require('lazy').setup({
     event = 'VimEnter', -- Sets the loading event to 'VimEnter'
     opts = {
       -- delay between pressing a key and opening which-key (milliseconds)
-      -- this setting is independent of vim.opt.timeoutlen
+      -- this setting is independent of vim.o.timeoutlen
       delay = 0,
       icons = {
         -- set icon mappings to true if you have a Nerd Font
@@ -466,8 +470,8 @@ require('lazy').setup({
       -- Automatically install LSPs and related tools to stdpath for Neovim
       -- Mason must be loaded before its dependents so we need to set it up here.
       -- NOTE: `opts = {}` is the same as calling `require('mason').setup({})`
-      { 'williamboman/mason.nvim', opts = {} },
-      'williamboman/mason-lspconfig.nvim',
+      { 'mason-org/mason.nvim', opts = {} },
+      'mason-org/mason-lspconfig.nvim',
       'WhoIsSethDaniel/mason-tool-installer.nvim',
 
       -- Useful status updates for LSP.

lua/kickstart/plugins/debug.lua

@@ -18,7 +18,7 @@ return {
     'nvim-neotest/nvim-nio',
 
     -- Installs the debug adapters for you
-    'williamboman/mason.nvim',
+    'mason-org/mason.nvim',
     'jay-babu/mason-nvim-dap.nvim',
 
     -- Add your own debuggers here

lua/kickstart/plugins/lint.lua

@@ -50,7 +50,7 @@ return {
           -- Only run the linter in buffers that you can modify in order to
           -- avoid superfluous noise, notably within the handy LSP pop-ups that
           -- describe the hovered symbol using Markdown.
-          if vim.opt_local.modifiable:get() then
+          if vim.bo.modifiable then
             lint.try_lint()
           end
         end,

lua/kickstart/plugins/neo-tree.lua

@@ -9,7 +9,7 @@ return {
     'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended
     'MunifTanjim/nui.nvim',
   },
-  cmd = 'Neotree',
+  lazy = false,
   keys = {
     { '<leader>\\', '<cmd>Neotree toggle focus last float<CR>', desc = 'NeoTree toggle', silent = true },
     { '<C-n>', '<cmd>Neotree toggle focus last left<CR>', desc = 'NeoTree toggle', silent = true },