From 967952b41b598a0950ce2ace96d24e5147cfb723 Mon Sep 17 00:00:00 2001 From: mirzaev Date: Tue, 14 Feb 2023 19:40:45 +1000 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?= =?UTF-8?q?=D0=BA=D0=B0=20ru=5FRU?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/keymaps/plugins.lua | 9 ++-- lua/keymaps/system.lua | 33 +++++++------ lua/plugins/lspconfig.lua | 22 ++++++++- lua/settings/system.lua | 11 +++++ nvim | 1 - plugin/packer_compiled.lua | 96 +++++++++++++++++++------------------- 6 files changed, 101 insertions(+), 71 deletions(-) delete mode 120000 nvim diff --git a/lua/keymaps/plugins.lua b/lua/keymaps/plugins.lua index c0ff824..d520d84 100644 --- a/lua/keymaps/plugins.lua +++ b/lua/keymaps/plugins.lua @@ -1,11 +1,11 @@ --[[ nvim-neo-tree/neo-tree ]] -- Открыть интерфейс с древовидным отображением файлов -vim.keymap.set({'n', 'i', 'v', 'o', 'x'}, '', 'NeoTreeRevealToggle', {noremap = true}) +vim.keymap.set({'n', 'i', 'v', 't'}, '', 'NeoTreeRevealToggle', {noremap = true}) -- [[ folke/trouble.nvim ]] -vim.keymap.set({'n', 'i', 'v', 'o', 'x'}, '', 'TroubleToggle', {noremap = true}) +vim.keymap.set({'n', 'i', 'v', 't'}, '', 'TroubleToggle', {noremap = true}) --[[ onsails/diaglist.nvim ]] @@ -147,9 +147,8 @@ vim.keymap.set('x', 'cd', 'kommentary_visual_decrease', {noremap = --[[ preservim/tagbar ]] -vim.keymap.set({'n', 'i', 'v', 'o', 'x'}, '', 'TagbarToggle', {noremap = true, silent = true}) +vim.keymap.set({'n', 'i', 'v', 't'}, '', 'TagbarToggle', {noremap = true, silent = true}) --[[ simrat39/symbols-outline.nvim ]] -vim.keymap.set({'n', 'i', 'v', 'o', 'x'}, '', 'SymbolsOutline', {noremap = true, silent = true}) - +vim.keymap.set({'n', 'i', 'v', 't'}, '', 'SymbolsOutline', {noremap = true, silent = true}) diff --git a/lua/keymaps/system.lua b/lua/keymaps/system.lua index b6ca12a..4fa485f 100644 --- a/lua/keymaps/system.lua +++ b/lua/keymaps/system.lua @@ -1,21 +1,24 @@ -- Выход из режима "ВСТАВКА" (insert) -vim.keymap.set('i', '', '', {noremap = true}) +vim.keymap.set('i', '', '', {noremap = true, silent = true}) -- Быстрый сдвиг текста в режиме 'ВСТАВКА' (insert) -- (надо будет проработать в визуальном режиме на множество строк) -vim.keymap.set({'i', 'v'}, '', '>', {noremap = true}) -vim.keymap.set({'i', 'v'}, '', '<', {noremap = true}) +vim.keymap.set({'i', 'v', 't'}, '', '>', {noremap = true, silent = true}) +vim.keymap.set({'i', 'v', 't'}, '', '<', {noremap = true, silent = true}) -- Отключение стрелок -vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '', '', {noremap = true}) -vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '', '', {noremap = true}) -vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '', '', {noremap = true}) -vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '', '', {noremap = true}) -vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '', '', {noremap = true}) -vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '', '', {noremap = true}) -vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '', '', {noremap = true}) -vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '', '', {noremap = true}) -vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '', '', {noremap = true}) -vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '', '', {noremap = true}) -vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '', '', {noremap = true}) -vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '', '', {noremap = true}) +vim.keymap.set({'n', 'i', 'v', 't'}, '', '', {noremap = true, silent = true}) +vim.keymap.set({'n', 'i', 'v', 't'}, '', '', {noremap = true, silent = true}) +vim.keymap.set({'n', 'i', 'v', 't'}, '', '', {noremap = true, silent = true}) +vim.keymap.set({'n', 'i', 'v', 't'}, '', '', {noremap = true, silent = true}) +vim.keymap.set({'n', 'i', 'v', 't'}, '', '', {noremap = true, silent = true}) +vim.keymap.set({'n', 'i', 'v', 't'}, '', '', {noremap = true, silent = true}) +vim.keymap.set({'n', 'i', 'v', 't'}, '', '', {noremap = true, silent = true}) +vim.keymap.set({'n', 'i', 'v', 't'}, '', '', {noremap = true, silent = true}) +vim.keymap.set({'n', 'i', 'v', 't'}, '', '', {noremap = true, silent = true}) +vim.keymap.set({'n', 'i', 'v', 't'}, '', '', {noremap = true, silent = true}) +vim.keymap.set({'n', 'i', 'v', 't'}, '', '', {noremap = true, silent = true}) +vim.keymap.set({'n', 'i', 'v', 't'}, '', '', {noremap = true, silent = true}) + +-- Быстрое форматирование всего документа +vim.keymap.set({'n', 'v', 't'}, 'F', '1GVG=', {noremap = true, silent = true}) diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index 3e0efc9..2573d22 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -1,3 +1,6 @@ +-- Инициализация "neovim/nvim-lspconfig" +local lspconfig = require('lspconfig') + -- Активация вещания готовых набросков local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true @@ -8,12 +11,27 @@ local coq = require('coq') -- Инициализация LSP-серверов -- Инициализация "psalm" (LSP-сервер для PHP) -require('lspconfig').psalm.setup { +lspconfig.psalm.setup { on_attach = lspconfig_on_attach, coq.lsp_ensure_capabilities() } -- Инициализация "vscode-html-language-server" (готовый набросок для HTML) -require('lspconfig').html.setup { +lspconfig.html.setup { + on_attach = lspconfig_on_attach, capabilities = capabilities } + +-- Инициализация "vscode-langservers-extracted" (готовый набросок для JavaScript и PostScript) +lspconfig.eslint.setup({ + on_attach = function(client, bufnr) + -- Инициализация команды "EslintFixAll" + vim.api.nvim_create_autocmd("BufWritePre", { + buffer = bufnr, + command = "EslintFixAll", + }) + + -- Вызов глобальной функции + lspconfig_on_attach(client, bufnr) + end, +}) diff --git a/lua/settings/system.lua b/lua/settings/system.lua index 7b5cb64..6f59079 100644 --- a/lua/settings/system.lua +++ b/lua/settings/system.lua @@ -27,3 +27,14 @@ vim.opt_local.cursorcolumn = true -- Выбор цветовой темы vim.cmd.colorscheme('default') + +-- Добавление ru_RU (переключать через ) +vim.opt.keymap = 'russian-jcukenwin' + +-- Переключать раскладку на en_US при поиске и вставке +vim.opt.iminsert = 0 +vim.opt.imsearch = 0 + +-- Поддержка буквы "ё" +vim.opt_local.spell = true +vim.opt_local.spelllang = 'ru_yo,en_us' diff --git a/nvim b/nvim deleted file mode 120000 index 47a6cb6..0000000 --- a/nvim +++ /dev/null @@ -1 +0,0 @@ -/root/.config/nvim \ No newline at end of file diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index 8776bf6..d69b3dc 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -266,26 +266,30 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) --- Config for: nvim-web-devicons -time([[Config for nvim-web-devicons]], true) -try_loadstring("\27LJ\2\n9\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\30plugins/nvim-web-devicons\frequire\0", "config", "nvim-web-devicons") -time([[Config for nvim-web-devicons]], false) --- Config for: nvim-lint -time([[Config for nvim-lint]], true) -try_loadstring("\27LJ\2\n,\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\17plugins/lint\frequire\0", "config", "nvim-lint") -time([[Config for nvim-lint]], false) --- Config for: trouble.nvim -time([[Config for trouble.nvim]], true) -try_loadstring("\27LJ\2\n/\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\20plugins/trouble\frequire\0", "config", "trouble.nvim") -time([[Config for trouble.nvim]], false) -- Config for: bufferline.nvim time([[Config for bufferline.nvim]], true) try_loadstring("\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins/bufferline\frequire\0", "config", "bufferline.nvim") time([[Config for bufferline.nvim]], false) --- Config for: lualine-lsp-progress -time([[Config for lualine-lsp-progress]], true) -try_loadstring("\27LJ\2\n<\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0!plugins/lualine-lsp-progress\frequire\0", "config", "lualine-lsp-progress") -time([[Config for lualine-lsp-progress]], false) +-- Config for: nvim-dap +time([[Config for nvim-dap]], true) +try_loadstring("\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins/dap\frequire\0", "config", "nvim-dap") +time([[Config for nvim-dap]], false) +-- Config for: lspkind-nvim +time([[Config for lspkind-nvim]], true) +try_loadstring("\27LJ\2\n/\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\20plugins/lspkind\frequire\0", "config", "lspkind-nvim") +time([[Config for lspkind-nvim]], false) +-- Config for: nvim-lint +time([[Config for nvim-lint]], true) +try_loadstring("\27LJ\2\n,\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\17plugins/lint\frequire\0", "config", "nvim-lint") +time([[Config for nvim-lint]], false) +-- Config for: nvim-web-devicons +time([[Config for nvim-web-devicons]], true) +try_loadstring("\27LJ\2\n9\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\30plugins/nvim-web-devicons\frequire\0", "config", "nvim-web-devicons") +time([[Config for nvim-web-devicons]], false) +-- Config for: trouble.nvim +time([[Config for trouble.nvim]], true) +try_loadstring("\27LJ\2\n/\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\20plugins/trouble\frequire\0", "config", "trouble.nvim") +time([[Config for trouble.nvim]], false) -- Config for: lualine.nvim time([[Config for lualine.nvim]], true) try_loadstring("\27LJ\2\n/\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\20plugins/lualine\frequire\0", "config", "lualine.nvim") @@ -294,18 +298,6 @@ time([[Config for lualine.nvim]], false) time([[Config for nvim-treesitter]], true) try_loadstring("\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins/treesitter\frequire\0", "config", "nvim-treesitter") time([[Config for nvim-treesitter]], false) --- Config for: lush.nvim -time([[Config for lush.nvim]], true) -try_loadstring("\27LJ\2\n,\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\17plugins/lush\frequire\0", "config", "lush.nvim") -time([[Config for lush.nvim]], false) --- Config for: telescope.nvim -time([[Config for telescope.nvim]], true) -try_loadstring("\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22plugins/telescope\frequire\0", "config", "telescope.nvim") -time([[Config for telescope.nvim]], false) --- Config for: vim-test -time([[Config for vim-test]], true) -try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21plugins/vim-test\frequire\0", "config", "vim-test") -time([[Config for vim-test]], false) -- Config for: diaglist.nvim time([[Config for diaglist.nvim]], true) try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21plugins/diaglist\frequire\0", "config", "diaglist.nvim") @@ -314,34 +306,42 @@ time([[Config for diaglist.nvim]], false) time([[Config for fidget.nvim]], true) try_loadstring("\27LJ\2\n.\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\19plugins/fidget\frequire\0", "config", "fidget.nvim") time([[Config for fidget.nvim]], false) --- Config for: gitsigns.nvim -time([[Config for gitsigns.nvim]], true) -try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21plugins/gitsigns\frequire\0", "config", "gitsigns.nvim") -time([[Config for gitsigns.nvim]], false) --- Config for: nvim-autopairs -time([[Config for nvim-autopairs]], true) -try_loadstring("\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22plugins/autopairs\frequire\0", "config", "nvim-autopairs") -time([[Config for nvim-autopairs]], false) --- Config for: coq_nvim -time([[Config for coq_nvim]], true) -try_loadstring("\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins/coq\frequire\0", "config", "coq_nvim") -time([[Config for coq_nvim]], false) +-- Config for: telescope.nvim +time([[Config for telescope.nvim]], true) +try_loadstring("\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22plugins/telescope\frequire\0", "config", "telescope.nvim") +time([[Config for telescope.nvim]], false) -- Config for: neo-tree.nvim time([[Config for neo-tree.nvim]], true) try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21plugins/neo-tree\frequire\0", "config", "neo-tree.nvim") time([[Config for neo-tree.nvim]], false) --- Config for: nvim-dap -time([[Config for nvim-dap]], true) -try_loadstring("\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins/dap\frequire\0", "config", "nvim-dap") -time([[Config for nvim-dap]], false) +-- Config for: vim-test +time([[Config for vim-test]], true) +try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21plugins/vim-test\frequire\0", "config", "vim-test") +time([[Config for vim-test]], false) +-- Config for: coq_nvim +time([[Config for coq_nvim]], true) +try_loadstring("\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins/coq\frequire\0", "config", "coq_nvim") +time([[Config for coq_nvim]], false) +-- Config for: gitsigns.nvim +time([[Config for gitsigns.nvim]], true) +try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21plugins/gitsigns\frequire\0", "config", "gitsigns.nvim") +time([[Config for gitsigns.nvim]], false) -- Config for: symbols-outline.nvim time([[Config for symbols-outline.nvim]], true) try_loadstring("\27LJ\2\n7\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\28plugins/symbols-outline\frequire\0", "config", "symbols-outline.nvim") time([[Config for symbols-outline.nvim]], false) --- Config for: lspkind-nvim -time([[Config for lspkind-nvim]], true) -try_loadstring("\27LJ\2\n/\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\20plugins/lspkind\frequire\0", "config", "lspkind-nvim") -time([[Config for lspkind-nvim]], false) +-- Config for: nvim-autopairs +time([[Config for nvim-autopairs]], true) +try_loadstring("\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22plugins/autopairs\frequire\0", "config", "nvim-autopairs") +time([[Config for nvim-autopairs]], false) +-- Config for: lualine-lsp-progress +time([[Config for lualine-lsp-progress]], true) +try_loadstring("\27LJ\2\n<\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0!plugins/lualine-lsp-progress\frequire\0", "config", "lualine-lsp-progress") +time([[Config for lualine-lsp-progress]], false) +-- Config for: lush.nvim +time([[Config for lush.nvim]], true) +try_loadstring("\27LJ\2\n,\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\17plugins/lush\frequire\0", "config", "lush.nvim") +time([[Config for lush.nvim]], false) -- Load plugins in order defined by `after` time([[Sequenced loading]], true) vim.cmd [[ packadd nvim-lspconfig ]]