update neovim to 0.11

Because it offers a nicer interface and info on hover.
For now leave vim.opt when using the table interfase (until vim.o with tables is implemented)

nixos/packages.nix

@@ -476,7 +476,7 @@
     ## IDE ##
     #########
 
-    neovim
+    pkgs2.neovim
 
     ###########
     ## Icons ##

nvim/ftplugin/lua.lua

@@ -0,0 +1,4 @@
+vim.bo.expandtab = true
+vim.bo.tabstop = 4
+vim.bo.shiftwidth = 4
+vim.bo.softtabstop = 4

nvim/init.lua

@@ -13,8 +13,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 ]]
 --

nvim/lua/custom/plugins/rust.lua

@@ -3,7 +3,7 @@
 return {
     {
         'mrcjkb/rustaceanvim',
-        version = '^5', -- Recommended
+        version = '^6', -- Recommended
         lazy = false, -- This plugin is already lazy
     },
 }

nvim/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

nvim/lua/kickstart/plugins/lint.lua

@@ -51,7 +51,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,

nvim/lua/kickstart/plugins/lsp.lua

@@ -19,8 +19,8 @@ return {
         'neovim/nvim-lspconfig',
         dependencies = {
             -- Automatically install LSPs and related tools to stdpath for Neovim
-            { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants
-            'williamboman/mason-lspconfig.nvim',
+            { 'mason-org/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants
+            'mason-org/mason-lspconfig.nvim',
             'WhoIsSethDaniel/mason-tool-installer.nvim',
 
             -- Useful status updates for LSP.
@@ -73,6 +73,15 @@ return {
                         vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
                     end
 
+                    -- Добавляем маппинг для hover с max_width = 80
+                    map('K', function()
+                        vim.lsp.buf.hover {
+                            max_width = 80,
+                            -- none, single, double, rounded, solid, shadow
+                            border = 'solid',
+                        }
+                    end, 'Hover Documentation')
+
                     -- Rename the variable under your cursor.
                     --  Most Language Servers support renaming across files, etc.
                     map('grn', vim.lsp.buf.rename, '[R]e[n]ame')

nvim/lua/kickstart/plugins/which-key.lua

@@ -20,6 +20,9 @@ return {
         'folke/which-key.nvim',
         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.o.timeoutlen
+            delay = 0,
             icons = {
                 -- set icon mappings to true if you have a Nerd Font
                 mappings = vim.g.have_nerd_font,

nvim/lua/kickstart/settings.lua

@@ -8,21 +8,21 @@ 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`
 
 -- Make line numbers default
-vim.opt.number = true
+vim.o.number = true
 -- You can also add relative line numbers, to help with jumping.
-vim.opt.relativenumber = true
+vim.o.relativenumber = true
 
 -- Табуляция в 4 символа
-vim.opt.tabstop = 4
-vim.opt.shiftwidth = 4
-vim.opt.softtabstop = 4
+vim.o.tabstop = 4
+vim.o.shiftwidth = 4
+vim.o.softtabstop = 4
 -- Юзать пробелы вместо табов
-vim.opt.expandtab = true
+vim.o.expandtab = true
 
 -- yaml lsp за меня решают сколько пробелов мне надо. Это фикс
 -- Их параметры конфига для переназначения не работают. Пришлось костыль сделать
@@ -55,13 +55,13 @@ vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile' }, {
 vim.g.loaded_netrw = 1
 vim.g.loaded_netrwPlugin = 1
 -- optionally enable 24-bit colour
--- vim.opt.termguicolors = true
+-- vim.o.termguicolors = 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
 
 -- greatest remap ever
 vim.keymap.set('x', '<leader>p', '"_dP', { desc = '[P]aste' })
@@ -71,7 +71,7 @@ vim.keymap.set('x', '<leader>p', '"_dP', { desc = '[P]aste' })
 --  Remove this option if you want your OS clipboard to remain independent.
 --  See `:help 'clipboard'`
 -- vim.schedule(function()
---     vim.opt.clipboard = 'unnamedplus'
+--     vim.o.clipboard = 'unnamedplus'
 -- end)
 
 -- Use system clipboard via <leader>y/d, but Neovim clipboard via just y/d
@@ -81,13 +81,6 @@ vim.keymap.set('v', '<leader>y', '"+y', { desc = '[Y]ank to system clipboard' })
 vim.keymap.set('n', '<leader>d', '"+d', { desc = '[D]elete to system clipboard' })
 vim.keymap.set('v', '<leader>d', '"+d', { desc = '[D]elete to system clipboard' })
 
--- Change `K` hover documentation size
-vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(vim.lsp.handlers.hover, {
-    -- border = 'rounded',
-    max_width = 80,
-    -- max_height = 15,
-})
-
 -- Move lines in visual mode
 vim.keymap.set('v', '<A-j>', ":m '>+1<CR>gv=gv")
 vim.keymap.set('v', '<A-Down>', ":m '>+1<CR>gv=gv")
@@ -95,57 +88,62 @@ vim.keymap.set('v', '<A-k>', ":m '<-2<CR>gv=gv")
 vim.keymap.set('v', '<A-Up>', ":m '<-2<CR>gv=gv")
 
 -- Enable break indent
-vim.opt.breakindent = true
+vim.o.breakindent = true
 
 -- Save undo history
-vim.opt.undofile = true
+vim.o.undofile = true
 
 -- Disable swap file
-vim.opt.swapfile = false
+vim.o.swapfile = false
 
 -- Settings for sessions
 vim.o.sessionoptions = 'blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions'
 
 -- Highlight a vertical line at the specified column to encourage keeping lines within this limit
-vim.opt.colorcolumn = '100'
+vim.o.colorcolumn = '100'
 
 -- 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
 -- Displays which-key popup sooner
-vim.opt.timeoutlen = 300
+vim.o.timeoutlen = 300
 
 -- Configure how new splits should be opened
-vim.opt.splitright = true
-vim.opt.splitbelow = true
+vim.o.splitright = true
+vim.o.splitbelow = true
 
 -- Sets how neovim will display certain whitespace characters in the editor.
 --  See `:help 'list'`
 --  and `:help 'listchars'`
-vim.opt.list = 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.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
 
 -- Preview substitutions live, as you type!
-vim.opt.inccommand = 'split'
+vim.o.inccommand = 'split'
 
 -- Show which line your cursor is on
-vim.opt.cursorline = true
+vim.o.cursorline = true
 
 -- Minimal number of screen lines to keep above and below the cursor.
-vim.opt.scrolloff = 10
+vim.o.scrolloff = 10
 
 -- 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()`
@@ -196,11 +194,11 @@ vim.keymap.set('n', '<C-Up>', '<C-w><C-k>', { desc = 'Move focus to the upper wi
 
 -- 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,
 })