new plugins, from coq to cmp, fixes, xdebug, install python3 fixes

init.lua

@@ -9,6 +9,7 @@ require("settings/lazy")
 
 -- Keymaps
 require('keymaps/system')
+require('keymaps/functions')
 require('keymaps/plugins')
 
 -- Autocommands

install.sh

@@ -33,9 +33,9 @@ if test (string match -ri "ru" "$LANG")
 			case LSP_VSCODE-LANGSERVERS_INSTALLED
         set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[РАБОТА] "; set_color white; echo "Установлены LSP-сервера от VSCode (JSON, HTML, CSS) (\"hrsh7th/vscode-langservers-extracted\")";
 			case LSP_EMMET_INSTALL
-        set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[ЗАДАЧА] "; set_color white; echo "Установить LSP-сервер для набора инструментов Emmet (HTML из CSS)? (\"aca/emmet-ls\") (y/N) ";
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[ЗАДАЧА] "; set_color white; echo "Установить LSP-сервер для набора инструментов Emmet (HTML и CSS)? (\"aca/emmet-ls\") (y/N) ";
 			case LSP_EMMET_INSTALLED
-        set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[РАБОТА] "; set_color white; echo "Установлен LSP-сервер для набора инструментов Emmet (HTML из CSS) (\"aca/emmet-ls\")";
+        set_color yellow; echo -n "[mirzaev/nvim] "; set_color green; echo -n "[РАБОТА] "; set_color white; echo "Установлен LSP-сервер для набора инструментов Emmet (HTML и CSS) (\"aca/emmet-ls\")";
 			case LSP_CSSMODULES_INSTALL
         set_color yellow; echo -n "[mirzaev/nvim] "; set_color blue; echo -n "[ЗАДАЧА] "; set_color white; echo "Установить LSP-сервер для CSS (форматировщик)? (\"antonk52/cssmodules-language-server\") (y/N) ";
 			case LSP_CSSMODULES_INSTALLED
@@ -166,9 +166,17 @@ if set -q _flag_update
 		fnm install $NODEJS_VERSION
 
 		# need to rewrite in the future (бляяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяяя)
-		sudo apt install -y npm universal-ctags python3-venv python3-pip rubygems ruby-dev pkg-config lua5.4 luarocks
+		sudo apt install -y npm universal-ctags python3-venv python3-virtualenv python3-pip  rubygems ruby-dev pkg-config lua5.4 luarocks ripgrep
+
+		python3 -m virtualenv ~/.config/nvim/python
+		source ~/.config/nvim/python/bin/activate.fish
+
+	  # ~/.config/nvim/python/bin/python3 -m pip install --upgrade pip
+		# ~/.config/nvim/python/bin/pip install --upgrade pynvim
+
 	  python3 -m pip install --upgrade pip
 		pip install --upgrade pynvim
+
 		sudo gem install neovim
 
 		# Install NeoVim module for NPM
@@ -212,7 +220,7 @@ sudo apt install -y build-essential flex bison libisl-dev texinfo texlive
 # ../configure --disable-sanity-checks
 
 # Initializing the virtual environment for Python packages
-python3 -m venv ~/.local --system-site-packages
+~/.config/nvim/python/bin/python3 -m venv ~/.local --system-site-packages
 
 if not set -q _flag_force
 	# Installation request
@@ -374,6 +382,7 @@ if set -q _flag_force; or test (string match -ri 'y' "$RESPONSE")
 		cd ~/
 		git clone https://github.com/xdebug/vscode-php-debug.git
 		cd vscode-php-debug
+		git pull
 		npm install && npm run build
 	end &> $output
 

lazy-lock.json

@@ -1,41 +1,45 @@
 {
+  "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
-  "coq.artifacts": { "branch": "artifacts", "commit": "ef5f21d638ccc456cfa5b8d0ab37093cefe48c8b" },
+  "cmp-git": { "branch": "main", "commit": "b24309c386c9666c549a1abaedd4956541676d06" },
-  "coq.thirdparty": { "branch": "3p", "commit": "2bd969a2bcd2624f9c260b1000957c7e665e308e" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
-  "coq_nvim": { "branch": "coq", "commit": "d8b71757358038fa151fb45c493c3a1e8c3629a3" },
   "diaglist.nvim": { "branch": "master", "commit": "8aba9fcf62cc60e1d5ce941faedecc399d9a1e8b" },
-  "fidget.nvim": { "branch": "main", "commit": "64463022a1f2ff1318ab22a2ea4125ed9313a483" },
+  "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" },
   "flexoki": { "branch": "main", "commit": "079554c242a86be5d1a95598c7c6368d6eedd7a3" },
-  "gitsigns.nvim": { "branch": "main", "commit": "5813e4878748805f1518cee7abb50fd7205a3a48" },
+  "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
+  "gitsigns.nvim": { "branch": "main", "commit": "abf82a65f185bd54adc0679f74b7d6e1ada690c9" },
   "jsctags": { "branch": "master", "commit": "22d3fb848c429d4704dc3a8946bc3a4423a8e4a4" },
   "kommentary": { "branch": "main", "commit": "d5a111a3bc4109a8f913a5863c9092b3b3801482" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
+  "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
   "lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" },
-  "lspkind-nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" },
+  "lspkind-nvim": { "branch": "master", "commit": "c7274c48137396526b59d86232eabcdc7fed8a32" },
   "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" },
   "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
   "lush.nvim": { "branch": "main", "commit": "9c60ec2279d62487d942ce095e49006af28eed6e" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
   "nginx.vim": { "branch": "master", "commit": "cffaec54f0c7f9518de053634413a20e90eac825" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" },
+  "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
-  "nvim-dap": { "branch": "master", "commit": "818cd8787a77a97703eb1d9090543a374f79a9ac" },
+  "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" },
+  "nvim-dap": { "branch": "master", "commit": "e47878dcf1ccc30136b30d19ab19fe76946d61cd" },
   "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
-  "nvim-lint": { "branch": "master", "commit": "8a6aae10d15069c952428fa6bebf82c2d164b502" },
+  "nvim-lint": { "branch": "master", "commit": "bcd1a44edbea8cd473af7e7582d3f7ffc60d8e81" },
-  "nvim-lspconfig": { "branch": "master", "commit": "5eeb45c8c469b84777a5bd8796b698c8a1c780a7" },
+  "nvim-lspconfig": { "branch": "master", "commit": "3f58aeca0c6ece8a9fb8782ea3fcb6024f285be3" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-treesitter": { "branch": "main", "commit": "6e42d823ce0a5a76180c473c119c7677738a09d1" },
+  "nvim-treesitter": { "branch": "main", "commit": "4967fa48b0fe7a7f92cee546c76bb4bb61bb14d5" },
-  "nvim-web-devicons": { "branch": "master", "commit": "6788013bb9cb784e606ada44206b0e755e4323d7" },
+  "nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" },
   "phpctags": { "branch": "master", "commit": "5ed731eb86227d416977b0a1fd06e77e58363818" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "reticle.nvim": { "branch": "main", "commit": "66bfa2b1c28fd71bb8ae4e871e0cd9e9c509ea86" },
   "tagbar": { "branch": "master", "commit": "7bfffca1f121afb7a9e38747500bf5270e006bb1" },
   "telescope-dap.nvim": { "branch": "master", "commit": "783366bd6c1e7fa0a5c59c07db37f49c805a28df" },
-  "telescope.nvim": { "branch": "master", "commit": "e709d31454ee6e6157f0537f861f797bd44c0bad" },
+  "telescope.nvim": { "branch": "master", "commit": "ad7d9580338354ccc136e5b8f0aa4f880434dcdc" },
   "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
   "vim-fish": { "branch": "master", "commit": "50b95cbbcd09c046121367d49039710e9dc9c15f" },
   "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
   "vim-signify": { "branch": "master", "commit": "9ec7989ef5f92c5073de26abb46fc6a998b75ef8" },
-  "vim-test": { "branch": "master", "commit": "aa619692ff48a3cf3e6bdb893765039488d4e5f3" }
+  "vim-test": { "branch": "master", "commit": "c569b3620d0e53572efc95159f66ace5e7b06b48" },
+  "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
 }

lua/keymaps/functions.lua

@@ -1,2 +1,2 @@
 -- Quick compilation with GCC and running
-vim.keymap.set('n', 'co', '<cmd>:!gcc -o test % && ./test', {noremap = true})
+vim.keymap.set('n', '<leader>c', '<cmd>!gcc -o test % && ./test<cr>', { noremap = true })

lua/keymaps/plugins.lua

@@ -13,7 +13,7 @@ vim.keymap.set({ 'n', 'v', 't' }, 'F', function()
 		else
 			-- LSP-server clients not found
 
-			-- vim.api.nvim_exec('PrettierAsync', false)
+			vim.api.nvim_exec('PrettierAsync', false)
 		end
 	end,
 	{ noremap = true, silent = true, buffer = bufnr }
@@ -64,7 +64,8 @@ vim.keymap.set('n', '<F11>', function() require('dap').step_into() end)
 vim.keymap.set('n', '<F12>', function() require('dap').step_out() end)
 vim.keymap.set('n', '<Leader>b', function() require('dap').toggle_breakpoint() end)
 vim.keymap.set('n', '<Leader>B', function() require('dap').set_breakpoint() end)
-vim.keymap.set('n', '<Leader>lp', function() require('dap').set_breakpoint(nil, nil, vim.fn.input('Log point message: ')) end)
+vim.keymap.set('n', '<Leader>lp',
+	function() require('dap').set_breakpoint(nil, nil, vim.fn.input('Log point message: ')) end)
 vim.keymap.set('n', '<Leader>dr', function() require('dap').repl.open() end)
 vim.keymap.set('n', '<Leader>dl', function() require('dap').run_last() end)
 vim.keymap.set({ 'n', 'v' }, '<Leader>dh', function()

lua/plugins/blink.lua

@@ -0,0 +1,64 @@
+-- Performant, batteries-included completion plugin for Neovim
+return {
+	'saghen/blink.cmp',
+	enabled = true,
+	lazy = false,
+	-- optional: provides snippets for the snippet source
+	dependencies = { 'rafamadriz/friendly-snippets' },
+
+	-- use a release tag to download pre-built binaries
+	version = '1.*',
+	-- AND/OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust
+	-- build = 'cargo build --release',
+	-- If you use nix, you can build from source using latest nightly rust with:
+	-- build = 'nix run .#build-plugin',
+
+	---@module 'blink.cmp'
+	---@type blink.cmp.Config
+	opts = {
+		-- 'default' (recommended) for mappings similar to built-in completions (C-y to accept)
+		-- 'super-tab' for mappings similar to vscode (tab to accept)
+		-- 'enter' for enter to accept
+		-- 'none' for no mappings
+		--
+		-- All presets have the following mappings:
+		-- C-space: Open menu or open docs if already open
+		-- C-n/C-p or Up/Down: Select next/previous item
+		-- C-e: Hide menu
+		-- C-k: Toggle signature help (if signature.enabled = true)
+		--
+		-- See :h blink-cmp-config-keymap for defining your own keymap
+		keymap = { preset = 'default' },
+
+		appearance = {
+			-- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
+			-- Adjusts spacing to ensure icons are aligned
+			nerd_font_variant = 'mono'
+		},
+
+		-- (Default) Only show the documentation popup when manually triggered
+		completion = { documentation = { auto_show = false } },
+
+		-- Default list of enabled providers defined so that you can extend it
+		-- elsewhere in your config, without redefining it, due to `opts_extend`
+		sources = {
+			default = { 'lazydev', 'lsp', 'path', 'snippets', 'buffer' },
+			providers = {
+				lazydev = {
+					name = 'LazyDev',
+					module = 'lazydev.integrations.blink',
+					-- make lazydev completions top priority (see `:h blink.cmp`)
+					score_offset = 100,
+				},
+			}
+		},
+
+		-- (Default) Rust fuzzy matcher for typo resistance and significantly better performance
+		-- You may use a lua implementation instead by using `implementation = 'lua'` or fallback to the lua implementation,
+		-- when the Rust fuzzy matcher is not available, by using `implementation = 'prefer_rust'`
+		--
+		-- See the fuzzy documentation for more information
+		fuzzy = { implementation = 'prefer_rust_with_warning' }
+	},
+	opts_extend = { 'sources.default' }
+}

lua/plugins/bufferline.lua

@@ -7,12 +7,12 @@ return {
 	keys = {
 		{ '<tab>',   '<cmd>BufferLineCycleNext<cr>',                                                       mode = { 'n' }, desc = 'Move to the next tab',     noremap = true, silent = true },
 		{ '<s-tab>', '<cmd>BufferLineCyclePrev<cr>',                                                       mode = { 'n' }, desc = 'Move to the previous tab', noremap = true, silent = true },
-		{ '<leader><tab>', '<cmd>lua require("bufferline").go_to(vim.fn.input("Enter tab number: "), true)<cr>', mode = { 'n' }, desc = 'Move to the tab', noremap = true, silent = true },
+		{ '<c-tab>', '<cmd>lua require("bufferline").go_to(vim.fn.input("Enter tab number: "), true)<cr>', mode = { 'n' }, desc = 'Move to the tab',          noremap = true, silent = true },
 	},
 	version = '*',
 	dependencies = {
-		--
+		-- Provides Nerd Font icons (glyphs) for use by neovim plugins
-		{ 'nvim-tree/nvim-web-devicons' }
+		'nvim-tree/nvim-web-devicons'
 	},
 	opts = {
 		options = {

lua/plugins/coq.lua

@@ -1,23 +0,0 @@
--- Fast as FUCK nvim completion
-return {
-  'ms-jpq/coq_nvim', 
-	enabled = true,
-  lazy = false,
-	priority = 30,
-	branch = 'coq',
-  dependencies = {
-		-- Quickstart configs for Nvim LSP
-    { 'neovim/nvim-lspconfig' },
-
-    -- 9000+ Snippets
-    { 'ms-jpq/coq.artifacts', branch = 'artifacts' },
-
-    -- Lua & third party sources. Need to **configure separately**
-    { 'ms-jpq/coq.thirdparty', branch = '3p' }
-  },
-  config = function()
-    vim.g.coq_settings = {
-      auto_start = 'shut-up',
-    }
-  end,
-}

lua/plugins/dap-ui.lua

@@ -1,14 +1,14 @@
--- A UI for nvim-dap
+-- An UI for nvim-dap
 return {
 	'rcarriga/nvim-dap-ui',
 	enabled = true,
 	lazy = true,
 	dependencies = {
 		-- Debug Adapter Protocol client implementation for Neovim
-		'mfussenegger/nvim-dap', 
+		{ 'mfussenegger/nvim-dap' },
 
 		-- A library for asynchronous IO in Neovim
-		'nvim-neotest/nvim-nio'
+		{ 'nvim-neotest/nvim-nio' }
 	},
 	config = function()
 		local dap, dapui = require('dap'), require('dapui')

lua/plugins/dap.lua

@@ -3,8 +3,19 @@ return {
 	'mfussenegger/nvim-dap',
 	enabled = true,
 	lazy = true,
+	dependencies = {
+		-- An UI for nvim-dap
+		{ 'rcarriga/nvim-dap-ui' },
+
+		-- A library for asynchronous IO in Neovim
+		{ 'nvim-neotest/nvim-nio' },
+
+		-- Virtual text support to nvim-dap
+		{ 'theHamsta/nvim-dap-virtual-text' }
+	},
 	config = function()
 		local dap = require('dap')
+		require('telescope').load_extension('dap')
 
 		-- Installing debuggers for C, Rust and C++
 		dap.configurations.cpp = {}

lua/plugins/disabled/lspconfig-with-coq.lua

@@ -0,0 +1,175 @@
+-- Quickstart configs for Nvim LSP
+return {
+	'neovim/nvim-lspconfig',
+	enabled = true,
+	lazy = false,
+	priority = 70,
+	dependencies = {
+		-- 🌈 Plugin that creates missing LSP diagnostics
+		-- highlight groups for color schemes that do not
+		-- yet support the Neovim 0.5 builtin LSP client
+		{ 'folke/lsp-colors.nvim' },
+
+		-- Fast as FUCK nvim completion
+		{ 'ms-jpq/coq_nvim',       branch = 'coq' },
+
+		-- 9000+ Snippets
+		{ 'ms-jpq/coq.artifacts',  branch = 'artifacts' },
+
+		-- Lua & third party sources. Need to **configure separately**
+		{ 'ms-jpq/coq.thirdparty', branch = '3p' }
+	},
+	init = function()
+		vim.g.coq_settings = {
+			auto_start = 'shut-up'
+		}
+	end,
+	config = function()
+		-- @todo навести порядок
+
+		-- Активация вещания готовых набросков
+		local capabilities = vim.lsp.protocol.make_client_capabilities()
+		capabilities.textDocument.completion.completionItem.snippetSupport = true
+
+		-- Инициализация 'ms-jpq/coq_nvim'
+		local coq = require('coq')
+
+		-- Инициализация LSP-серверов
+
+		-- Инициализация 'bmewburn/vscode-intelephense' (LSP-сервер для PHP)
+		vim.lsp.config(
+			'intelephense',
+			{
+				on_attach = lspconfig_on_attach,
+				coq.lsp_ensure_capabilities(),
+				capabilities = capabilities
+			}
+		)
+		vim.lsp.enable('intelephense')
+
+		-- Инициализация 'hrsh7th/vscode-html-language-server' (LSP-сервер для HTML)
+		vim.lsp.config(
+			'html',
+			{
+				init_options = {
+					configurationSection = { 'html' },
+					embeddedLanguages = {
+						css = false,
+						javascript = false
+					},
+					provideFormatter = true,
+				},
+				on_attach = lspconfig_on_attach,
+				coq.lsp_ensure_capabilities(),
+				capabilities = capabilities
+			}
+		)
+		vim.lsp.enable('html')
+
+		-- Инициализация 'aca/emmet-ls' (LSP-сервер для HTML)
+		vim.lsp.config(
+			'emmet_ls',
+			{
+				init_options = {
+					html = {
+						options = {
+							['bem.enabled'] = true,
+						},
+					},
+				},
+				on_attach = lspconfig_on_attach,
+				coq.lsp_ensure_capabilities(),
+				capabilities = capabilities
+			})
+		vim.lsp.enable('emmet_ls')
+
+		-- Инициализация 'hrsh7th/vscode-langservers-extracted' (LSP-сервер для CSS)
+		vim.lsp.config(
+			'cssls',
+			{
+				settings = {
+					css = {
+						validate = true
+					},
+					less = {
+						validate = true
+					},
+					scss = {
+						validate = true
+					}
+				},
+				on_attach = lspconfig_on_attach,
+				coq.lsp_ensure_capabilities(),
+				capabilities = capabilities
+			})
+		vim.lsp.enable('cssls')
+
+		-- Инициализация 'antonk52/cssmodules-language-server' (LSP-сервер для JS, вспомогательный для CSS)
+		vim.lsp.config(
+			'cssmodules_ls',
+			{
+				init_options = {
+					camelCase = false,
+				},
+				on_attach = lspconfig_on_attach,
+				coq.lsp_ensure_capabilities(),
+				capabilities = capabilities
+			})
+		vim.lsp.enable('cssmodules_ls')
+
+		-- Инициализация 'denoland/deno' (LSP-сервер для JavaScript и PostScript)
+		vim.lsp.config(
+			'denols',
+			{
+				init_options = {
+					enable = true,
+					unstable = false
+				},
+				on_attach = lspconfig_on_attach,
+				coq.lsp_ensure_capabilities(),
+				capabilities = capabilities
+			})
+		vim.lsp.enable('denols')
+
+		-- Инициализация 'hrsh7th/vscode-langservers-extracted' (LSP-сервер для JSON)
+		vim.lsp.config(
+			'jsonls',
+			{
+				on_attach = lspconfig_on_attach,
+				coq.lsp_ensure_capabilities(),
+				capabilities = capabilities
+			})
+		vim.lsp.enable('jsonls')
+
+		-- Инициализация 'luals/lua-language-server' (LSP-сервер для Lua)
+		vim.lsp.config(
+			'lua_ls',
+			{
+				settings = {
+					Lua = {
+						runtime = {
+							-- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
+							version = 'LuaJIT',
+						},
+						diagnostics = {
+							-- Get the language server to recognize the `vim` global
+							globals = { 'vim' },
+						},
+						workspace = {
+							-- Make the server aware of Neovim runtime files
+							library = vim.api.nvim_get_runtime_file('', true),
+						},
+						-- Do not send telemetry data containing a randomized but unique identifier
+						telemetry = {
+							enable = false,
+						},
+					},
+				},
+				on_attach = lspconfig_on_attach,
+				coq.lsp_ensure_capabilities(),
+				capabilities = capabilities
+			}
+		)
+		vim.lsp.enable('lua_ls')
+	end,
+}

lua/plugins/lazydev.lua

@@ -0,0 +1,13 @@
+-- Faster LuaLS setup for Neovim
+return {
+	'folke/lazydev.nvim',
+	enabled = true,
+	lazy = false,
+	ft = 'lua',
+	opts = {
+		library = {
+			-- Load luvit types when the `vim.uv` word is found
+			{ path = '${3rd}/luv/library', words = { 'vim%.uv' } },
+		},
+	}
+}

lua/plugins/lspconfig.lua

@@ -10,22 +10,19 @@ return {
 		-- yet support the Neovim 0.5 builtin LSP client
 		{ 'folke/lsp-colors.nvim' },
 
-    -- 9000+ Snippets
+		-- A completion plugin for neovim coded in Lua.
-    { 'ms-jpq/coq.artifacts', branch = 'artifacts' },
+		{ 'hrsh7th/nvim-cmp' },
 
-    -- Lua & third party sources. Need to **configure separately**
+		-- 💫 Extensible UI for Neovim notifications and LSP progress messages
-    { 'ms-jpq/coq.thirdparty', branch = '3p' }
+		{ 'j-hui/fidget.nvim' }
 	},
+	init = function()
+	end,
 	config = function()
 		-- @todo навести порядок
 
 		-- Активация вещания готовых набросков
-local capabilities = vim.lsp.protocol.make_client_capabilities()
+		local capabilities = require('cmp_nvim_lsp').default_capabilities()
-capabilities.textDocument.completion.completionItem.snippetSupport = true
-
--- Инициализация 'ms-jpq/coq_nvim'
-local coq = require('coq')
-
 		-- Инициализация LSP-серверов
 
 		-- Инициализация 'bmewburn/vscode-intelephense' (LSP-сервер для PHP)
@@ -33,7 +30,6 @@ vim.lsp.config(
 			'intelephense',
 			{
 				on_attach = lspconfig_on_attach,
-		coq.lsp_ensure_capabilities(),
 				capabilities = capabilities
 			}
 		)
@@ -52,7 +48,6 @@ vim.lsp.config(
 					provideFormatter = true,
 				},
 				on_attach = lspconfig_on_attach,
-  coq.lsp_ensure_capabilities(),
 				capabilities = capabilities
 			}
 		)
@@ -70,7 +65,6 @@ vim.lsp.config(
 					},
 				},
 				on_attach = lspconfig_on_attach,
-  coq.lsp_ensure_capabilities(),
 				capabilities = capabilities
 			})
 		vim.lsp.enable('emmet_ls')
@@ -91,7 +85,6 @@ vim.lsp.config(
 					}
 				},
 				on_attach = lspconfig_on_attach,
-  coq.lsp_ensure_capabilities(),
 				capabilities = capabilities
 			})
 		vim.lsp.enable('cssls')
@@ -104,7 +97,6 @@ vim.lsp.config(
 					camelCase = false,
 				},
 				on_attach = lspconfig_on_attach,
-  coq.lsp_ensure_capabilities(),
 				capabilities = capabilities
 			})
 		vim.lsp.enable('cssmodules_ls')
@@ -118,7 +110,6 @@ vim.lsp.config(
 					unstable = false
 				},
 				on_attach = lspconfig_on_attach,
-  coq.lsp_ensure_capabilities(),
 				capabilities = capabilities
 			})
 		vim.lsp.enable('denols')
@@ -128,7 +119,6 @@ vim.lsp.config(
 			'jsonls',
 			{
 				on_attach = lspconfig_on_attach,
-  coq.lsp_ensure_capabilities(),
 				capabilities = capabilities
 			})
 		vim.lsp.enable('jsonls')
@@ -158,7 +148,6 @@ vim.lsp.enable('jsonls')
 					},
 				},
 				on_attach = lspconfig_on_attach,
-  coq.lsp_ensure_capabilities(),
 				capabilities = capabilities
 			}
 		)

lua/plugins/nvim-cmp-git.lua

@@ -0,0 +1,15 @@
+-- Git source for nvim-cmp
+return {
+	'petertriho/cmp-git',
+	enabled = true,
+	lazy = true,
+	dependencies = {
+		-- A completion plugin for neovim coded in Lua.
+		{ 'hrsh7th/nvim-cmp' }
+	},
+	opts = {
+	},
+	init = function()
+		table.insert(require('cmp').get_config().sources, { name = 'git' })
+	end
+}

lua/plugins/nvim-cmp-lsp.lua

@@ -0,0 +1,14 @@
+-- A completion plugin for neovim coded in Lua.
+return {
+	'hrsh7th/cmp-nvim-lsp',
+	enabled = true,
+	lazy = true,
+	dependencies = {
+		-- A completion plugin for neovim coded in Lua.
+		{ 'hrsh7th/nvim-cmp' }
+	},
+	opts = {
+	},
+	init = function()
+	end
+}

lua/plugins/nvim-cmp.lua

@@ -0,0 +1,29 @@
+-- A completion plugin for neovim coded in Lua.
+return {
+	'hrsh7th/nvim-cmp',
+	enabled = true,
+	lazy = true,
+	dependencies = {
+		-- nvim-cmp source for neovim builtin LSP client
+		{ 'hrsh7th/cmp-nvim-lsp' },
+
+		-- Git source for nvim-cmp
+		{ 'petertriho/cmp-git' },
+	},
+	opts = function(_, opts)
+		opts.sources = opts.sources or {}
+
+		table.insert(opts.sources, {
+			name = 'lazydev',
+			group_index = 0, -- set group index to 0 to skip loading LuaLS completions
+		})
+
+		table.insert(opts.sources, {
+			name = 'nvim_lsp'
+		})
+
+		table.insert(opts.sources, {
+			name = 'git'
+		})
+	end,
+}

lua/plugins/telescope.lua

@@ -5,10 +5,10 @@ return {
 	enabled = true,
 	lazy = true,
 	keys = {
-		{ '<c-f>', '<cmd>Telescope find_files<cr>', mode = { 'n', 'i', 'v', 't' }, desc = 'Telescope find', noremap = true, silent = true },
+		{ '<c-f>',         '<cmd>Telescope find_files<cr>', mode = { 'n', 'i', 'v', 't' }, desc = 'Search files',   noremap = true, silent = true },
-		{ '<c-g>', '<cmd>Telescope live_grep<cr>', mode = { 'n', 'i', 'v', 't' }, desc = 'Telescope grep', noremap = true, silent = true },
+		{ '<c-g>',         '<cmd>Telescope live_grep<cr>',  mode = { 'n', 'i', 'v', 't' }, desc = 'Grep files',     noremap = true, silent = true },
-		{ '<leader><s-tab>', '<cmd>Telescope buffers<cr>', mode = { 'n', 'i', 'v', 't' }, desc = 'Telescope buffers', noremap = true, silent = true },
+		{ '<leader><tab>', '<cmd>Telescope buffers<cr>',    mode = { 'n', 'v', 't' },      desc = 'Search buffers', noremap = true, silent = true },
-		{ '<leader>?', '<cmd>Telescope help_tags<cr>', mode = { 'n', 'i', 'v', 't' }, desc = 'Telescope help', noremap = true, silent = true },
+		{ '<leader>?',     '<cmd>Telescope help_tags<cr>',  mode = { 'n', 'v', 't' },      desc = 'Help',           noremap = true, silent = true },
 	},
 	dependencies = {
 		-- Functions for Telescope

lua/plugins/which-key.lua

@@ -0,0 +1,15 @@
+-- 💥 Create key bindings that stick. WhichKey helps you remember your Neovim keymaps,
+-- by showing available keybindings in a popup as you type.
+return {
+	'folke/which-key.nvim',
+	event = 'VeryLazy',
+	opts = {
+		preset = 'helix',
+		triggers = {
+			{ '<auto>', mode = { 'n', 'i', 'v', 't' } },
+		}
+	},
+	keys = {
+		-- { '<leader><leader>', function() require('which-key').show({ global = false }) end, mode = { 'n' }, desc = 'Buffer Local Keymaps (which-key)', noremap = true, silent = true },
+	},
+}

lua/settings/system.lua

@@ -1,5 +1,5 @@
 -- Leader button
-vim.g.mapleader = ' '
+vim.g.mapleader = '`'
 vim.g.maplocalleader = '\\'
 
 -- Использовать системный буфер обмена

lua/trouble.lua

@@ -17,7 +17,6 @@ return {
 		{ 'nvim-tree/nvim-web-devicons' }
 	},
 	opts = {
-		
 		auto_close = true,     -- auto close when there are no items
 		auto_open = true,      -- auto open when there are items
 		position = 'bottom',   -- position of the list can be: bottom, top, left, right