исправление автозагрузки coq + отключение стрелочек

This commit is contained in:
Arsen Mirzaev Tatyano-Muradovich 2023-02-14 07:58:56 +10:00
parent 974b40a52c
commit 12a4e31da7
8 changed files with 127 additions and 74 deletions

View File

@ -2,11 +2,20 @@
vim.keymap.set('i', '<C-i>', '<escape>', {noremap = true}) vim.keymap.set('i', '<C-i>', '<escape>', {noremap = true})
-- Быстрый сдвиг текста в режиме 'ВСТАВКА' (insert) -- Быстрый сдвиг текста в режиме 'ВСТАВКА' (insert)
vim.keymap.set('i', '<tab>', '<cmd>><cr>', {noremap = true}) -- (надо будет проработать в визуальном режиме на множество строк)
vim.keymap.set('i', '<s-tab>', '<cmd><<cr>', {noremap = true}) vim.keymap.set({'i', 'v'}, '<tab>', '<cmd>><cr>', {noremap = true})
vim.keymap.set({'i', 'v'}, '<s-tab>', '<cmd><<cr>', {noremap = true})
-- Отключение стрелок -- Отключение стрелок
vim.keymap.set('n', '<left>', '', {noremap = true}) vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '<left>', '', {noremap = true})
vim.keymap.set('n', '<up>', '', {noremap = true}) vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '<up>', '', {noremap = true})
vim.keymap.set('n', '<right>', '', {noremap = true}) vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '<right>', '', {noremap = true})
vim.keymap.set('n', '<down>', '', {noremap = true}) vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '<down>', '', {noremap = true})
vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '<s-left>', '', {noremap = true})
vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '<s-up>', '', {noremap = true})
vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '<s-right>', '', {noremap = true})
vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '<s-down>', '', {noremap = true})
vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '<c-left>', '', {noremap = true})
vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '<c-up>', '', {noremap = true})
vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '<c-right>', '', {noremap = true})
vim.keymap.set({'n', 'i', 'x', 'o', 'v'}, '<c-down>', '', {noremap = true})

View File

@ -1,6 +1,4 @@
-- Настройка "ms-jpq/coq_nvim"
vim.g.coq_settings = { vim.g.coq_settings = {
auto_start = 'shut-up', auto_start = 'shut-up'
--keymap = {
-- recommended = false
--}
} }

View File

@ -1,5 +1,9 @@
-- Инициализация "ms-jpq/coq_nvim"
local coq = require('coq') local coq = require('coq')
-- Инициализация LSP-серверов
-- Настройка и инициализация "psalm" (LSP-сервер для PHP)
require('lspconfig').psalm.setup { require('lspconfig').psalm.setup {
on_attach = lspconfig_on_attach, on_attach = lspconfig_on_attach,
coq.lsp_ensure_capabilities() coq.lsp_ensure_capabilities()

7
lua/plugins/lush.lua Normal file
View File

@ -0,0 +1,7 @@
-- Инициализация плагина
local lush = require('lush')
-- Инициализация ссылки на палитру
local hsl = lush.hsl
-- Тема будет разработана позднее - не до неё сейчас

View File

@ -8,6 +8,7 @@ return require('packer').startup(function(use)
-- Быстрая настройка LSP-серверов -- Быстрая настройка LSP-серверов
use { use {
'neovim/nvim-lspconfig', 'neovim/nvim-lspconfig',
after = 'coq_nvim',
config = function() require('plugins/lspconfig') end config = function() require('plugins/lspconfig') end
} }
@ -169,5 +170,11 @@ return require('packer').startup(function(use)
use 'dag/vim-fish' use 'dag/vim-fish'
-- Цветовая тема -- Цветовая тема
use 'rktjmp/lush.nvim'; use {
'rktjmp/lush.nvim',
config = function() require('plugins/lush') end
};
-- Аналог LSP-сервера для подержки синтаксиса nginx
use 'chr4/nginx.vim'
end) end)

View File

@ -18,3 +18,12 @@ vim.opt.signcolumn = 'yes'
-- 24-битные цвета -- 24-битные цвета
vim.opt.termguicolors = true vim.opt.termguicolors = true
-- Отключение переноса строк
vim.opt_local.wrap = false
-- Отображение колонки курсора
vim.opt_local.cursorcolumn = true
-- Выбор цветовой темы
vim.cmd.colorscheme('default')

1
nvim Symbolic link
View File

@ -0,0 +1 @@
/root/.config/nvim

View File

@ -91,8 +91,10 @@ _G.packer_plugins = {
url = "https://github.com/ms-jpq/coq.thirdparty" url = "https://github.com/ms-jpq/coq.thirdparty"
}, },
coq_nvim = { coq_nvim = {
after = { "nvim-lspconfig" },
config = { "\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 = { "\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" },
loaded = true, loaded = true,
only_config = true,
path = "/home/mirzaev/.local/share/nvim/site/pack/packer/start/coq_nvim", path = "/home/mirzaev/.local/share/nvim/site/pack/packer/start/coq_nvim",
url = "https://github.com/ms-jpq/coq_nvim" url = "https://github.com/ms-jpq/coq_nvim"
}, },
@ -143,6 +145,7 @@ _G.packer_plugins = {
url = "https://github.com/nvim-lualine/lualine.nvim" url = "https://github.com/nvim-lualine/lualine.nvim"
}, },
["lush.nvim"] = { ["lush.nvim"] = {
config = { "\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" },
loaded = true, loaded = true,
path = "/home/mirzaev/.local/share/nvim/site/pack/packer/start/lush.nvim", path = "/home/mirzaev/.local/share/nvim/site/pack/packer/start/lush.nvim",
url = "https://github.com/rktjmp/lush.nvim" url = "https://github.com/rktjmp/lush.nvim"
@ -153,6 +156,11 @@ _G.packer_plugins = {
path = "/home/mirzaev/.local/share/nvim/site/pack/packer/start/neo-tree.nvim", path = "/home/mirzaev/.local/share/nvim/site/pack/packer/start/neo-tree.nvim",
url = "https://github.com/nvim-neo-tree/neo-tree.nvim" url = "https://github.com/nvim-neo-tree/neo-tree.nvim"
}, },
["nginx.vim"] = {
loaded = true,
path = "/home/mirzaev/.local/share/nvim/site/pack/packer/start/nginx.vim",
url = "https://github.com/chr4/nginx.vim"
},
["nui.nvim"] = { ["nui.nvim"] = {
loaded = true, loaded = true,
path = "/home/mirzaev/.local/share/nvim/site/pack/packer/start/nui.nvim", path = "/home/mirzaev/.local/share/nvim/site/pack/packer/start/nui.nvim",
@ -178,8 +186,10 @@ _G.packer_plugins = {
}, },
["nvim-lspconfig"] = { ["nvim-lspconfig"] = {
config = { "\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22plugins/lspconfig\frequire\0" }, config = { "\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22plugins/lspconfig\frequire\0" },
load_after = {},
loaded = true, loaded = true,
path = "/home/mirzaev/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", needs_bufread = false,
path = "/home/mirzaev/.local/share/nvim/site/pack/packer/opt/nvim-lspconfig",
url = "https://github.com/neovim/nvim-lspconfig" url = "https://github.com/neovim/nvim-lspconfig"
}, },
["nvim-treesitter"] = { ["nvim-treesitter"] = {
@ -256,30 +266,62 @@ _G.packer_plugins = {
} }
time([[Defining packer_plugins]], false) time([[Defining packer_plugins]], false)
-- Config for: nvim-lspconfig
time([[Config for nvim-lspconfig]], 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/lspconfig\frequire\0", "config", "nvim-lspconfig")
time([[Config for nvim-lspconfig]], 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-treesitter
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: 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: 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: nvim-web-devicons -- Config for: nvim-web-devicons
time([[Config for nvim-web-devicons]], true) 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") 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) 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: 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")
time([[Config for lualine.nvim]], false)
-- Config for: nvim-treesitter
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")
time([[Config for diaglist.nvim]], false)
-- Config for: fidget.nvim
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 -- Config for: coq_nvim
time([[Config for coq_nvim]], true) 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") 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")
@ -288,50 +330,26 @@ time([[Config for coq_nvim]], false)
time([[Config for neo-tree.nvim]], true) 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") 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) time([[Config for neo-tree.nvim]], 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")
time([[Config for diaglist.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: 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: 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: 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: 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-dap -- Config for: nvim-dap
time([[Config for nvim-dap]], true) 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") 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) time([[Config for nvim-dap]], false)
-- Config for: bufferline.nvim -- Config for: symbols-outline.nvim
time([[Config for bufferline.nvim]], true) time([[Config for symbols-outline.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") 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 bufferline.nvim]], false) time([[Config for symbols-outline.nvim]], false)
-- Config for: fidget.nvim -- Config for: lspkind-nvim
time([[Config for fidget.nvim]], true) 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\19plugins/fidget\frequire\0", "config", "fidget.nvim") 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 fidget.nvim]], false) time([[Config for lspkind-nvim]], false)
-- Config for: lualine.nvim -- Load plugins in order defined by `after`
time([[Config for lualine.nvim]], true) time([[Sequenced loading]], 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") vim.cmd [[ packadd nvim-lspconfig ]]
time([[Config for lualine.nvim]], false)
-- Config for: trouble.nvim -- Config for: nvim-lspconfig
time([[Config for trouble.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/lspconfig\frequire\0", "config", "nvim-lspconfig")
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) time([[Sequenced loading]], false)
_G._packer.inside_compile = false _G._packer.inside_compile = false
if _G._packer.needs_bufread == true then if _G._packer.needs_bufread == true then